From 374c2948364b890265396a520fec56eee96ee54a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E6=B0=B8=E8=B6=85?= <2090205686@qq.com>
Date: Wed, 18 Jun 2025 17:14:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=95=E5=85=A5=E5=93=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20-=20=E5=86=9C=E8=8D=AF=E4=BD=BF=E7=94=A8=E7=9B=91?=
 =?UTF-8?q?=E7=AE=A1=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8C=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/apis/inputSuppliesApi/material.js     |   2 +-
 .../src/components/tableComponent.vue         | 330 ++++++++
 sub-government-affairs-service/src/main.js    |   1 +
 .../src/styles/custom.scss                    | 319 +++++++
 .../material/pesticide/index.vue              | 794 +++++-------------
 .../material/pesticide/index原.vue            | 624 ++++++++++++++
 6 files changed, 1471 insertions(+), 599 deletions(-)
 create mode 100644 sub-government-affairs-service/src/components/tableComponent.vue
 create mode 100644 sub-government-affairs-service/src/styles/custom.scss
 create mode 100644 sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index原.vue

diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js
index 71f0e72..979f53b 100644
--- a/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js
+++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js
@@ -11,7 +11,7 @@ export function getMaterailTypes(params) {
 
 /* 获取农药列表 */
 export function getPesticideList(params) {
-  return request('/inputGoods/pesticide/page', {
+  return request('/inputGoods/supervise/pesticide/page', {
     params,
   });
 }
diff --git a/sub-government-affairs-service/src/components/tableComponent.vue b/sub-government-affairs-service/src/components/tableComponent.vue
new file mode 100644
index 0000000..8224a19
--- /dev/null
+++ b/sub-government-affairs-service/src/components/tableComponent.vue
@@ -0,0 +1,330 @@
+<template>
+  <div class="custom-table-container">
+    <el-table
+      style="flex: 1; display: flex; flex-direction: column; text-align: center"
+      :max-height="tableMaxHeight"
+      v-loading="loading"
+      :data="tableData"
+      :stripe="showStripe"
+      :fit="true"
+      v-bind="$attrs"
+      :header-cell-class-name="headerCellClassName"
+      :cell-class-name="cellClassName"
+      @selection-change="handleSelectionChange"
+    >
+      <!-- 树形展开 -->
+      <el-table-column v-if="tree" type="expand">
+        <template #default="props">
+          <slot name="tree" :row="props.row"></slot>
+        </template>
+      </el-table-column>
+
+      <!-- 首列多选框 -->
+      <el-table-column v-if="showSelection" type="selection" width="30" align="center" fixed />
+      <el-table-column label="序号" width="70" v-if="showSort" fixed align="center">
+        <template #default="{ $index }">
+          {{ (currentPage - 1) * pageSize + $index + 1 }}
+        </template>
+      </el-table-column>
+
+      <template v-for="column in columns" :key="column.prop">
+        <el-table-column
+          :prop="column.prop"
+          :label="column.label"
+          :width="column.width"
+          :align="column.align || 'center'"
+          :fixed="column.fixed ?? false"
+          :sortable="column.sortable"
+          :header-class-name="column.headerClassName"
+        >
+          <!-- 支持插槽 -->
+          <template v-if="column.slotName" #default="scope">
+            <slot :name="column.slotName" :row="scope.row"></slot>
+          </template>
+        </el-table-column>
+      </template>
+    </el-table>
+
+    <div v-if="showPagination" class="pagination-container">
+      <el-pagination
+        v-model:current-page="computedCurrentPage"
+        v-model:page-size="computedPageSize"
+        :page-sizes="pageSizes"
+        :small="small"
+        :disabled="disabled"
+        :background="background"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        @current-change="handleCurrentChange"
+        @size-change="pageSizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, watch, computed, onMounted, onBeforeUnmount } from 'vue';
+
+const props = defineProps({
+  loading: {
+    type: Boolean,
+    default: false,
+  },
+  // 表格数据
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  // 列配置
+  columns: {
+    type: Array,
+    default: () => [],
+  },
+  tree: {
+    type: Boolean,
+    default: false,
+  },
+  // 当前页码（由外部传入）
+  currentPage: {
+    type: Number,
+    default: 1,
+  },
+  // 每页数量（由外部传入）
+  pageSize: {
+    type: Number,
+    default: 10,
+  },
+  // 总条数
+  total: {
+    type: Number,
+    default: 0,
+  },
+  // 是否显示分页
+  showPagination: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否显示边框:border="showBorder"添加到组件会显示横竖边框，不添加只显示横边框
+  showBorder: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否显示斑马纹
+  showStripe: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示首列多选框
+  showSelection: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否展示序号
+  showSort: {
+    type: Boolean,
+    default: false,
+  },
+  // 每页显示条数选项
+  pageSizes: {
+    type: Array,
+    default: () => [10, 20, 30, 50],
+  },
+  // 是否使用小型分页样式
+  small: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否禁用
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否为分页按钮添加背景色
+  background: {
+    type: Boolean,
+    default: true,
+  },
+  // 自定义表头类名函数
+  headerCellClassName: {
+    type: Function,
+    default: () => 'custom-header',
+  },
+  // 自定义单元格类名函数
+  cellClassName: {
+    type: Function,
+    default: () => 'custom-cell',
+  },
+  rowkey: {
+    type: String,
+    default: '',
+  },
+});
+
+const emit = defineEmits(['update:currentPage', 'update:pageSize', 'page-change', 'selection-change']);
+
+// 每页数量（双向绑定）
+const computedPageSize = computed({
+  get: () => props.pageSize,
+  set: (val) => emit('update:pageSize', val),
+});
+// 当前页码（双向绑定）
+const computedCurrentPage = computed({
+  get: () => props.currentPage,
+  set: (val) => emit('update:currentPage', val),
+});
+
+// 分页大小改变
+const pageSizeChange = (val) => {
+  // console.log(`每页 ${val} 条`);
+  // console.log(props.currentPage);
+  emit('update:pageSize', val);
+  emit('page-change', {
+    page: props.currentPage,
+    pageSize: val,
+  });
+};
+
+// 当前页改变
+const handleCurrentChange = (val) => {
+  // console.log(`当前页改变 ${val} 页`);
+  emit('page-change', {
+    page: val,
+    pageSize: props.pageSize,
+  });
+};
+
+// 多选框变化
+const handleSelectionChange = (selection) => {
+  const selectedIds = selection.map((row) => (props.rowkey == '' ? row.id : row[props.rowkey]));
+  emit('selection-change', selection, selectedIds);
+};
+
+const tableRef = ref(null);
+const tableMaxHeight = ref(null); // 使用max-height而不是height
+
+// 自动计算最大高度（预留分页器空间）
+const calculateMaxHeight = () => {
+  const paginationHeight = 60; // 分页器固定高度
+  const container = tableRef.value?.$el?.parentElement;
+  if (container) {
+    const containerHeight = container.clientHeight;
+    tableMaxHeight.value = containerHeight - paginationHeight;
+  }
+};
+
+onMounted(() => {
+  calculateMaxHeight();
+  window.addEventListener('resize', calculateMaxHeight);
+
+  // 添加MutationObserver监听父容器尺寸变化
+  const observer = new MutationObserver(calculateMaxHeight);
+  if (tableRef.value?.$el?.parentElement) {
+    observer.observe(tableRef.value.$el.parentElement, {
+      attributes: true,
+      attributeFilter: ['style', 'class'],
+    });
+  }
+});
+
+onBeforeUnmount(() => {
+  window.removeEventListener('resize', calculateMaxHeight);
+});
+</script>
+
+<style lang="scss" scoped>
+.custom-table-container {
+  // position: relative;
+  padding: 10px 0;
+  display: flex;
+  flex-direction: column;
+  height: 100%; /* 关键：继承父容器高度 */
+  overflow: hidden; /* 防止内容溢出 */
+
+  /* 表格弹性布局 */
+  :deep(.el-table) {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+
+    /* 表头固定 */
+    .el-table__header-wrapper {
+      flex-shrink: 0;
+    }
+
+    /* 表体可滚动 */
+    .el-table__body-wrapper {
+      flex: 1;
+      overflow: auto;
+    }
+  }
+
+  .demo-form-inline {
+    text-align: left;
+    padding-left: 20px;
+    padding-top: 4px;
+  }
+
+  .pagination-container {
+    margin-top: 20px;
+    padding: 0 30px 0 20px;
+    display: flex;
+    justify-content: right;
+    color: #999;
+    font-weight: 400;
+  }
+  .custom-pagination-text {
+    flex: 1;
+    text-align: left;
+    line-height: 32px;
+    font-size: 14px;
+  }
+
+  .custom-pagination-size {
+    text-align: right;
+    line-height: 32px;
+    margin-left: 20px;
+    font-size: 14px;
+  }
+
+  /* 去除表格边框 */
+  // :deep(.el-table) {
+  //   --el-table-border-color: transparent;
+  // }
+
+  /* 自定义鼠标悬停颜色 */
+  // :deep(.el-table__body tr:hover > td) {
+  //   background-color: rgba(237 255 248) !important;
+  // }
+
+  /* 自定义表头样式 */
+  :deep(.custom-header) {
+    color: #333;
+  }
+  /* 自定义表头样式 */
+  :deep(.custom-cell) {
+    color: #606266;
+  }
+
+  :deep(.el-pagination) {
+    /* 整体分页样式 */
+    font-size: 14px;
+    font-weight: normal;
+
+    /* 每页条数选择器 */
+    .el-pagination__sizes {
+      .el-input__inner {
+        font-weight: 400;
+      }
+    }
+
+    /* 跳页输入框 */
+    .el-pagination__jump {
+      font-weight: 400;
+      // position: absolute;
+      // right: 16px;
+      // bottom: 12px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/sub-government-affairs-service/src/main.js b/sub-government-affairs-service/src/main.js
index 1228094..b3afedf 100644
--- a/sub-government-affairs-service/src/main.js
+++ b/sub-government-affairs-service/src/main.js
@@ -8,6 +8,7 @@ import 'element-plus/dist/index.css';
 import Avue from '@smallwei/avue';
 import '@smallwei/avue/lib/index.css';
 import './utils/permission';
+import './styles/custom.scss';
 import { registerDirective } from './directives';
 import { registerGlobalComponents } from './plugins/globalComponents';
 import { registerElIcons } from './plugins/icon';
diff --git a/sub-government-affairs-service/src/styles/custom.scss b/sub-government-affairs-service/src/styles/custom.scss
new file mode 100644
index 0000000..5668ff8
--- /dev/null
+++ b/sub-government-affairs-service/src/styles/custom.scss
@@ -0,0 +1,319 @@
+.app-container {
+  .container-custom {
+    width: 100%;
+    overflow: hidden; /* 防止全局滚动条 */
+    border-radius: 10px;
+    background: #fff;
+
+    .search-box {
+      overflow: hidden;
+      padding: 16px 8px 0 16px;
+      background: #fff;
+      .order-tab {
+        width: 100%;
+        .el-tabs__nav-wrap::after {
+          background: transparent !important;
+        }
+        .el-tabs__active-bar {
+          height: 3px !important;
+          border-radius: 4px;
+        }
+        .el-descriptions__label,
+        .el-descriptions__content {
+          font-size: 16px !important;
+        }
+        .cell-item {
+          display: inline-flex;
+        }
+        .el-descriptions__label {
+          color: #999;
+        }
+        .el-descriptions__content {
+          color: #333;
+        }
+      }
+    }
+    .search-bar {
+      display: flex;
+      flex-shrink: 0; /* 禁止收缩 */
+
+      .search-bar-left {
+        flex: 1;
+      }
+
+      .search-bar-right {
+        width: 100px;
+        text-align: right;
+        padding-right: 8px;
+      }
+
+      .demo-form-inline {
+        text-align: left;
+      }
+
+      .el-form--inline .el-form-item {
+        margin-right: 30px;
+      }
+
+      .demo-form-inline .el-input {
+        --el-input-width: 160px;
+      }
+
+      .demo-form-inline .el-select {
+        --el-select-width: 160px;
+      }
+
+      .demo-form-inline .el-date-picker {
+        --el-select-width: 160px;
+      }
+      .el-form .el-form-item__label {
+        font-weight: 400;
+      }
+      .custom-form-inline .el-input {
+        width: 260px;
+      }
+    }
+    .table-toolbar {
+      text-align: left;
+      padding-left: 20px;
+      padding-top: 20px;
+      background-color: #fff;
+    }
+    .table-cont {
+      padding: 10px 20px;
+      overflow: hidden;
+      background-color: #fff;
+      position: relative;
+      .el-table__empty-text {
+        width: 200px;
+      }
+      .el-button-custom{
+        font-size: 14px !important;
+        color: #25bf82;
+        padding: 0;
+      }
+      .el-button-delete{
+        font-size: 14px !important;
+        color: #ff4d4f;
+        padding: 0;
+      }
+    }
+
+    /* 自定义弹窗样式 */
+    .traceability-dialog {
+      background: transparent;
+      box-shadow: none;
+      border-radius: 16px !important;
+    }
+
+    /* 主要内容区域 */
+    .dialog-content {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      background: white;
+      border-radius: 8px;
+      padding: 0 0 20px 0;
+      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    }
+
+    /* 产品信息 */
+    .product-info {
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 20px;
+      font-size: 14px;
+      color: #666;
+    }
+
+    .product-name {
+      font-weight: bold;
+      color: #333;
+    }
+
+    /* 二维码图片 */
+    .qrcode-image {
+      width: 200px;
+      height: 200px;
+      margin: 0 auto;
+    }
+
+    /* 下载区域 */
+    .download-section {
+      display: flex;
+      align-items: center;
+      margin: 0 0 10px 0;
+      color: #25bf82;
+      cursor: pointer;
+      font-size: 12px;
+      line-height: 18px;
+    }
+
+    .download-icon {
+      margin-left: 8px;
+      font-size: 16px;
+    }
+
+    /* 遗传编码区域 */
+    .code-section {
+      display: flex;
+      align-items: center;
+      margin: 10px 0;
+      background: rgba(37, 191, 130, 0.1);
+      border-radius: 4px;
+    }
+
+    .genetic-code {
+      font-family: monospace;
+      font-size: 14px;
+      color: #25bf82;
+      display: inline-block;
+      max-width: 250px;
+      padding: 0 10px;
+    }
+
+    .copy-icon {
+      margin-left: 10px;
+      color: #409eff;
+      cursor: pointer;
+      font-size: 16px;
+    }
+
+    /* 关闭按钮 */
+    .close-button {
+      position: absolute;
+      left: 50%;
+      transform: translateX(-50%);
+      bottom: -60px;
+      color: white;
+      font-size: 30px;
+      cursor: pointer;
+      transition: all 0.3s;
+    }
+  }
+  // 表格中文本的颜色
+  .color-blue {
+    color: #3685fe;
+  }
+  .color-black {
+    color: #000000;
+  }
+  .color-gray {
+    color: #5a5a5a;
+  }
+  .color-orange {
+    color: #ffb345;
+  }
+  .color-green {
+    color: #25bf82;
+  }
+  .color-red {
+    color: #ff4348;
+  }
+}
+.el-button {
+  font-size: 12px !important;
+  font-weight: 400;
+}
+// 页面添加的自定义容器，上下撑满
+.customer-control {
+  position: absolute;
+  height: 100%;
+  left: 0;
+  right: 0;
+  min-width: 1000px;
+}
+// 表格组件中的各插槽元素自定义样式
+.custom-tooltip-content {
+  display: flex;
+  justify-content: space-between;
+  gap: 10px;
+  padding: 3px 0;
+  
+}
+.el-icon-custom {
+  vertical-align: middle;
+  cursor: pointer;
+  font-size: 16px;
+  // color: #fff;
+}
+.table-cell-img-box {
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  overflow: hidden; /* 隐藏超出部分 */
+  display: flex; /* 使用 Flex 布局居中 */
+  justify-content: center;
+  align-items: center;
+  .table-cell-img {
+    min-width: 100%; /* 至少撑满宽度 */
+    min-height: 100%; /* 至少撑满高度 */
+    object-fit: cover; /* 保持比例并覆盖容器 */
+  }
+}
+
+// 新增商品页面-开始
+.customer-box {
+  height: 100%;
+  border-radius: 16px;
+  padding: 20px 16px;
+  overflow-y: auto;
+  background-color: #fff;
+  .my-el-select {
+    width: 200px;
+  }
+  .el-input-number .el-input__inner {
+    text-align: left;
+  }
+  // 商品属性
+  .attr-item {
+    display: inline-block;
+    margin-right: 10px;
+    .el-icon {
+      vertical-align: middle;
+      margin: 5px;
+    }
+  }
+  .attr-row {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    flex-wrap: nowrap;
+    gap: 10px;
+    margin-bottom: 10px;
+  }
+  .attr-input {
+    width: 120px;
+  }
+  .attr-clomn {
+    width: 160px;
+  }
+  .attr-clomn200 {
+    width: 160px;
+  }
+  .attr-clomn220 {
+    width: 220px;
+  }
+  .attr-box {
+    padding: 16px 16px 6px 16px;
+    border-radius: 6px;
+    border: 1px solid #999;
+  }
+}
+// 新增商品页面-结束
+
+.flex-left-top {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+// 溢出隐藏
+.text-ellipsis {
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
\ No newline at end of file
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue
index 2f6df0b..5b1888d 100644
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue
@@ -1,617 +1,215 @@
 <template>
-  <section class="custom-page">
-    <h2>农药基本信息</h2>
-    <TypeMenu v-if="materialTypes[1].length > 1" v-model:type="_type" :types="materialTypes['1']" />
-    <br />
-    <avue-crud
-      ref="crud"
-      v-model:page="pageData"
-      v-model:search="searchCondition"
-      :table-loading="_loading"
-      :data="data"
-      :option="option"
-      :before-close="handleCloseDialog"
-      @search-change="
-        (form, done) => {
-          getData(1);
-          done();
-        }
-      "
-      @search-reset="getData(1)"
-      @refresh-change="getData"
-      @current-change="getData"
-      @size-change="getData(1)"
-      @row-save="handleRowSave"
-      @row-update="handleRowUpdate"
-    >
-      <template #menu="scope">
-        <custom-table-operate :actions="actions" :data="scope" />
+  <div class="app-container">
+    <div class="container-custom">
+      <div ref="searchBarRef" class="search-box">
+        <div class="search-bar">
+          <div class="search-bar-left">
+            <el-form ref="searchForm" :inline="true" :model="formInline" class="demo-form-inline" :label-width="'auto'">
+              <el-form-item label="姓名" prop="name">
+                <el-input v-model="formInline.name" placeholder="请输入姓名" clearable />
+              </el-form-item>
+              <el-form-item label="联系方式" prop="phone">
+                <el-input v-model="formInline.phone" placeholder="请输入联系方式" clearable />
+              </el-form-item>
+              <el-form-item label="">
+                <el-button type="primary" icon="Search" @click="onSubmit">查询</el-button>
+                <el-button icon="Refresh" @click="resetForm">重置</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+        </div>
+      </div>
+      <div class="table-toolbar">
+        <el-button type="primary" icon="plus">新增</el-button>
+      </div>
+      <div class="table-cont">
+        <tableComponent
+          :table-data="tableData"
+          :columns="columns"
+          :show-selection="false"
+          :loading="tableLoading"
+          :total="tableTotal"
+          :current-page="formInline.current"
+          :page-size="formInline.size"
+          :show-sort="true"
+          @page-change="handlePaginationChange"
+        >
+          <!-- 自定义-操作 -->
+          <template #action="slotProps">
+            <el-button type="primary" @click="seeDetails(slotProps.row)">详情</el-button>
+            <el-button type="primary" @click="handleEdit(slotProps.row)">编辑</el-button>
+            <el-button @click="handleDelete(slotProps.row)">删除</el-button>
+          </template>
+        </tableComponent>
+      </div>
+    </div>
+
+    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="500" :close-on-click-modal="false">
+      <el-form ref="dialogRef" :model="dialogForm" :label-width="'80'" :rules="dialogFormRules">
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="dialogForm.name" autocomplete="off" placeholder="请输入姓名" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="onSaveCategory">保存</el-button>
+          <el-button @click="cancelDialog">取消</el-button>
+        </div>
       </template>
-      <template #photoUrl-form="{ type }">
-        <Attrs v-model:attrs="attrs" :type="type == 'add' ? 'add' : 'view'" :limit="2" />
-      </template>
-      <template #checkInfo-form="{ row }">
-        <section style="text-align: center; line-height: 58px">
-          <el-button @click="handleCheckInfo('open')">查看报告</el-button>
-        </section>
-      </template>
-      <template #detectionReport-form="{ type }">
-        <Attrs v-model:attrs="reportAttrs" :type="type" :up-btn="reportAttrs.length < 1" :file-num="reportAttrs.length > 0 ? 1 : 3" :limit="2" />
-      </template>
-      <template #productSpecification-form="{ value, type }">
-        <NumberSelect v-if="type == 'add'" v-model:value="productSpecification" :options="goodsUnitOptions" />
-        <span v-if="type == 'view'">{{ value }}</span>
-      </template>
-      <template #dosage-form="{ value, type }">
-        <NumberSelect v-if="type == 'add'" v-model:value="useDosage" :options="useDosageUnit" />
-        <span v-if="type == 'view'">{{ value }}</span>
-      </template>
-      <template #checkBtn-form>
-        <section style="text-align: center; line-height: 58px">
-          <el-button @click="handleCheckInfo('close')">关闭</el-button>
-        </section>
-      </template>
-    </avue-crud>
-  </section>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup>
-import { ref, watch } from 'vue';
-import TypeMenu from '../../common/TypeMenu.vue';
-import { CRUD_OPTIONS, customRules } from '@/config';
-import { useBasicInfo } from '@/views/inputSuppliesManage/hooks/useBasicInfo';
-import Attrs from '@/views/inputSuppliesManage/common/Attrs.vue';
-import NumberSelect from '@/views/inputSuppliesManage/common/NumberSelect.vue';
+import { ref, reactive, computed, onMounted, onBeforeUnmount } from 'vue';
+import tableComponent from '@/components/tableComponent.vue';
+import { ElMessage } from 'element-plus';
 import inputSuppliesApi from '@/apis/inputSuppliesApi';
-import { ElMessage, ElMessageBox } from 'element-plus';
-import assistFn from '@/views/inputSuppliesManage/hooks/useAssistFn';
-const { deleteFn } = new assistFn();
-
-const { defaultGet, loadFinish, materialTypes, materialTwoLevel, goodsUnitOptions, useDosageUnit, handleNumUnit, handleShowName, targetName } =
-  useBasicInfo({
-    moduleType: '1',
-  });
 const { getPesticideList, addPesticide, pesticideReportSave, delPesticide } = inputSuppliesApi;
 
-/* --------------- data --------------- */
-// #region
-const _type = ref('0');
-watch(
-  () => _type.value,
-  () => getData(1),
-  {
-    deep: true,
-  }
-);
-const searchCondition = ref({
-  keywords: '',
-});
-const crud = ref();
-const _loading = ref(true);
-const data = ref([]);
-const pageData = ref({
-  total: 0,
-  currentPage: 1,
+// 查询条件
+const formInline = reactive({
+  name: '',
+  phone: '',
+  current: 1,
   size: 10,
 });
+const searchForm = ref(null);
+const onSubmit = () => {
+  formInline.current = 1;
+  loadData();
+};
+const resetForm = () => {
+  searchForm.value.resetFields();
+};
 
-const dicDatas = ref({
-  _targetPests: {
-    one: '1',
-    two: '1',
-    dic: [],
-  },
-  _mainComponent: {
-    one: '1',
-    two: '2',
-    dic: [],
-  },
-  _produceDosage: {
-    one: '1',
-    two: '3',
-    dic: [],
-  },
+// 表格数据
+const tableData = ref([]);
+const selectedIds = ref([]);
+const btnStatus = computed(() => {
+  return selectedIds.value.length <= 0;
 });
-const option = ref({
-  ...CRUD_OPTIONS,
-  selection: false,
-  labelWidth: 124,
-  editBtn: false,
-  delBtn: false,
-  dialogWidth: '60%',
-  updateBtnText: '上传报告',
-  column: [
-    {
-      hide: true,
-      label: '关键字',
-      prop: 'keywords',
-      search: true,
-      addDisplay: false,
-      editDisplay: false,
-      searchPlaceholder: '输入肥料名称',
-      viewDisplay: false,
-    },
-    // {
-    //   prop: 'id',
-    //   label: '农药编号',
-    //   addDisplay: false,
-    //   editDisplay: false,
-    // },
-    {
-      prop: 'pesticideName',
-      label: '名称',
-      width: '120',
-      editDisplay: false,
-      rules: customRules({ msg: '请输入农药名称' }),
-    },
-    {
-      hide: true,
-      prop: 'productStandCode',
-      label: '产品标准证号',
-      width: '120',
-      viewDisplay: false,
-      editDisplay: false,
-      rules: customRules({ msg: '请输入产品标准证号' }),
-    },
-    {
-      hide: true,
-      prop: 'photoUrl',
-      label: '农药图片',
-      span: 24,
-      editDisplay: false,
-    },
-    {
-      hide: true,
-      prop: 'pesticideRegistCode',
-      label: '农药登记证号',
-      width: '120',
-      viewDisplay: false,
-      editDisplay: false,
-      rules: customRules({ msg: '请输登记证号' }),
-    },
-    {
-      prop: 'manufacturer',
-      label: '生产厂家',
-      width: '220',
-      editDisplay: false,
-      rules: customRules({ msg: '请输入生产厂家' }),
-    },
-    // {
-    //   prop: 'distributor',
-    //   width: '220',
-    //   label: '经销商',
-    //   editDisplay: false,
-    // },
-    {
-      prop: 'productSpecification',
-      width: '100',
-      label: '产品规格',
-      editDisplay: false,
-    },
-    {
-      prop: 'toxicityLevel',
-      width: '140',
-      label: '毒性',
-      editDisplay: false,
-      value: '无毒',
-    },
-    {
-      prop: 'dosage',
-      width: '140',
-      label: '建议用量',
-      editDisplay: false,
-    },
-    {
-      prop: 'expiryDate',
-      label: '保质期',
-      addDisplay: false,
-      editDisplay: false,
-    },
-    {
-      prop: 'targetPests',
-      width: '200',
-      label: '防治对象',
-      addDisplay: false,
-      editDisplay: false,
-    },
-    {
-      prop: 'mainComponent',
-      width: '200',
-      label: '化学成分',
-      addDisplay: false,
-      editDisplay: false,
-    },
-    {
-      prop: 'produceDosage',
-      width: '200',
-      label: '加工剂型',
-      addDisplay: false,
-      editDisplay: false,
-    },
-    {
-      hide: true,
-      prop: '_targetPests',
-      label: '防治对象',
-      type: 'cascader',
-      multiple: true,
-      dicData: [],
-      value: [],
-      span: 24,
-      viewDisplay: false,
-      editDisplay: false,
-      rules: customRules({ msg: '请选择防治对象' }),
-      expandTrigger: 'click',
-    },
-    {
-      hide: true,
-      prop: '_mainComponent',
-      label: '化学成分',
-      type: 'cascader',
-      multiple: true,
-      dicData: [],
-      value: [],
-      span: 24,
-      viewDisplay: false,
-      editDisplay: false,
-      rules: customRules({ msg: '请选择主要成分' }),
-      expandTrigger: 'click',
-    },
-    {
-      hide: true,
-      prop: '_produceDosage',
-      label: '加工剂型',
-      type: 'cascader',
-      multiple: true,
-      dicData: [],
-      value: [],
-      span: 24,
-      viewDisplay: false,
-      editDisplay: false,
-      rules: customRules({ msg: '加工剂型' }),
-      expandTrigger: 'click',
-    },
-    {
-      hide: true,
-      prop: 'usageMethod',
-      label: '使用方法',
-      type: 'textarea',
-      span: 24,
-      viewDisplay: false,
-      editDisplay: false,
-    },
-    {
-      hide: true,
-      prop: 'precautions',
-      label: '注意事项',
-      type: 'textarea',
-      span: 24,
-      viewDisplay: false,
-      editDisplay: false,
-    },
-    {
-      labelWidth: 0,
-      border: false,
-      prop: 'checkInfo',
-      span: 24,
-      addDisplay: false,
-      editDisplay: false,
-    },
-  ],
-  group: [
-    {
-      label: '农药基本信息',
-      prop: 'basic_info',
-      addDisplay: false,
-      viewDisplay: false,
-      column: [
-        {
-          prop: 'pesticideName',
-          label: '农药名称',
-          editDisabled: true,
-          span: 24,
-        },
-        {
-          prop: 'manufacturer',
-          label: '生产商',
-          editDisabled: true,
-          span: 24,
-        },
-        {
-          prop: 'distributor',
-          label: '经销商',
-          editDisabled: true,
-          span: 24,
-        },
-        {
-          prop: 'photoUrl',
-          label: '农药图片',
-          editDisabled: true,
-          span: 24,
-        },
-      ],
-    },
-    {
-      label: '农药检测信息',
-      prop: 'check_info',
-      addDisplay: false,
-      viewDisplay: false,
-      column: [
-        {
-          prop: 'detectionTime',
-          label: '检测时间',
-          type: 'date',
-          valueFormat: 'YYYY-MM-DD',
-          rules: customRules({ msg: '请选择检测时间' }),
-        },
-        {
-          prop: 'detectionResult',
-          label: '检测结果',
-          type: 'select',
-          clearable: false,
-          rules: customRules({ msg: '请选择检测结果' }),
-          dicData: [
-            { value: '0', label: '合格' },
-            { value: '1', label: '不合格' },
-          ],
-          value: '0',
-        },
-        {
-          prop: 'detectionUnit',
-          label: '检测单位',
-          rules: customRules({ msg: '请输入检测单位' }),
-        },
-        {
-          prop: 'detectionConclusion',
-          label: '检测结论',
-          rules: customRules({ msg: '请输入检测结论' }),
-        },
-        {
-          prop: 'detectionReport',
-          label: '质检报告',
-          span: 24,
-          rules: [
-            {
-              required: true,
-              trigger: ['blur', 'change'],
-              validator: (rule, value, callback) => {
-                if (!reportAttrs.value.length) {
-                  callback(new Error('请上传检测报告'));
-                } else {
-                  callback();
-                }
-              },
-            },
-          ],
-        },
-        {
-          labelWidth: 0,
-          prop: 'checkBtn',
-          span: 24,
-          editDisplay: false,
-        },
-      ],
-    },
+const tableLoading = ref(false);
+const tableTotal = ref(0);
+let nowClickRow = ref({});
+const columns = ref([
+  // { prop: "id", label: "ID" },
+  { prop: 'name', label: '类别名称' },
+  { prop: 'phone', label: '联系方式' },
+  { prop: 'landName', label: '用药地块' },
+  { prop: 'detectionTime', label: '检测时间' },
+  { prop: 'detectionResult', label: '检测结果' },
+  { prop: 'detectionUnit', label: '检测单位' },
+  // { prop: 'status', label: '检测报告(是否上传)' },
+  { prop: 'action', label: '操作', slotName: 'action', width: 230, fixed: 'right' },
+]);
+const handlePaginationChange = ({ page, pageSize }) => {
+  formInline.current = page;
+  formInline.size = pageSize;
+  // 这里可以调用API获取新数据
+  loadData();
+};
+const loadData = async () => {
+  tableLoading.value = true;
+  try {
+    let response = await getPesticideList(formInline);
+    tableLoading.value = false;
+    if (response.code == 200) {
+      tableData.value = response.data.records;
+      tableTotal.value = response.data.total;
+    }
+  } catch (error) {
+    tableLoading.value = false;
+    console.error(error);
+  }
+};
+
+// 查看详情
+const seeDetails = async (row) => {
+  nowClickRow.value = row;
+  console.log('要查看详情的行: ', row);
+};
+// 编辑操作
+const handleEdit = async (row) => {
+  nowClickRow.value = row;
+  dialogTitle.value = '编辑';
+  dialogForm.id = row.id;
+  dialogForm.name = row.name;
+  dialogFormVisible.value = true;
+};
+// 删除操作
+const handleDelete = (row) => {
+  deleteGoods(row.id);
+};
+const deleteGoods = async (ids) => {
+  try {
+    tableLoading.value = true;
+    let res = await delPesticide({ id: ids });
+    tableLoading.value = false;
+    if (res.code == 200) {
+      onSubmit();
+      ElMessage.success('删除成功');
+    } else {
+      ElMessage.error(res.msg);
+    }
+  } catch (error) {
+    tableLoading.value = false;
+  }
+};
+
+const dialogFormVisible = ref(false);
+const dialogRef = ref(null);
+const dialogTitle = ref('新增');
+const dialogForm = reactive({
+  id: '',
+  name: '',
+});
+const dialogFormRules = ref({
+  name: [
+    { required: true, message: '请输入分类名称', trigger: 'blur' },
+    { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' },
   ],
 });
-watch(
-  () => loadFinish.value,
-  () => {
-    if (loadFinish.value) {
-      for (let key in dicDatas.value) {
-        option.value.column.forEach((item) => {
-          if (item.prop === key) {
-            let dic = materialTwoLevel?.[dicDatas.value[key].one]?.[dicDatas.value[key].two] ?? [];
-            dicDatas.value[key].dic = dic;
-            item.dicData = dic;
+const onSaveCategory = () => {
+  dialogRef.value.validate(async (valid, fields) => {
+    if (valid) {
+      try {
+        let param = { ...dialogForm };
+        param.level = dialogForm.selectedNode.level ?? '';
+        param.type = dialogForm.selectedNode.type ?? '';
+        let response;
+        if (dialogTitle.value == '新增') {
+          response = await addPesticide(param);
+        } else {
+          response = await pesticideReportSave(param);
+        }
+        if (response.code == 200) {
+          cancelDialog();
+          onSubmit();
+          if (dialogTitle.value == '新增') {
+            ElMessage.success('新增成功!');
+          } else {
+            ElMessage.success('编辑成功!');
           }
-        });
+        } else {
+          ElMessage.error(response.msg);
+        }
+      } catch (error) {
+        console.error(error);
       }
     }
-  }
-);
-const attrs = ref([]);
-const reportAttrs = ref([]);
-const productSpecification = ref({
-  num: 1,
-  type: '1',
-});
-const useDosage = ref({
-  num: 1,
-  type: '1',
-});
-const actions = ref([
-  {
-    name: '上传报告',
-    icon: 'view',
-    event: ({ row }) => handleEdit(row),
-  },
-  {
-    name: '详情',
-    icon: 'view',
-    event: ({ row }) => handleInfo(row),
-  },
-  {
-    type: 'danger',
-    name: '删除',
-    icon: 'delete',
-    event: ({ row }) => deleteFn(row.id, delPesticide, getData),
-  },
-]);
-// #endregion
-
-/* --------------- methods --------------- */
-// #region
-
-defaultGet(getData);
-async function getData(reset) {
-  _loading.value = true;
-  reset == 1 && (pageData.value.currentPage = 1);
-  let params = {
-    current: pageData.value.currentPage,
-    size: pageData.value.size,
-    pesticideName: searchCondition.value.keywords,
-  };
-  _type.value != '0' && (params.classifyId = _type.value);
-  let res = await getPesticideList(params);
-  console.log('res --- ', res);
-  _loading.value = false;
-  if (res && res.code === 200) {
-    data.value = res.data.records;
-    data.value.forEach((v) => {
-      v.productSpecification = handleNumUnit({ num1: v.productSpecification, unit1: v.productUnit, type: 1 });
-      v.dosage = handleNumUnit({ unit1: v.productUnit, num2: v.suggestDosage, unit2: v.suggestUnit, type: -1 });
-      v.targetPests = handleShowName(v.targetPests);
-      v.mainComponent = handleShowName(v.mainComponent);
-      v.produceDosage = handleShowName(v.produceDosage);
-    });
-    pageData.value.total = res.data.total;
-  }
-}
-function handleCloseDialog(done) {
-  delete option.value.column[1].span;
-  resetOtherInfo();
-  handleCheckInfoChange();
-  done();
-}
-
-async function handleRowSave(form, done, loading) {
-  let data = {
-    pesticideName: form.pesticideName,
-    productStandCode: form.productStandCode,
-    pesticideRegistCode: form.pesticideRegistCode,
-    manufacturer: form.manufacturer,
-    distributor: form.distributor,
-    toxicityLevel: form.toxicityLevel,
-    usageMethod: form.usageMethod,
-    precautions: form.precautions,
-    expiryDate: form.expiryDate,
-    productSpecification: productSpecification.value.num,
-    productUnit: productSpecification.value.type,
-    suggestDosage: useDosage.value.num,
-    suggestUnit: useDosage.value.type,
-  };
-  if (attrs.value.length) {
-    data.photoUrl = attrs.value.map((v) => v.url).join();
-  }
-  if (form._targetPests.length) {
-    let names = [];
-    form._targetPests.forEach((item) => {
-      names.push(targetName(dicDatas.value._targetPests.dic, item, ''));
-    });
-    data.targetPests = JSON.stringify(form._targetPests) + '|' + JSON.stringify(names);
-  }
-  if (form._mainComponent.length) {
-    let names = [];
-    form._mainComponent.forEach((item) => {
-      names.push(targetName(dicDatas.value._mainComponent.dic, item, ''));
-    });
-    data.mainComponent = JSON.stringify(form._mainComponent) + '|' + JSON.stringify(names);
-  }
-  if (form._produceDosage.length) {
-    let names = [];
-    form._produceDosage.forEach((item) => {
-      names.push(targetName(dicDatas.value._produceDosage.dic, item, ''));
-    });
-    data.produceDosage = JSON.stringify(form._produceDosage) + '|' + JSON.stringify(names);
-  }
-  let res = await addPesticide(data);
-  loading();
-  if (res.code == 200) {
-    ElMessage.success('保存成功');
-    getData();
-    resetOtherInfo();
-    done();
-  }
-}
-function resetOtherInfo() {
-  let obj = { num: 1, type: '1' };
-  attrs.value = [];
-  reportAttrs.value = [];
-  productSpecification.value = obj;
-  useDosage.value = obj;
-}
-
-function handleEdit(row) {
-  handleAttrs(row);
-  option.value.group[1].column[0].value = row.detectionTime;
-  option.value.group[1].column[1].value = row.detectionResult;
-  option.value.group[1].column[2].value = row.detectionUnit;
-  option.value.group[1].column[3].value = row.detectionConclusion;
-  handleCheckInfoChange('open');
-  crud.value.rowEdit(row);
-}
-function handleInfo(row) {
-  handleAttrs(row);
-  option.value.column[1].span = 24;
-  crud.value.rowView(row);
-}
-/* 处理展示附件 */
-function handleAttrs(row = {}) {
-  if (!row) {
-    return;
-  }
-  if (row.photoUrl) {
-    attrs.value = row.photoUrl.split(',').map((v, i) => {
-      return {
-        url: v,
-        uid: `photo_${i}_${Date.now()}`,
-      };
-    });
-  }
-  if (row.detectionReport) {
-    reportAttrs.value = row.detectionReport.split(',').map((v, i) => {
-      return {
-        url: v,
-        uid: `report_${i}_${Date.now()}`,
-      };
-    });
-  }
-}
-function handleCheckInfo(type) {
-  handleCheckInfoChange(type == 'open');
-}
-/* bol && 查看检测报告关闭其他信息  !bol && 关闭检测报告打开其他信息 */
-function handleCheckInfoChange(bol = false) {
-  option.value.group.forEach((v) => {
-    v.viewDisplay = bol;
   });
-  if (bol) {
-    option.value.column.forEach((v) => {
-      v.viewDisplay = false;
-    });
-  } else {
-    option.value.column.forEach((v) => {
-      if (!v.hide || v.prop == 'photoUrl') {
-        v.viewDisplay = true;
-      }
-    });
-  }
-}
-async function handleRowUpdate(form, index, done, loading) {
-  console.log('update from -- ', form);
-  let data = {
-    id: form.id,
-    detectionTime: form.detectionTime,
-    detectionResult: form.detectionResult,
-    detectionUnit: form.detectionUnit,
-    detectionConclusion: form.detectionConclusion,
-    detectionReport: reportAttrs.value.map((v) => v.url).join(),
-  };
-  let res = await pesticideReportSave(data);
-  loading();
-  if (res.code == 200) {
-    ElMessage.success('检测报告保存成功');
-    getData();
-    done();
-  }
-}
-// #endregion
+};
+const cancelDialog = () => {
+  Object.assign(dialogForm, {
+    // 保持响应性，手动清空字段
+    id: '',
+    name: '',
+  });
+  dialogFormVisible.value = false;
+};
+onMounted(() => {
+  onSubmit();
+});
 </script>
-
-<style lang="scss" scoped>
-h2 {
-  font-size: 24px;
-  font-weight: bold;
-  font-family: '黑体';
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index原.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index原.vue
new file mode 100644
index 0000000..e680321
--- /dev/null
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index原.vue
@@ -0,0 +1,624 @@
+<template>
+  <section class="custom-page">
+    <h2>农药使用监管</h2>
+    <!-- <TypeMenu v-if="materialTypes[1].length > 1" v-model:type="_type" :types="materialTypes['1']" /> -->
+    <br />
+    <avue-crud
+      ref="crud"
+      v-model:page="pageData"
+      v-model:search="searchCondition"
+      :table-loading="_loading"
+      :data="data"
+      :option="option"
+      :before-close="handleCloseDialog"
+      @search-change="
+        (form, done) => {
+          getData(1);
+          done();
+        }
+      "
+      @search-reset="getData(1)"
+      @refresh-change="getData"
+      @current-change="getData"
+      @size-change="getData(1)"
+      @row-save="handleRowSave"
+      @row-update="handleRowUpdate"
+    >
+      <template #menu="scope">
+        <custom-table-operate :actions="actions" :data="scope" />
+      </template>
+      <template #photoUrl-form="{ type }">
+        <Attrs v-model:attrs="attrs" :type="type == 'add' ? 'add' : 'view'" :limit="2" />
+      </template>
+      <template #checkInfo-form="{ row }">
+        <section style="text-align: center; line-height: 58px">
+          <el-button @click="handleCheckInfo('open')">查看报告</el-button>
+        </section>
+      </template>
+      <template #detectionReport-form="{ type }">
+        <Attrs v-model:attrs="reportAttrs" :type="type" :up-btn="reportAttrs.length < 1" :file-num="reportAttrs.length > 0 ? 1 : 3" :limit="2" />
+      </template>
+      <template #productSpecification-form="{ value, type }">
+        <NumberSelect v-if="type == 'add'" v-model:value="productSpecification" :options="goodsUnitOptions" />
+        <span v-if="type == 'view'">{{ value }}</span>
+      </template>
+      <template #dosage-form="{ value, type }">
+        <NumberSelect v-if="type == 'add'" v-model:value="useDosage" :options="useDosageUnit" />
+        <span v-if="type == 'view'">{{ value }}</span>
+      </template>
+      <template #checkBtn-form>
+        <section style="text-align: center; line-height: 58px">
+          <el-button @click="handleCheckInfo('close')">关闭</el-button>
+        </section>
+      </template>
+    </avue-crud>
+  </section>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue';
+import TypeMenu from '../../common/TypeMenu.vue';
+import { CRUD_OPTIONS, customRules } from '@/config';
+import { useBasicInfo } from '@/views/inputSuppliesManage/hooks/useBasicInfo';
+import Attrs from '@/views/inputSuppliesManage/common/Attrs.vue';
+import NumberSelect from '@/views/inputSuppliesManage/common/NumberSelect.vue';
+import inputSuppliesApi from '@/apis/inputSuppliesApi';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import assistFn from '@/views/inputSuppliesManage/hooks/useAssistFn';
+const { deleteFn } = new assistFn();
+
+const { defaultGet, loadFinish, materialTypes, materialTwoLevel, goodsUnitOptions, useDosageUnit, handleNumUnit, handleShowName, targetName } =
+  useBasicInfo({
+    moduleType: '1',
+  });
+const { getPesticideList, addPesticide, pesticideReportSave, delPesticide } = inputSuppliesApi;
+
+/* --------------- data --------------- */
+// #region
+const _type = ref('0');
+watch(
+  () => _type.value,
+  () => getData(1),
+  {
+    deep: true,
+  }
+);
+const searchCondition = ref({
+  name: '',
+  phone: '',
+});
+const crud = ref();
+const _loading = ref(true);
+const data = ref([]);
+const pageData = ref({
+  total: 0,
+  currentPage: 1,
+  size: 10,
+});
+
+const dicDatas = ref({
+  _targetPests: {
+    one: '1',
+    two: '1',
+    dic: [],
+  },
+  _mainComponent: {
+    one: '1',
+    two: '2',
+    dic: [],
+  },
+  _produceDosage: {
+    one: '1',
+    two: '3',
+    dic: [],
+  },
+});
+const option = ref({
+  ...CRUD_OPTIONS,
+  selection: false,
+  labelWidth: 124,
+  editBtn: false,
+  delBtn: false,
+  dialogWidth: '60%',
+  updateBtnText: '上传报告',
+  column: [
+    // 查询条件
+    {
+      hide: true,
+      label: '姓名',
+      prop: 'name',
+      search: true,
+      addDisplay: false,
+      editDisplay: false,
+      searchPlaceholder: '请输入姓名',
+      viewDisplay: false,
+    },
+    {
+      hide: true,
+      label: '手机号',
+      prop: 'phone',
+      search: true,
+      addDisplay: false,
+      editDisplay: false,
+      searchPlaceholder: '请输入手机号',
+      viewDisplay: false,
+    },
+    // 弹窗字段
+    {
+      prop: 'name',
+      label: '姓名',
+      width: '120',
+      editDisplay: false,
+      rules: customRules({ msg: '请输入姓名' }),
+    },
+    {
+      prop: 'phone',
+      label: '联系方式',
+      width: '220',
+      editDisplay: false,
+      rules: customRules({ msg: '请输入联系方式' }),
+    },
+    {
+      prop: 'landName',
+      width: '200',
+      label: '用药地块',
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      hide: true,
+      prop: 'photoUrl',
+      label: '检测报告',
+      span: 24,
+      editDisplay: false,
+    },
+    {
+      hide: true,
+      prop: 'pesticideRegistCode',
+      label: '农药登记证号',
+      width: '120',
+      viewDisplay: false,
+      editDisplay: false,
+      rules: customRules({ msg: '请输登记证号' }),
+    },
+    {
+      prop: 'manufacturer',
+      label: '生产厂家',
+      width: '220',
+      editDisplay: false,
+      rules: customRules({ msg: '请输入生产厂家' }),
+    },
+    {
+      prop: 'productSpecification',
+      width: '100',
+      label: '产品规格',
+      editDisplay: false,
+    },
+    {
+      prop: 'toxicityLevel',
+      width: '140',
+      label: '毒性',
+      editDisplay: false,
+      value: '无毒',
+    },
+    {
+      prop: 'dosage',
+      width: '140',
+      label: '建议用量',
+      editDisplay: false,
+    },
+    {
+      prop: 'expiryDate',
+      label: '保质期',
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      prop: 'targetPests',
+      width: '200',
+      label: '防治对象',
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      prop: 'mainComponent',
+      width: '200',
+      label: '化学成分',
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      prop: 'produceDosage',
+      width: '200',
+      label: '加工剂型',
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      hide: true,
+      prop: '_targetPests',
+      label: '防治对象',
+      type: 'cascader',
+      multiple: true,
+      dicData: [],
+      value: [],
+      span: 24,
+      viewDisplay: false,
+      editDisplay: false,
+      rules: customRules({ msg: '请选择防治对象' }),
+      expandTrigger: 'click',
+    },
+    {
+      hide: true,
+      prop: '_mainComponent',
+      label: '化学成分',
+      type: 'cascader',
+      multiple: true,
+      dicData: [],
+      value: [],
+      span: 24,
+      viewDisplay: false,
+      editDisplay: false,
+      rules: customRules({ msg: '请选择主要成分' }),
+      expandTrigger: 'click',
+    },
+    {
+      hide: true,
+      prop: '_produceDosage',
+      label: '加工剂型',
+      type: 'cascader',
+      multiple: true,
+      dicData: [],
+      value: [],
+      span: 24,
+      viewDisplay: false,
+      editDisplay: false,
+      rules: customRules({ msg: '加工剂型' }),
+      expandTrigger: 'click',
+    },
+    {
+      hide: true,
+      prop: 'usageMethod',
+      label: '使用方法',
+      type: 'textarea',
+      span: 24,
+      viewDisplay: false,
+      editDisplay: false,
+    },
+    {
+      hide: true,
+      prop: 'precautions',
+      label: '注意事项',
+      type: 'textarea',
+      span: 24,
+      viewDisplay: false,
+      editDisplay: false,
+    },
+    {
+      labelWidth: 0,
+      border: false,
+      prop: 'checkInfo',
+      span: 24,
+      addDisplay: false,
+      editDisplay: false,
+    },
+  ],
+  group: [
+    {
+      label: '农药基本信息',
+      prop: 'basic_info',
+      addDisplay: false,
+      viewDisplay: false,
+      column: [
+        {
+          prop: 'pesticideName',
+          label: '农药名称',
+          editDisabled: true,
+          span: 24,
+        },
+        {
+          prop: 'manufacturer',
+          label: '生产商',
+          editDisabled: true,
+          span: 24,
+        },
+        {
+          prop: 'distributor',
+          label: '经销商',
+          editDisabled: true,
+          span: 24,
+        },
+        {
+          prop: 'photoUrl',
+          label: '农药图片',
+          editDisabled: true,
+          span: 24,
+        },
+      ],
+    },
+    {
+      label: '农药检测信息',
+      prop: 'check_info',
+      addDisplay: false,
+      viewDisplay: false,
+      column: [
+        {
+          prop: 'detectionTime',
+          label: '检测时间',
+          type: 'date',
+          valueFormat: 'YYYY-MM-DD',
+          rules: customRules({ msg: '请选择检测时间' }),
+        },
+        {
+          prop: 'detectionResult',
+          label: '检测结果',
+          type: 'select',
+          clearable: false,
+          rules: customRules({ msg: '请选择检测结果' }),
+          dicData: [
+            { value: '0', label: '合格' },
+            { value: '1', label: '不合格' },
+          ],
+          value: '0',
+        },
+        {
+          prop: 'detectionUnit',
+          label: '检测单位',
+          rules: customRules({ msg: '请输入检测单位' }),
+        },
+        {
+          prop: 'detectionConclusion',
+          label: '检测结论',
+          rules: customRules({ msg: '请输入检测结论' }),
+        },
+        {
+          prop: 'detectionReport',
+          label: '质检报告',
+          span: 24,
+          rules: [
+            {
+              required: true,
+              trigger: ['blur', 'change'],
+              validator: (rule, value, callback) => {
+                if (!reportAttrs.value.length) {
+                  callback(new Error('请上传检测报告'));
+                } else {
+                  callback();
+                }
+              },
+            },
+          ],
+        },
+        {
+          labelWidth: 0,
+          prop: 'checkBtn',
+          span: 24,
+          editDisplay: false,
+        },
+      ],
+    },
+  ],
+});
+watch(
+  () => loadFinish.value,
+  () => {
+    if (loadFinish.value) {
+      for (let key in dicDatas.value) {
+        option.value.column.forEach((item) => {
+          if (item.prop === key) {
+            let dic = materialTwoLevel?.[dicDatas.value[key].one]?.[dicDatas.value[key].two] ?? [];
+            dicDatas.value[key].dic = dic;
+            item.dicData = dic;
+          }
+        });
+      }
+    }
+  }
+);
+const attrs = ref([]);
+const reportAttrs = ref([]);
+const productSpecification = ref({
+  num: 1,
+  type: '1',
+});
+const useDosage = ref({
+  num: 1,
+  type: '1',
+});
+const actions = ref([
+  {
+    name: '编辑',
+    icon: 'view',
+    event: ({ row }) => handleEdit(row),
+  },
+  {
+    name: '详情',
+    icon: 'view',
+    event: ({ row }) => handleInfo(row),
+  },
+  {
+    type: 'danger',
+    name: '删除',
+    icon: 'delete',
+    event: ({ row }) => deleteFn(row.id, delPesticide, getData),
+  },
+]);
+// #endregion
+
+/* --------------- methods --------------- */
+// #region
+
+defaultGet(getData);
+async function getData(reset) {
+  _loading.value = true;
+  reset == 1 && (pageData.value.currentPage = 1);
+  let params = {
+    current: pageData.value.currentPage,
+    size: pageData.value.size,
+    name: searchCondition.value.name,
+    phone: searchCondition.value.phone,
+  };
+  _type.value != '0' && (params.classifyId = _type.value);
+  let res = await getPesticideList(params);
+  console.log('res --- ', res);
+  _loading.value = false;
+  if (res && res.code === 200) {
+    data.value = res.data.records;
+    // data.value.forEach((v) => {
+    //   v.productSpecification = handleNumUnit({ num1: v.productSpecification, unit1: v.productUnit, type: 1 });
+    //   v.dosage = handleNumUnit({ unit1: v.productUnit, num2: v.suggestDosage, unit2: v.suggestUnit, type: -1 });
+    //   v.targetPests = handleShowName(v.targetPests);
+    //   v.mainComponent = handleShowName(v.mainComponent);
+    //   v.produceDosage = handleShowName(v.produceDosage);
+    // });
+    pageData.value.total = res.data.total;
+  }
+}
+function handleCloseDialog(done) {
+  delete option.value.column[1].span;
+  resetOtherInfo();
+  handleCheckInfoChange();
+  done();
+}
+
+async function handleRowSave(form, done, loading) {
+  let data = {
+    pesticideName: form.pesticideName,
+    productStandCode: form.productStandCode,
+    pesticideRegistCode: form.pesticideRegistCode,
+    manufacturer: form.manufacturer,
+    distributor: form.distributor,
+    toxicityLevel: form.toxicityLevel,
+    usageMethod: form.usageMethod,
+    precautions: form.precautions,
+    expiryDate: form.expiryDate,
+    productSpecification: productSpecification.value.num,
+    productUnit: productSpecification.value.type,
+    suggestDosage: useDosage.value.num,
+    suggestUnit: useDosage.value.type,
+  };
+  if (attrs.value.length) {
+    data.photoUrl = attrs.value.map((v) => v.url).join();
+  }
+  if (form._targetPests.length) {
+    let names = [];
+    form._targetPests.forEach((item) => {
+      names.push(targetName(dicDatas.value._targetPests.dic, item, ''));
+    });
+    data.targetPests = JSON.stringify(form._targetPests) + '|' + JSON.stringify(names);
+  }
+  if (form._mainComponent.length) {
+    let names = [];
+    form._mainComponent.forEach((item) => {
+      names.push(targetName(dicDatas.value._mainComponent.dic, item, ''));
+    });
+    data.mainComponent = JSON.stringify(form._mainComponent) + '|' + JSON.stringify(names);
+  }
+  if (form._produceDosage.length) {
+    let names = [];
+    form._produceDosage.forEach((item) => {
+      names.push(targetName(dicDatas.value._produceDosage.dic, item, ''));
+    });
+    data.produceDosage = JSON.stringify(form._produceDosage) + '|' + JSON.stringify(names);
+  }
+  let res = await addPesticide(data);
+  loading();
+  if (res.code == 200) {
+    ElMessage.success('保存成功');
+    getData();
+    resetOtherInfo();
+    done();
+  }
+}
+function resetOtherInfo() {
+  let obj = { num: 1, type: '1' };
+  attrs.value = [];
+  reportAttrs.value = [];
+  productSpecification.value = obj;
+  useDosage.value = obj;
+}
+
+function handleEdit(row) {
+  handleAttrs(row);
+  option.value.group[1].column[0].value = row.detectionTime;
+  option.value.group[1].column[1].value = row.detectionResult;
+  option.value.group[1].column[2].value = row.detectionUnit;
+  option.value.group[1].column[3].value = row.detectionConclusion;
+  handleCheckInfoChange('open');
+  crud.value.rowEdit(row);
+}
+function handleInfo(row) {
+  handleAttrs(row);
+  option.value.column[1].span = 24;
+  crud.value.rowView(row);
+}
+/* 处理展示附件 */
+function handleAttrs(row = {}) {
+  if (!row) {
+    return;
+  }
+  if (row.photoUrl) {
+    attrs.value = row.photoUrl.split(',').map((v, i) => {
+      return {
+        url: v,
+        uid: `photo_${i}_${Date.now()}`,
+      };
+    });
+  }
+  if (row.detectionReport) {
+    reportAttrs.value = row.detectionReport.split(',').map((v, i) => {
+      return {
+        url: v,
+        uid: `report_${i}_${Date.now()}`,
+      };
+    });
+  }
+}
+function handleCheckInfo(type) {
+  handleCheckInfoChange(type == 'open');
+}
+/* bol && 查看检测报告关闭其他信息  !bol && 关闭检测报告打开其他信息 */
+function handleCheckInfoChange(bol = false) {
+  option.value.group.forEach((v) => {
+    v.viewDisplay = bol;
+  });
+  if (bol) {
+    option.value.column.forEach((v) => {
+      v.viewDisplay = false;
+    });
+  } else {
+    option.value.column.forEach((v) => {
+      if (!v.hide || v.prop == 'photoUrl') {
+        v.viewDisplay = true;
+      }
+    });
+  }
+}
+async function handleRowUpdate(form, index, done, loading) {
+  console.log('update from -- ', form);
+  let data = {
+    id: form.id,
+    detectionTime: form.detectionTime,
+    detectionResult: form.detectionResult,
+    detectionUnit: form.detectionUnit,
+    detectionConclusion: form.detectionConclusion,
+    detectionReport: reportAttrs.value.map((v) => v.url).join(),
+  };
+  let res = await pesticideReportSave(data);
+  loading();
+  if (res.code == 200) {
+    ElMessage.success('检测报告保存成功');
+    getData();
+    done();
+  }
+}
+// #endregion
+</script>
+
+<style lang="scss" scoped>
+h2 {
+  font-size: 24px;
+  font-weight: bold;
+  font-family: '黑体';
+}
+</style>

From c2501411a047984926c23ef4235865492bbb87c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E6=B0=B8=E8=B6=85?= <2090205686@qq.com>
Date: Thu, 19 Jun 2025 17:22:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=95=E5=85=A5=E5=93=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20-=20=E5=86=9C=E8=8D=AF=E4=BD=BF=E7=94=A8=E7=9B=91?=
 =?UTF-8?q?=E7=AE=A1=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/apis/inputSuppliesApi/material.js     |  16 +-
 .../src/components/FileUploader/index.vue     |   5 +
 .../src/styles/custom.scss                    |  29 ++
 .../material/pesticide/index.vue              | 356 +++++++++++++++---
 4 files changed, 355 insertions(+), 51 deletions(-)

diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js
index 979f53b..73eea46 100644
--- a/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js
+++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js
@@ -17,21 +17,29 @@ export function getPesticideList(params) {
 }
 /* 新增农药 */
 export function addPesticide(data) {
-  return request('/inputGoods/pesticide/save', {
+  return request('/inputGoods/supervise/pesticide/save', {
     method: 'POST',
     data,
   });
 }
-/* 农药检测报告 */
+/* 编辑农药 */
 export function pesticideReportSave(data) {
-  return request('/inputGoods/pesticide/uploadReport', {
+  return request('/inputGoods/supervise/pesticide/edit', {
     data,
     method: 'PUT',
   });
 }
 /* 删除农药 */
 export function delPesticide(ids) {
-  return request(`/inputGoods/pesticide/delete/${ids}`);
+  return request(`/inputGoods/supervise/pesticide/delete/${ids}`);
+}
+/* 获取用药地块下拉选项 */
+export function getLandList() {
+  return request(`/inputGoods/supervise/pesticide/getLandList`);
+}
+/* 获取农药用药下拉选项 */
+export function getPesticideSelectList() {
+  return request(`/inputGoods/pesticide/getPesticideList`);
 }
 // #endregion
 
diff --git a/sub-government-affairs-service/src/components/FileUploader/index.vue b/sub-government-affairs-service/src/components/FileUploader/index.vue
index 808d766..62afe0c 100644
--- a/sub-government-affairs-service/src/components/FileUploader/index.vue
+++ b/sub-government-affairs-service/src/components/FileUploader/index.vue
@@ -2,6 +2,7 @@
   <div class="file-uploader">
     <el-upload
       class="file-uploader__upload"
+      :class="{ hide: fileList.length >= limit }"
       :http-request="customUploadRequest"
       :on-success="handleUploadSuccess"
       :on-remove="handleRemove"
@@ -107,4 +108,8 @@ function handlePreview(file) {
 .file-uploader__upload {
   margin-right: 16px;
 }
+/* .el-upload--picture-card 控制加号部分 */
+:deep(.hide .el-upload--picture-card) {
+  display: none;
+}
 </style>
diff --git a/sub-government-affairs-service/src/styles/custom.scss b/sub-government-affairs-service/src/styles/custom.scss
index 5668ff8..4c81671 100644
--- a/sub-government-affairs-service/src/styles/custom.scss
+++ b/sub-government-affairs-service/src/styles/custom.scss
@@ -5,6 +5,11 @@
     border-radius: 10px;
     background: #fff;
 
+    .custom-h2 {
+      margin: 14px 0 0 20px;
+      font-size: 24px;
+    }
+
     .search-box {
       overflow: hidden;
       padding: 16px 8px 0 16px;
@@ -303,6 +308,7 @@
 }
 // 新增商品页面-结束
 
+// 弹性布局-左对齐-上对齐
 .flex-left-top {
   display: flex;
   flex-direction: row;
@@ -316,4 +322,27 @@
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+}
+
+// 弹窗表单样式-子元素一行2个列
+.dialog-form-container {
+  .dialog-form-title {
+    font-weight: bold;
+    margin-bottom: 20px;
+  }
+  .dialog-form-item{
+    margin-right: 20px;
+    .el-input,
+    .el-select {
+      width: 230px;
+    }
+  }
+  .dialog-form-many {
+    position: relative;
+    .dialog-form-many-delete {
+      position: absolute;
+      top: 28px;
+      right: 0;
+    }
+  }
 }
\ No newline at end of file
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue
index 5b1888d..cc955d8 100644
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
     <div class="container-custom">
+      <h2 class="custom-h2">农药使用监管</h2>
       <div ref="searchBarRef" class="search-box">
         <div class="search-bar">
           <div class="search-bar-left">
@@ -20,7 +21,7 @@
         </div>
       </div>
       <div class="table-toolbar">
-        <el-button type="primary" icon="plus">新增</el-button>
+        <el-button type="primary" icon="plus" @click="addItem()">新增</el-button>
       </div>
       <div class="table-cont">
         <tableComponent
@@ -43,17 +44,119 @@
         </tableComponent>
       </div>
     </div>
-
-    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="500" :close-on-click-modal="false">
-      <el-form ref="dialogRef" :model="dialogForm" :label-width="'80'" :rules="dialogFormRules">
-        <el-form-item label="姓名" prop="name">
-          <el-input v-model="dialogForm.name" autocomplete="off" placeholder="请输入姓名" />
+    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="700" :close-on-click-modal="false">
+      <el-form
+        ref="dialogRef"
+        :model="dialogForm"
+        :inline="true"
+        :label-width="'80'"
+        :rules="dialogFormRules"
+        :disabled="formDisabled"
+        class="dialog-form-container"
+      >
+        <div class="dialog-form-title">农药用药详情</div>
+        <el-form-item label="姓名" prop="name" class="dialog-form-item">
+          <el-input v-model="dialogForm.name" clearable placeholder="请输入姓名" />
         </el-form-item>
+        <el-form-item label="联系方式" prop="phone" class="dialog-form-item">
+          <el-input v-model="dialogForm.phone" clearable placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="用药地块" prop="landId" class="dialog-form-item">
+          <el-select v-model="dialogForm.landId" placeholder="请选择" @change="handleLandsChange">
+            <el-option v-for="item in landList" :key="item.id" :value="item.id" :label="item.landName" />
+          </el-select>
+        </el-form-item>
+
+        <div class="dialog-form-title">土地残留检测</div>
+        <div style="display: flex">
+          <div style="width: 48%; display: inline-block">
+            <el-form-item label="检测时间" prop="detectionTime" class="dialog-form-item">
+              <el-date-picker
+                v-model="dialogForm.detectionTime"
+                :clearable="false"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择起始日期"
+              />
+            </el-form-item>
+            <el-form-item label="检测结果" prop="detectionResult" class="dialog-form-item">
+              <el-select v-model="dialogForm.detectionResult" placeholder="请选择">
+                <el-option value="合格" label="合格" />
+                <el-option value="不合格" label="不合格" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="检测单位" prop="detectionUnit" class="dialog-form-item">
+              <el-input v-model="dialogForm.detectionUnit" clearable placeholder="请输入检测单位" />
+            </el-form-item>
+          </div>
+          <div style="width: 50%; display: inline-block">
+            <el-form-item label="检测报告" prop="detectionReport" class="dialog-form-item" style="width: 100%">
+              <FileUploader v-model="dialogForm.detectionReport" :limit="1" />
+            </el-form-item>
+          </div>
+        </div>
+
+        <div class="dialog-form-title">
+          农药用药信息
+          <el-button v-if="!formDisabled" type="primary" icon="plus" size="small" style="margin-left: 10px" @click="addMedicationInfo()"
+            >添加用药信息</el-button
+          >
+        </div>
+        <div v-for="(item, index) in dialogForm.pesticideSuperviseDetailVO" :key="index" class="dialog-form-many">
+          <el-form-item
+            label="农药名称"
+            required
+            :prop="`pesticideSuperviseDetailVO.${index}.pesticideId`"
+            :rules="dialogFormRules.pesticideSuperviseDetailVO.defaultField.pesticideId"
+            class="dialog-form-item"
+          >
+            <el-select v-model="item.pesticideId" placeholder="请选择" @change="handlePesticideChange(item, index)">
+              <el-option v-for="el in pesticideList" :key="el.id" :value="el.id" :label="el.pesticideName" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="用药量"
+            required
+            :prop="`pesticideSuperviseDetailVO.${index}.useNumber`"
+            :rules="dialogFormRules.pesticideSuperviseDetailVO.defaultField.useNumber"
+            class="dialog-form-item"
+          >
+            <el-input-number v-model="item.useNumber" :min="1" :controls="false" placeholder="请输入用药量" style="width: 120px" />
+            <el-select v-model="item.useUnit" placeholder="请选择" style="width: 80px">
+              <el-option v-for="el in unitList" :key="el.unit" :value="el.unit" :label="el.unit" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="使用时间"
+            required
+            :prop="`pesticideSuperviseDetailVO.${index}.useTime`"
+            :rules="dialogFormRules.pesticideSuperviseDetailVO.defaultField.useTime"
+            class="dialog-form-item"
+          >
+            <el-date-picker v-model="item.useTime" :clearable="false" type="date" value-format="YYYY-MM-DD" placeholder="请选择使用时间" />
+          </el-form-item>
+          <el-form-item
+            label="检测结果"
+            required
+            :prop="`pesticideSuperviseDetailVO.${index}.detailDetectionResult`"
+            :rules="dialogFormRules.pesticideSuperviseDetailVO.defaultField.detailDetectionResult"
+            class="dialog-form-item"
+          >
+            <el-select v-model="item.detailDetectionResult" placeholder="请选择" style="width: 200px">
+              <el-option value="合格" label="合格" />
+              <el-option value="不合格" label="不合格" />
+            </el-select>
+          </el-form-item>
+          <div v-if="!formDisabled" class="dialog-form-many-delete">
+            <el-button v-if="index !== 0" type="danger" plain size="small" @click="deleteMedicationInfo(index)">删除</el-button>
+          </div>
+        </div>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="onSaveCategory">保存</el-button>
-          <el-button @click="cancelDialog">取消</el-button>
+          <el-button v-if="!formDisabled" type="primary" @click="onSaveCategory">保存</el-button>
+          <el-button v-if="!formDisabled" @click="cancelDialog">取消</el-button>
+          <el-button v-else @click="cancelDialog">关闭</el-button>
         </div>
       </template>
     </el-dialog>
@@ -61,11 +164,14 @@
 </template>
 
 <script setup>
-import { ref, reactive, computed, onMounted, onBeforeUnmount } from 'vue';
+import { ref, reactive, computed, onMounted, onBeforeUnmount, nextTick } from 'vue';
 import tableComponent from '@/components/tableComponent.vue';
 import { ElMessage } from 'element-plus';
 import inputSuppliesApi from '@/apis/inputSuppliesApi';
-const { getPesticideList, addPesticide, pesticideReportSave, delPesticide } = inputSuppliesApi;
+import { id } from 'element-plus/es/locales.mjs';
+const { getPesticideList, addPesticide, pesticideReportSave, delPesticide, getLandList, getPesticideSelectList } = inputSuppliesApi;
+import { useApp } from '@/hooks';
+const app = useApp();
 
 // 查询条件
 const formInline = reactive({
@@ -91,7 +197,6 @@ const btnStatus = computed(() => {
 });
 const tableLoading = ref(false);
 const tableTotal = ref(0);
-let nowClickRow = ref({});
 const columns = ref([
   // { prop: "id", label: "ID" },
   { prop: 'name', label: '类别名称' },
@@ -124,59 +229,188 @@ const loadData = async () => {
   }
 };
 
-// 查看详情
-const seeDetails = async (row) => {
-  nowClickRow.value = row;
-  console.log('要查看详情的行: ', row);
-};
-// 编辑操作
-const handleEdit = async (row) => {
-  nowClickRow.value = row;
-  dialogTitle.value = '编辑';
-  dialogForm.id = row.id;
-  dialogForm.name = row.name;
-  dialogFormVisible.value = true;
-};
-// 删除操作
-const handleDelete = (row) => {
-  deleteGoods(row.id);
-};
-const deleteGoods = async (ids) => {
+const landList = ref([]);
+const getLandsList = async () => {
   try {
-    tableLoading.value = true;
-    let res = await delPesticide({ id: ids });
-    tableLoading.value = false;
-    if (res.code == 200) {
-      onSubmit();
-      ElMessage.success('删除成功');
-    } else {
-      ElMessage.error(res.msg);
+    let response = await getLandList();
+    if (response.code == 200) {
+      landList.value = response.data;
     }
   } catch (error) {
-    tableLoading.value = false;
+    console.error(error);
   }
 };
+const handleLandsChange = () => {
+  const landItem = landList.value.find((item) => item.id == dialogForm.landId);
+  dialogForm.landName = landItem.landName;
+};
+const pesticideList = ref([]);
+const getPesticidesList = async () => {
+  try {
+    let response = await getPesticideSelectList();
+    if (response.code == 200) {
+      pesticideList.value = response.data;
+    }
+  } catch (error) {
+    console.error(error);
+  }
+};
+const unitList = ref([
+  { id: '1', unit: 'kg' },
+  { id: '2', unit: 'g' },
+  { id: '3', unit: 'L' },
+  { id: '4', unit: 'ml' },
+]);
+const handlePesticideChange = (item, index) => {
+  dialogForm.pesticideSuperviseDetailVO[index].pesticideName = pesticideList.value[index].pesticideName;
+  console.log(dialogForm.pesticideSuperviseDetailVO);
+};
+const deleteMedicationInfo = (index) => {
+  dialogForm.pesticideSuperviseDetailVO.splice(index, 1);
+};
 
 const dialogFormVisible = ref(false);
 const dialogRef = ref(null);
 const dialogTitle = ref('新增');
+const formDisabled = ref(false);
 const dialogForm = reactive({
   id: '',
   name: '',
+  phone: '',
+  landId: '',
+  landName: '',
+  detectionTime: '',
+  detectionResult: '',
+  detectionUnit: '',
+  detectionReport: '',
+  pesticideSuperviseDetailVO: [{ pesticideId: '', pesticideName: '', useNumber: 1, useTime: '', useUnit: 'ml', detailDetectionResult: '' }],
 });
 const dialogFormRules = ref({
   name: [
     { required: true, message: '请输入分类名称', trigger: 'blur' },
     { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' },
   ],
+  phone: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+    { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的11位手机号', trigger: 'blur' },
+  ],
+  landId: [
+    {
+      required: true,
+      message: '请选择用药地块',
+      trigger: ['change', 'blur'],
+    },
+  ],
+  detectionTime: [{ required: true, message: '请选择检测时间', trigger: ['change', 'blur'] }],
+  detectionResult: [
+    {
+      required: true,
+      message: '请选择检测结果',
+      trigger: ['change', 'blur'],
+    },
+  ],
+  detectionUnit: [{ required: true, message: '请输入检测单位', trigger: 'blur' }],
+  pesticideSuperviseDetailVO: {
+    type: 'array',
+    defaultField: {
+      pesticideId: [{ required: true, message: '请选择农药名称', trigger: 'change' }],
+      useNumber: [
+        { required: true, message: '请输入用药量', trigger: 'blur' },
+        { type: 'number', min: 1, message: '用药量必须大于0', trigger: 'blur' },
+      ],
+      useUnit: [{ required: true, message: '请选择单位', trigger: 'change' }],
+      useTime: [{ required: true, message: '请选择使用时间', trigger: 'change' }],
+      detailDetectionResult: [{ required: true, message: '请选择检测结果', trigger: 'change' }],
+    },
+  },
 });
+const addMedicationInfo = () => {
+  dialogForm.pesticideSuperviseDetailVO.push({
+    pesticideSuperviseId: '',
+    detailId: '',
+    pesticideId: '',
+    pesticideName: '',
+    useNumber: 1,
+    useTime: '',
+    useUnit: 'ml',
+  });
+};
+// 新增操作
+const addItem = async () => {
+  restDialogForm();
+  dialogTitle.value = '新增';
+  formDisabled.value = false;
+  dialogFormVisible.value = true;
+};
+// 查看详情
+const seeDetails = async (row) => {
+  dialogTitle.value = '详情';
+  setDialogForm(row);
+  formDisabled.value = true;
+  dialogFormVisible.value = true;
+};
+// 编辑操作
+const handleEdit = (row) => {
+  console.log('要编辑的行: ', row);
+  dialogTitle.value = '编辑';
+  setDialogForm(row);
+  formDisabled.value = false;
+  dialogFormVisible.value = true;
+};
+const setDialogForm = (row) => {
+  dialogForm.id = row.id;
+  dialogForm.name = row.name;
+  dialogForm.phone = row.phone;
+  dialogForm.landId = row.landId;
+  dialogForm.landName = row.landName;
+  dialogForm.detectionTime = row.detectionTime;
+  dialogForm.detectionResult = row.detectionResult;
+  dialogForm.detectionUnit = row.detectionUnit;
+  dialogForm.detectionReport = row.detectionReport;
+  if (row.pesticideSuperviseDetailVO.length > 0) {
+    dialogForm.pesticideSuperviseDetailVO = row.pesticideSuperviseDetailVO.map((el) => {
+      el.useNumber = Number(el.useNumber);
+      el.pesticideId = Number(el.pesticideId);
+      return el;
+    });
+  }
+};
+// 删除操作
+const handleDelete = (row) => {
+  app
+    .$confirm(`删除后信息将不可查看，确认要删除吗？`, '确定删除', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(() => {
+      deleteGoods(row.id)
+        .then((res) => {
+          if (res.code === 200) {
+            onSubmit();
+            app.$message.success('删除成功！');
+          }
+        })
+        .catch((err) => {
+          app.$message.error(err.msg);
+        });
+    })
+    .catch(() => {});
+};
+const deleteGoods = async (ids) => {
+  try {
+    let res = await delPesticide(ids);
+    return res;
+  } catch (error) {
+    return false;
+  }
+};
 const onSaveCategory = () => {
+  console.log(dialogForm);
   dialogRef.value.validate(async (valid, fields) => {
     if (valid) {
       try {
         let param = { ...dialogForm };
-        param.level = dialogForm.selectedNode.level ?? '';
-        param.type = dialogForm.selectedNode.type ?? '';
         let response;
         if (dialogTitle.value == '新增') {
           response = await addPesticide(param);
@@ -200,16 +434,44 @@ const onSaveCategory = () => {
     }
   });
 };
-const cancelDialog = () => {
-  Object.assign(dialogForm, {
-    // 保持响应性，手动清空字段
-    id: '',
-    name: '',
-  });
+const cancelDialog = async () => {
+  restDialogForm();
   dialogFormVisible.value = false;
 };
+const restDialogForm = () => {
+  Object.assign(dialogForm, {
+    id: '',
+    name: '',
+    phone: '',
+    landId: '',
+    landName: '',
+    detectionTime: '',
+    detectionResult: '',
+    detectionUnit: '',
+    detectionReport: '',
+    pesticideSuperviseDetailVO: [{ pesticideId: '', pesticideName: '', useNumber: 1, useTime: '', useUnit: 'ml' }],
+  });
+};
+
 onMounted(() => {
   onSubmit();
+  getLandsList();
+  getPesticidesList();
 });
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.dialog-form-item {
+  :deep(.el-upload--picture-card) {
+    width: 120px;
+    height: 120px;
+  }
+  :deep(.file-uploader__upload) {
+    width: 120px;
+    height: 120px;
+  }
+  :deep(.el-upload-list__item) {
+    width: 120px;
+    height: 120px;
+  }
+}
+</style>

From 9f6847a1a0eca6a4a57ad5c3dac5079b6adc7d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E6=B0=B8=E8=B6=85?= <2090205686@qq.com>
Date: Fri, 20 Jun 2025 17:34:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=20=E6=8A=95=E5=85=A5=E5=93=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20-=20=E7=A7=8D=E5=AD=90=E7=A7=8D=E8=8B=97=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tableComponent.vue         |  15 +-
 .../material/seed/index.vue                   | 626 +++++++++++-------
 .../material/seed/index原.vue                 | 263 ++++++++
 3 files changed, 659 insertions(+), 245 deletions(-)
 create mode 100644 sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index原.vue

diff --git a/sub-government-affairs-service/src/components/tableComponent.vue b/sub-government-affairs-service/src/components/tableComponent.vue
index 8224a19..bebcf19 100644
--- a/sub-government-affairs-service/src/components/tableComponent.vue
+++ b/sub-government-affairs-service/src/components/tableComponent.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="custom-table-container">
     <el-table
+      v-loading="loading"
       style="flex: 1; display: flex; flex-direction: column; text-align: center"
       :max-height="tableMaxHeight"
-      v-loading="loading"
       :data="tableData"
       :stripe="showStripe"
       :fit="true"
@@ -13,15 +13,15 @@
       @selection-change="handleSelectionChange"
     >
       <!-- 树形展开 -->
-      <el-table-column v-if="tree" type="expand">
-        <template #default="props">
-          <slot name="tree" :row="props.row"></slot>
+      <el-table-column v-if="tree" type="expand" :header-class-name="headerCellClassName">
+        <template #default="scope">
+          <slot name="tree" :row="scope.row"></slot>
         </template>
       </el-table-column>
 
       <!-- 首列多选框 -->
-      <el-table-column v-if="showSelection" type="selection" width="30" align="center" fixed />
-      <el-table-column label="序号" width="70" v-if="showSort" fixed align="center">
+      <el-table-column v-if="showSelection" type="selection" width="30" align="center" fixed :header-class-name="headerCellClassName" />
+      <el-table-column v-if="showSort" label="序号" width="70" fixed align="center" :header-class-name="headerCellClassName">
         <template #default="{ $index }">
           {{ (currentPage - 1) * pageSize + $index + 1 }}
         </template>
@@ -299,8 +299,9 @@ onBeforeUnmount(() => {
   /* 自定义表头样式 */
   :deep(.custom-header) {
     color: #333;
+    background-color: #fafafa !important;
   }
-  /* 自定义表头样式 */
+  /* 自定义单元格样式 */
   :deep(.custom-cell) {
     color: #606266;
   }
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue
index 5ad332f..74b710f 100644
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue
@@ -1,263 +1,413 @@
 <template>
-  <section class="custom-page">
-    <h2>种子基本信息</h2>
-    <TypeMenu v-if="materialTypes['4'].length > 1" v-model:type="_type" :types="materialTypes['4']" />
-    <br />
-    <avue-crud
-      ref="crudRef"
-      v-model:page="pageData"
-      v-model:search="searchCondition"
-      :table-loading="_loading"
-      :before-close="handleCloseDialog"
-      :data="data"
-      :option="option"
-      @search-change="
-        (form, done) => {
-          getData(1);
-          done();
-        }
-      "
-      @search-reset="getData(1)"
-      @refresh-change="getData"
-      @current-change="getData"
-      @size-change="getData(1)"
-      @row-save="handleRowSave"
-    >
-      <template #menu="{ row }">
-        <el-button type="primary" @click="handleInfo(row)">详情</el-button>
-        <el-button @click="deleteFn(row.id, delSeed, getData)">删除</el-button>
+  <div class="app-container">
+    <div class="container-custom">
+      <h2 class="custom-h2">种子种苗管理</h2>
+      <div ref="searchBarRef" class="search-box">
+        <div class="search-bar">
+          <div class="search-bar-left">
+            <el-form ref="searchForm" :inline="true" :model="formInline" class="demo-form-inline" :label-width="'auto'">
+              <el-form-item label="关键字" prop="seedName">
+                <el-input v-model="formInline.seedName" placeholder="请输入姓名" clearable />
+              </el-form-item>
+              <el-form-item label="分类" prop="seedTypeId">
+                <el-select v-model="formInline.seedTypeId" placeholder="请选择" clearable @change="seedTypeChange">
+                  <el-option v-for="item in seedTypeList" :key="item.id" :value="item.id" :label="item.dataName" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="">
+                <el-button type="primary" icon="Search" @click="onSubmit">查询</el-button>
+                <el-button icon="Refresh" @click="resetForm">重置</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+        </div>
+      </div>
+      <div class="table-toolbar">
+        <el-button type="primary" icon="plus" @click="addItem()">新增</el-button>
+      </div>
+      <div class="table-cont">
+        <tableComponent
+          :table-data="tableData"
+          :columns="columns"
+          :show-selection="false"
+          :loading="tableLoading"
+          :total="tableTotal"
+          :current-page="formInline.current"
+          :page-size="formInline.size"
+          :show-sort="true"
+          @page-change="handlePaginationChange"
+        >
+          <!-- 自定义-操作 -->
+          <template #action="slotProps">
+            <el-button type="primary" @click="seeDetails(slotProps.row)">查看</el-button>
+            <el-button type="primary" @click="handleEdit(slotProps.row)">编辑</el-button>
+            <el-button @click="handleDelete(slotProps.row)">删除</el-button>
+          </template>
+        </tableComponent>
+      </div>
+    </div>
+    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false">
+      <el-form
+        ref="dialogRef"
+        :model="dialogForm"
+        :inline="true"
+        :label-width="'120'"
+        :rules="dialogFormRules"
+        :disabled="formDisabled"
+        class="dialog-form-container"
+      >
+        <el-form-item label="种子种苗名称" prop="seedName" class="dialog-form-item">
+          <el-input v-model="dialogForm.seedName" clearable placeholder="请输入种子种苗名称" />
+        </el-form-item>
+        <el-form-item label="品种名称" prop="varietyName" class="dialog-form-item">
+          <el-input v-model="dialogForm.varietyName" clearable placeholder="请输入品种名称" />
+        </el-form-item>
+        <el-form-item label="品牌" prop="brand" class="dialog-form-item">
+          <el-input v-model="dialogForm.brand" clearable placeholder="请输入品牌" />
+        </el-form-item>
+        <el-form-item label="生产厂家" prop="manufacturer" class="dialog-form-item">
+          <el-input v-model="dialogForm.manufacturer" clearable placeholder="请输入生产厂家" />
+        </el-form-item>
+        <el-form-item label="蔬菜种苗" prop="classifyId" class="dialog-form-item">
+          <el-cascader
+            v-model="dialogForm.classifyId"
+            :options="seedTypeDialogList"
+            :props="cascaderProps"
+            placeholder="请选择"
+            @change="handleCascaderChange"
+          />
+        </el-form-item>
+        <el-form-item label="产品规格" prop="productUnit" class="dialog-form-item">
+          <el-input v-model="dialogForm.productUnit" clearable placeholder="请输入产品规格" />
+        </el-form-item>
+
+        <div style="display: flex">
+          <div style="width: 50%; display: inline-block">
+            <el-form-item label="种子种苗主图" prop="photoUrl" class="dialog-form-item" style="width: 100%">
+              <FileUploader v-model="dialogForm.photoUrl" :limit="1" />
+            </el-form-item>
+          </div>
+          <div style="width: 50%; display: inline-block">
+            <el-form-item label="种子种苗详情图" prop="photoUrlDetail" class="dialog-form-item" style="width: 100%">
+              <FileUploader v-model="dialogForm.photoUrlDetail" :limit="1" />
+            </el-form-item>
+          </div>
+        </div>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button v-if="!formDisabled" type="primary" @click="onSaveCategory">保存</el-button>
+          <el-button v-if="!formDisabled" @click="cancelDialog">取消</el-button>
+          <el-button v-else @click="cancelDialog">关闭</el-button>
+        </div>
       </template>
-      <template #photoUrl-form="{ type }"> <Attrs v-model:attrs="attrs" :type="type == 'add' ? 'add' : 'view'" :limit="2" /> </template>
-    </avue-crud>
-  </section>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup>
-import { ref, onMounted, watch, pushScopeId } from 'vue';
-import TypeMenu from '../../common/TypeMenu.vue';
-import { CRUD_OPTIONS, pageData, customRules } from '@/config';
-import { useBasicInfo } from '@/views/inputSuppliesManage/hooks/useBasicInfo';
-import Attrs from '@/views/inputSuppliesManage/common/Attrs.vue';
-import inputSuppliesapi from '@/apis/inputSuppliesApi';
+import { ref, reactive, computed, onMounted, onBeforeUnmount, nextTick } from 'vue';
+import tableComponent from '@/components/tableComponent.vue';
 import { ElMessage } from 'element-plus';
-import assistFn from '@/views/inputSuppliesManage/hooks/useAssistFn';
-const { deleteFn } = new assistFn();
-const { getSeedList, seedSave, delSeed } = inputSuppliesapi;
-const { loadFinish, materialTypes, targetName } = useBasicInfo({
-  moduleType: '4',
+import inputSuppliesApi from '@/apis/inputSuppliesApi';
+const { getSeedList, seedSave, delSeed, getMaterailTypes } = inputSuppliesApi;
+import { useApp } from '@/hooks';
+const app = useApp();
+
+// 查询条件
+const formInline = reactive({
+  seedName: '',
+  seedTypeId: '',
+  current: 1,
+  size: 10,
 });
-const _allTypes = ref([]);
-watch(
-  () => loadFinish.value,
-  (bol) => {
-    if (bol) {
-      option.value.column.forEach((v) => {
-        if (v.prop === '_classifyId') {
-          _allTypes.value = materialTypes['4'].filter((v, i) => i > 0) ?? [];
-          v.dicData = _allTypes.value;
+const searchForm = ref(null);
+const onSubmit = () => {
+  formInline.current = 1;
+  loadData();
+};
+const resetForm = () => {
+  searchForm.value.resetFields();
+};
+
+// 表格数据
+const tableData = ref([]);
+const selectedIds = ref([]);
+const tableLoading = ref(false);
+const tableTotal = ref(0);
+const columns = ref([
+  { prop: 'seedName', label: '种子种苗名称' },
+  { prop: 'varietyName', label: '品种名称' },
+  { prop: 'brand', label: '品牌' },
+  { prop: 'manufacturer', label: '生产厂家' },
+  { prop: 'classifyName', label: '分类' },
+  { prop: 'productUnit', label: '产品规格' },
+  { prop: 'action', label: '操作', slotName: 'action', width: 230, fixed: 'right' },
+]);
+const handlePaginationChange = ({ page, pageSize }) => {
+  formInline.current = page;
+  formInline.size = pageSize;
+  loadData();
+};
+const loadData = async () => {
+  tableLoading.value = true;
+  try {
+    let response = await getSeedList(formInline);
+    tableLoading.value = false;
+    if (response.code == 200) {
+      tableData.value = response.data.records;
+      tableTotal.value = response.data.total;
+    }
+  } catch (error) {
+    tableLoading.value = false;
+    console.error(error);
+  }
+};
+
+const extractThirdLevelChildren = (dataArray) => {
+  let result = [];
+  // 遍历第一层数组
+  for (const level1 of dataArray) {
+    // 检查第一层是否有children且是数组
+    if (level1.children && Array.isArray(level1.children)) {
+      // 遍历第二层数组
+      for (const level2 of level1.children) {
+        // 检查第二层是否有children且是数组
+        if (level2.children && Array.isArray(level2.children)) {
+          // 将第三层的所有对象添加到结果数组中
+          result.push(...level2.children);
         }
-      });
+      }
     }
   }
-);
+  return result;
+};
+const seedTypeChange = () => {
+  console.log(formInline.seedTypeId);
+  // 重新获取表格数据，需添加参数
+};
 
-onMounted(getData);
-/* --------------- data --------------- */
-// #region
-const _type = ref('0');
-const crudRef = ref();
-const _loading = ref(true);
-const searchCondition = ref({
-  keywords: '',
+const dialogFormVisible = ref(false);
+const dialogRef = ref(null);
+const dialogTitle = ref('新增');
+const formDisabled = ref(false);
+const dialogForm = reactive({
+  id: '',
+  seedName: '', //种子种苗名称
+  varietyName: '', //品种名称
+  brand: '', //品牌
+  manufacturer: '', //生产厂家
+  classifyId: '', //蔬菜种苗id
+  classifyName: '', //蔬菜种苗名称
+  productSpecification: '', //产品规格（number）
+  productUnit: '', //产品规格单位
+  productAttributes: '', //自定义商品属性
+  photoUrl: '', //种子种苗主图
+  photoUrlDetail: '', //种子种苗详情图
 });
-const data = ref([]);
-const option = ref({
-  ...CRUD_OPTIONS,
-  selection: false,
-  menuWidth: 160,
-  column: [
+const dialogFormRules = ref({
+  seedName: [{ required: true, message: '请输入种子种苗名称', trigger: 'blur' }],
+  varietyName: [{ required: true, message: '请输入品种名称', trigger: 'blur' }],
+  brand: [{ required: true, message: '请输入品牌', trigger: 'blur' }],
+  manufacturer: [{ required: true, message: '请输入品牌', trigger: 'blur' }],
+  classifyId: [
     {
-      label: '种子名称',
-      prop: 'keywords',
-      hide: true,
-      search: true,
-      addDisplay: false,
-      viewDisplay: false,
-      editDisplay: false,
-    },
-    {
-      label: '种子名称',
-      prop: 'seedName',
-      rules: customRules({ msg: '请输入种子名称' }),
-    },
-    {
-      prop: 'manufacturer',
-      label: '厂家',
-      rules: customRules({ msg: '请输入厂家名称' }),
-    },
-    {
-      label: '品牌名称',
-      prop: 'brand',
-      rules: customRules({ msg: '请输入品牌名称' }),
-    },
-    {
-      label: '品种名称',
-      prop: 'varietyName',
-      rules: customRules({ msg: '请输入品种名称' }),
-    },
-    {
-      hide: true,
-      label: '图片',
-      prop: 'photoUrl',
-    },
-    {
-      label: '分类',
-      prop: '_classifyId',
-      type: 'cascader',
-      expandTrigger: 'click',
-      dicData: [],
-      rules: customRules({ msg: '请选择分类' }),
-      render: ({ row }) => row.classifyName ?? '',
-    },
-    // {
-    //   prop: 'distributor',
-    //   label: '经销商',
-    // },
-    {
-      prop: 'productUnit',
-      width: '100',
-      label: '产品规格',
-      // editDisplay: false,
-    },
-    {
-      label: '种植时间',
-      prop: 'sowingTime',
-      span: 24,
-      type: 'textarea',
-    },
-    {
-      hide: true,
-      label: '种植密度',
-      prop: 'plantDensity',
-      span: 24,
-      type: 'textarea',
-    },
-    {
-      hide: true,
-      label: '施肥管理',
-      prop: 'fertilizeManage',
-      span: 24,
-      type: 'textarea',
-    },
-    {
-      hide: true,
-      label: '水分管理',
-      prop: 'waterManage',
-      span: 24,
-      type: 'textarea',
-    },
-    {
-      hide: true,
-      label: '病虫害防治',
-      prop: 'pestControl',
-      span: 24,
-      type: 'textarea',
-    },
-    {
-      hide: true,
-      label: '注意事项',
-      prop: 'precautions',
-      span: 24,
-      type: 'textarea',
+      required: true,
+      message: '请选择蔬菜种苗',
+      trigger: ['change', 'blur'],
     },
   ],
+  productUnit: [{ required: true, message: '请输入产品规格', trigger: 'blur' }],
 });
-const attrs = ref([]);
-// #endregion
 
-/* --------------- methods --------------- */
-// #region
-
-async function getData(reset) {
-  _loading.value = true;
-  reset == 1 && (pageData.value.currentPage = 1);
-  let params = {
-    current: pageData.value.currentPage,
-    size: pageData.value.size,
-    seedName: searchCondition.value.keywords,
-  };
-  if (_type.value != '0') params['classifyId'] = _type.value;
-  let res = await getSeedList(params);
-  if (res.code == 200) {
-    data.value = res.data.records ?? [];
-    pageData.value.total = res.data.total;
+// 新增操作
+const addItem = async () => {
+  restDialogForm();
+  dialogTitle.value = '新增';
+  formDisabled.value = false;
+  dialogFormVisible.value = true;
+};
+// 查看详情
+const seeDetails = async (row) => {
+  dialogTitle.value = '详情';
+  setDialogForm(row);
+  formDisabled.value = true;
+  dialogFormVisible.value = true;
+};
+// 编辑操作
+const handleEdit = (row) => {
+  console.log('要编辑的行: ', row);
+  dialogTitle.value = '编辑';
+  setDialogForm(row);
+  formDisabled.value = false;
+  dialogFormVisible.value = true;
+};
+const setDialogForm = (row) => {
+  dialogForm.id = row.id;
+  dialogForm.seedName = row.seedName;
+  dialogForm.varietyName = row.varietyName;
+  dialogForm.brand = row.brand;
+  dialogForm.manufacturer = row.manufacturer;
+  dialogForm.classifyId = row.classifyId;
+  dialogForm.classifyName = row.classifyName;
+  dialogForm.productSpecification = row.productSpecification;
+  dialogForm.productUnit = row.productUnit;
+  dialogForm.productAttributes = row.productAttributes;
+  dialogForm.photoUrl = row.photoUrl;
+  dialogForm.photoUrlDetail = row.photoUrlDetail;
+};
+// 删除操作
+const handleDelete = (row) => {
+  app
+    .$confirm(`删除后信息将不可查看，确认要删除吗？`, '确定删除', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(() => {
+      deleteGoods(row.id)
+        .then((res) => {
+          if (res.code === 200) {
+            onSubmit();
+            app.$message.success('删除成功！');
+          }
+        })
+        .catch((err) => {
+          app.$message.error(err.msg);
+        });
+    })
+    .catch(() => {});
+};
+const deleteGoods = async (ids) => {
+  try {
+    let res = await delSeed(ids);
+    return res;
+  } catch (error) {
+    return false;
   }
-  _loading.value = false;
-}
-
-function handleInfo(row) {
-  columnSpanChange(true);
-  handleAttrs(row);
-  crudRef.value.rowView(row);
-}
-async function handleRowSave(form, done, loading) {
-  const data = Object.assign({}, form);
-  delete data.keywords;
-  if (attrs.value.length) {
-    data.photoUrl = attrs.value.map((v) => v.url).join();
-  }
-  if (data._classifyId.length) {
-    data.photoUrl = attrs.value.map((v) => v.url).join();
-  }
-  data.classifyId = JSON.stringify(data._classifyId);
-  delete data._classifyId;
-  data.classifyName = targetName(_allTypes.value, form._classifyId, '');
-  let res = await seedSave(data);
-  if (res.code == 200) {
-    ElMessage.success('新增成功');
-    getData();
-    done();
-  }
-  loading();
-}
-/* 处理展示附件 */
-function handleAttrs(row = {}) {
-  if (!row) {
-    return;
-  }
-  if (row.photoUrl) {
-    attrs.value = row.photoUrl.split(',').map((v, i) => {
-      return {
-        url: v,
-        uid: `photo_${i}_${Date.now()}`,
-      };
-    });
-  }
-}
-function handleCloseDialog(done) {
-  columnSpanChange();
-  attrs.value = [];
-  done();
-}
-function columnSpanChange(row = false) {
-  let arr = ['photoUrl'];
-  option.value.column.forEach((v) => {
-    if (arr.includes(v.prop)) {
-      if (row) {
-        v.span = 24;
-      } else {
-        delete v.span;
+};
+const onSaveCategory = () => {
+  console.log(dialogForm);
+  dialogRef.value.validate(async (valid, fields) => {
+    if (valid) {
+      try {
+        let param = { ...dialogForm };
+        param.classifyId = dialogForm.classifyId.join(',');
+        param.classifyName = dialogForm.classifyName.join(',');
+        console.log(param);
+        let response;
+        if (dialogTitle.value == '新增') {
+          response = await seedSave(param);
+        } else {
+          response = await seedSave(param);
+        }
+        if (response.code == 200) {
+          cancelDialog();
+          onSubmit();
+          if (dialogTitle.value == '新增') {
+            ElMessage.success('新增成功!');
+          } else {
+            ElMessage.success('编辑成功!');
+          }
+        } else {
+          ElMessage.error(response.msg);
+        }
+      } catch (error) {
+        console.error(error);
       }
     }
   });
-}
-// #endregion
-</script>
+};
+const cancelDialog = async () => {
+  restDialogForm();
+  dialogFormVisible.value = false;
+};
+const restDialogForm = () => {
+  Object.assign(dialogForm, {
+    id: '',
+    seedName: '', //种子种苗名称
+    varietyName: '', //品种名称
+    brand: '', //品牌
+    manufacturer: '', //生产厂家
+    classifyId: '', //蔬菜种苗id
+    classifyName: '', //蔬菜种苗名称
+    productSpecification: '', //产品规格（number）
+    productUnit: '', //产品规格单位
+    productAttributes: '', //自定义商品属性
+    photoUrl: '', //种子种苗主图
+    photoUrlDetail: '', //种子种苗详情图
+  });
+};
 
+const seedTypeList = ref([]);
+const seedTypeDialogList = ref([]);
+const getSeedTypeList = async () => {
+  try {
+    let response = await getMaterailTypes({ moduleType: '4' });
+    console.log(response);
+    if (response.code == 200) {
+      if (response.data?.length > 0) {
+        seedTypeDialogList.value = response.data[0].children;
+        let result = extractThirdLevelChildren(response.data);
+        seedTypeList.value = result;
+        console.log(seedTypeDialogList.value);
+      }
+    }
+  } catch (error) {
+    console.error(error);
+  }
+};
+// 级联选择器配置
+const cascaderProps = ref({
+  label: 'dataName', // 选项标签字段名
+  value: 'id', // 选项值字段名
+  children: 'children', // 子选项字段名
+  emitPath: true,
+  expandTrigger: 'hover',
+});
+const handleCascaderChange = () => {
+  const selectedNames = getSelectedNames(dialogForm.classifyId);
+  console.log('对应的名称:', selectedNames); // 例如: ['花草类种子', '具体种子名称']
+  // 如果需要，可以将名称也保存到表单数据中
+  dialogForm.classifyName = selectedNames;
+};
+const getSelectedNames = (ids) => {
+  if (!ids || !ids.length) return [];
+
+  let names = [];
+  let currentLevel = seedTypeDialogList.value;
+
+  for (const id of ids) {
+    const foundItem = currentLevel.find((item) => item.id === id);
+    if (!foundItem) break;
+
+    names.push(foundItem.dataName);
+    currentLevel = foundItem.children || [];
+  }
+
+  return names;
+};
+
+onMounted(() => {
+  onSubmit();
+  getSeedTypeList();
+});
+</script>
 <style lang="scss" scoped>
-h2 {
-  font-size: 24px;
-  font-weight: bold;
-  font-family: '黑体';
+.dialog-form-item {
+  :deep(.el-upload--picture-card) {
+    width: 100px;
+    height: 100px;
+  }
+
+  :deep(.file-uploader__upload) {
+    width: 100px;
+    height: 100px;
+  }
+
+  :deep(.el-upload-list__item) {
+    width: 100px;
+    height: 100px;
+  }
 }
 </style>
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index原.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index原.vue
new file mode 100644
index 0000000..5ad332f
--- /dev/null
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index原.vue
@@ -0,0 +1,263 @@
+<template>
+  <section class="custom-page">
+    <h2>种子基本信息</h2>
+    <TypeMenu v-if="materialTypes['4'].length > 1" v-model:type="_type" :types="materialTypes['4']" />
+    <br />
+    <avue-crud
+      ref="crudRef"
+      v-model:page="pageData"
+      v-model:search="searchCondition"
+      :table-loading="_loading"
+      :before-close="handleCloseDialog"
+      :data="data"
+      :option="option"
+      @search-change="
+        (form, done) => {
+          getData(1);
+          done();
+        }
+      "
+      @search-reset="getData(1)"
+      @refresh-change="getData"
+      @current-change="getData"
+      @size-change="getData(1)"
+      @row-save="handleRowSave"
+    >
+      <template #menu="{ row }">
+        <el-button type="primary" @click="handleInfo(row)">详情</el-button>
+        <el-button @click="deleteFn(row.id, delSeed, getData)">删除</el-button>
+      </template>
+      <template #photoUrl-form="{ type }"> <Attrs v-model:attrs="attrs" :type="type == 'add' ? 'add' : 'view'" :limit="2" /> </template>
+    </avue-crud>
+  </section>
+</template>
+
+<script setup>
+import { ref, onMounted, watch, pushScopeId } from 'vue';
+import TypeMenu from '../../common/TypeMenu.vue';
+import { CRUD_OPTIONS, pageData, customRules } from '@/config';
+import { useBasicInfo } from '@/views/inputSuppliesManage/hooks/useBasicInfo';
+import Attrs from '@/views/inputSuppliesManage/common/Attrs.vue';
+import inputSuppliesapi from '@/apis/inputSuppliesApi';
+import { ElMessage } from 'element-plus';
+import assistFn from '@/views/inputSuppliesManage/hooks/useAssistFn';
+const { deleteFn } = new assistFn();
+const { getSeedList, seedSave, delSeed } = inputSuppliesapi;
+const { loadFinish, materialTypes, targetName } = useBasicInfo({
+  moduleType: '4',
+});
+const _allTypes = ref([]);
+watch(
+  () => loadFinish.value,
+  (bol) => {
+    if (bol) {
+      option.value.column.forEach((v) => {
+        if (v.prop === '_classifyId') {
+          _allTypes.value = materialTypes['4'].filter((v, i) => i > 0) ?? [];
+          v.dicData = _allTypes.value;
+        }
+      });
+    }
+  }
+);
+
+onMounted(getData);
+/* --------------- data --------------- */
+// #region
+const _type = ref('0');
+const crudRef = ref();
+const _loading = ref(true);
+const searchCondition = ref({
+  keywords: '',
+});
+const data = ref([]);
+const option = ref({
+  ...CRUD_OPTIONS,
+  selection: false,
+  menuWidth: 160,
+  column: [
+    {
+      label: '种子名称',
+      prop: 'keywords',
+      hide: true,
+      search: true,
+      addDisplay: false,
+      viewDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '种子名称',
+      prop: 'seedName',
+      rules: customRules({ msg: '请输入种子名称' }),
+    },
+    {
+      prop: 'manufacturer',
+      label: '厂家',
+      rules: customRules({ msg: '请输入厂家名称' }),
+    },
+    {
+      label: '品牌名称',
+      prop: 'brand',
+      rules: customRules({ msg: '请输入品牌名称' }),
+    },
+    {
+      label: '品种名称',
+      prop: 'varietyName',
+      rules: customRules({ msg: '请输入品种名称' }),
+    },
+    {
+      hide: true,
+      label: '图片',
+      prop: 'photoUrl',
+    },
+    {
+      label: '分类',
+      prop: '_classifyId',
+      type: 'cascader',
+      expandTrigger: 'click',
+      dicData: [],
+      rules: customRules({ msg: '请选择分类' }),
+      render: ({ row }) => row.classifyName ?? '',
+    },
+    // {
+    //   prop: 'distributor',
+    //   label: '经销商',
+    // },
+    {
+      prop: 'productUnit',
+      width: '100',
+      label: '产品规格',
+      // editDisplay: false,
+    },
+    {
+      label: '种植时间',
+      prop: 'sowingTime',
+      span: 24,
+      type: 'textarea',
+    },
+    {
+      hide: true,
+      label: '种植密度',
+      prop: 'plantDensity',
+      span: 24,
+      type: 'textarea',
+    },
+    {
+      hide: true,
+      label: '施肥管理',
+      prop: 'fertilizeManage',
+      span: 24,
+      type: 'textarea',
+    },
+    {
+      hide: true,
+      label: '水分管理',
+      prop: 'waterManage',
+      span: 24,
+      type: 'textarea',
+    },
+    {
+      hide: true,
+      label: '病虫害防治',
+      prop: 'pestControl',
+      span: 24,
+      type: 'textarea',
+    },
+    {
+      hide: true,
+      label: '注意事项',
+      prop: 'precautions',
+      span: 24,
+      type: 'textarea',
+    },
+  ],
+});
+const attrs = ref([]);
+// #endregion
+
+/* --------------- methods --------------- */
+// #region
+
+async function getData(reset) {
+  _loading.value = true;
+  reset == 1 && (pageData.value.currentPage = 1);
+  let params = {
+    current: pageData.value.currentPage,
+    size: pageData.value.size,
+    seedName: searchCondition.value.keywords,
+  };
+  if (_type.value != '0') params['classifyId'] = _type.value;
+  let res = await getSeedList(params);
+  if (res.code == 200) {
+    data.value = res.data.records ?? [];
+    pageData.value.total = res.data.total;
+  }
+  _loading.value = false;
+}
+
+function handleInfo(row) {
+  columnSpanChange(true);
+  handleAttrs(row);
+  crudRef.value.rowView(row);
+}
+async function handleRowSave(form, done, loading) {
+  const data = Object.assign({}, form);
+  delete data.keywords;
+  if (attrs.value.length) {
+    data.photoUrl = attrs.value.map((v) => v.url).join();
+  }
+  if (data._classifyId.length) {
+    data.photoUrl = attrs.value.map((v) => v.url).join();
+  }
+  data.classifyId = JSON.stringify(data._classifyId);
+  delete data._classifyId;
+  data.classifyName = targetName(_allTypes.value, form._classifyId, '');
+  let res = await seedSave(data);
+  if (res.code == 200) {
+    ElMessage.success('新增成功');
+    getData();
+    done();
+  }
+  loading();
+}
+/* 处理展示附件 */
+function handleAttrs(row = {}) {
+  if (!row) {
+    return;
+  }
+  if (row.photoUrl) {
+    attrs.value = row.photoUrl.split(',').map((v, i) => {
+      return {
+        url: v,
+        uid: `photo_${i}_${Date.now()}`,
+      };
+    });
+  }
+}
+function handleCloseDialog(done) {
+  columnSpanChange();
+  attrs.value = [];
+  done();
+}
+function columnSpanChange(row = false) {
+  let arr = ['photoUrl'];
+  option.value.column.forEach((v) => {
+    if (arr.includes(v.prop)) {
+      if (row) {
+        v.span = 24;
+      } else {
+        delete v.span;
+      }
+    }
+  });
+}
+// #endregion
+</script>
+
+<style lang="scss" scoped>
+h2 {
+  font-size: 24px;
+  font-weight: bold;
+  font-family: '黑体';
+}
+</style>