Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev

main/.env.development

@@ -16,6 +16,6 @@ VITE_APP_UPLOAD_API = '/uploadApis'
 # VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
 # VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300'
 # 内网接口地址
-VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
+VITE_APP_BASE_URL = 'http://192.168.18.88:8080'
-VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
+VITE_APP_UPLOAD_URL = 'http://192.168.18.88:8080'
 # VITE_APP_VIST_URL = 'http://192.168.18.99'

sub-government-affairs-service/.env.development

@@ -13,9 +13,9 @@ VITE_APP_UPLOAD_API = '/uploadApis'
 # VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9204'
 
 # 内网测试库接口地址
-VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
+VITE_APP_BASE_URL = 'http://192.168.18.88:8080'
-VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
+VITE_APP_UPLOAD_URL = 'http://192.168.18.88:8080'
 
 # 本地开发接口地址
-VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
+# VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
-VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
+# VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'

sub-government-affairs-service/src/apis/system/dictType.js

@@ -57,7 +57,7 @@ export function GetDictType(dictId) {
   });
 }
 /**
- * @Title: 类型信息
+ * @Title: 类型信息 sys_use_supervise_number 获取投入品用量单位
  */
 export function GetDictTypeInfo(dictId) {
   return request(`/system/dict/data/type/${dictId}`, {

sub-government-affairs-service/src/components/LandSelect.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="land-select-container" :style="{ width: typeof width === 'number' ? `${width}px` : width }">
+  <div class="land-select-container">
     <el-form v-if="enableValidation" ref="formRef" :model="form" :rules="rules" :validate-on-rule-change="false">
       <el-form-item :label="label" :prop="enableValidation ? 'selectedValue' : null">
         <el-select
@@ -12,6 +12,7 @@
           :disabled="disabled"
           clearable
           style="flex: 1"
+          :style="{ width: typeof width === 'number' ? `${width}px` : width }"
           @change="handleChange"
           @clear="handleClear"
         >
@@ -32,7 +33,9 @@
         :disabled="disabled"
         clearable
         style="flex: 1"
+        :style="{ width: typeof width === 'number' ? `${width}px` : width }"
         @change="handleChange"
+        @clear="handleClear"
       >
         <el-option v-for="item in filteredOptions" :key="item[valueKey]" :label="item[labelKey]" :value="item[valueKey]" />
       </el-select>

sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/fertilizerDemand.vue

@@ -62,7 +62,7 @@
         </tableComponent>
       </div>
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false">
+    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false" align-center>
       <el-form
         ref="dialogRef"
         :model="dialogForm"
@@ -136,6 +136,7 @@ import {
 } from '@/apis/inputSuppliesApi/demandManage';
 import { useApp } from '@/hooks';
 const app = useApp();
+import Mock from 'mockjs';
 
 // 查询条件
 const formInline = reactive({
@@ -179,17 +180,27 @@ const handlePaginationChange = ({ page, pageSize }) => {
 };
 let landNums = ref(0);
 let totalArea = computed(() => {
-  return selectedRows.value.reduce((sum, item) => sum + item.extent, 0);
+  const sum = selectedRows.value.reduce((sum, item) => {
+    return sum + Math.round(item.extent * 100);
+  }, 0);
+  const result = sum / 100;
+  return parseFloat(result.toFixed(2));
 });
 let totalSeed = computed(() => {
-  return selectedRows.value.reduce((sum, item) => sum + item.useNumber, 0);
+  const sum = selectedRows.value.reduce((sum, item) => {
+    return sum + Math.round(item.useNumber * 100);
+  }, 0);
+  const result = sum / 100;
+  return parseFloat(result.toFixed(2));
 });
 const handleSelectionChange = (selection, keys) => {
   // console.log(selection, keys);
   selectedRows.value = selection;
   landNums.value = selection.length;
 };
-
+const extentArr = Mock.mock({
+  'list|10': [{ extent: () => Mock.Random.float(100, 200, 2, 2) }],
+}).list;
 const loadData = async () => {
   tableLoading.value = true;
   try {
@@ -198,6 +209,11 @@ const loadData = async () => {
     if (response.code == 200) {
       tableData.value = response.data.records;
       tableTotal.value = response.data.total;
+
+      // 没有接口，添加模拟数据
+      tableData.value.forEach((el, index) => {
+        el.extent = extentArr[index].extent;
+      });
     }
   } catch (error) {
     tableLoading.value = false;

sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/pesticideDemand.vue

@@ -62,7 +62,7 @@
         </tableComponent>
       </div>
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false">
+    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false" align-center>
       <el-form
         ref="dialogRef"
         :model="dialogForm"
@@ -136,6 +136,7 @@ import {
 } from '@/apis/inputSuppliesApi/demandManage';
 import { useApp } from '@/hooks';
 const app = useApp();
+import Mock from 'mockjs';
 
 // 查询条件
 const formInline = reactive({
@@ -179,16 +180,27 @@ const handlePaginationChange = ({ page, pageSize }) => {
 };
 let landNums = ref(0);
 let totalArea = computed(() => {
-  return selectedRows.value.reduce((sum, item) => sum + item.extent, 0);
+  const sum = selectedRows.value.reduce((sum, item) => {
+    return sum + Math.round(item.extent * 100);
+  }, 0);
+  const result = sum / 100;
+  return parseFloat(result.toFixed(2));
 });
 let totalSeed = computed(() => {
-  return selectedRows.value.reduce((sum, item) => sum + item.useNumber, 0);
+  const sum = selectedRows.value.reduce((sum, item) => {
+    return sum + Math.round(item.useNumber * 100);
+  }, 0);
+  const result = sum / 100;
+  return parseFloat(result.toFixed(2));
 });
 const handleSelectionChange = (selection, keys) => {
   // console.log(selection, keys);
   selectedRows.value = selection;
   landNums.value = selection.length;
 };
+const extentArr = Mock.mock({
+  'list|10': [{ extent: () => Mock.Random.float(100, 200, 2, 2) }],
+}).list;
 const loadData = async () => {
   tableLoading.value = true;
   try {
@@ -197,6 +209,11 @@ const loadData = async () => {
     if (response.code == 200) {
       tableData.value = response.data.records;
       tableTotal.value = response.data.total;
+
+      // 没有接口，添加模拟数据
+      tableData.value.forEach((el, index) => {
+        el.extent = extentArr[index].extent;
+      });
     }
   } catch (error) {
     tableLoading.value = false;

sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/seedDemand.vue

@@ -15,9 +15,9 @@
                   :width="500"
                 />
               </el-form-item>
-              <el-form-item label="种子名称" prop="seedTypeId">
+              <el-form-item label="种子名称" prop="seedId">
-                <el-select v-model="formInline.seedTypeId" placeholder="请选择" clearable @change="seedTypeChange">
+                <el-select v-model="formInline.seedId" placeholder="请选择" clearable @change="seedTypeChange">
-                  <el-option v-for="item in seedTypeList" :key="item.id" :value="item.id" :label="item.seedName" />
+                  <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="">
@@ -65,7 +65,7 @@
         </tableComponent>
       </div>
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false">
+    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false" align-center>
       <el-form :inline="true" :label-width="'auto'">
         <el-form-item label="地块编号" prop="seedName">
           <el-input v-model="dialogForm.id" placeholder="请输入地块编号" clearable />
@@ -100,7 +100,7 @@
           <el-input v-model="dialogForm.phone" clearable placeholder="请输入联系方式" />
         </el-form-item>
         <el-form-item label="使用量" required prop="useNumber" class="dialog-form-item">
-          <el-input-number v-model="dialogForm.useNumber" :min="1" :controls="false" placeholder="请输入用药量" style="width: 150px" />
+          <el-input-number v-model="dialogForm.useNumber" :min="1" controls-position="right" placeholder="请输入用药量" style="width: 150px" />
           <el-select v-model="dialogForm.useUnit" placeholder="请选择" style="width: 80px">
             <el-option v-for="el in unitList" :key="el.unit" :value="el.unit" :label="el.unit" />
           </el-select>
@@ -137,7 +137,7 @@ const formInline = reactive({
   regionName: '',
   gridId: '',
   gridName: '',
-  seedTypeId: '',
+  seedId: '',
   current: 1,
   size: 10,
 });
@@ -181,10 +181,18 @@ const handlePaginationChange = ({ page, pageSize }) => {
 };
 let landNums = ref(0);
 let totalArea = computed(() => {
-  return selectedRows.value.reduce((sum, item) => sum + item.extent, 0);
+  const sum = selectedRows.value.reduce((sum, item) => {
+    return sum + Math.round(item.extent * 100);
+  }, 0);
+  const result = sum / 100;
+  return parseFloat(result.toFixed(2));
 });
 let totalSeed = computed(() => {
-  return selectedRows.value.reduce((sum, item) => sum + item.useNumber, 0);
+  const sum = selectedRows.value.reduce((sum, item) => {
+    return sum + Math.round(item.useNumber * 100);
+  }, 0);
+  const result = sum / 100;
+  return parseFloat(result.toFixed(2));
 });
 const handleSelectionChange = (selection, keys) => {
   // console.log(selection, keys);
@@ -192,7 +200,7 @@ const handleSelectionChange = (selection, keys) => {
   landNums.value = selection.length;
 };
 const extentArr = Mock.mock({
-  'list|1-10': [{ extent: () => Mock.Random.float(100, 200, 2, 2) }],
+  'list|10': [{ extent: () => Mock.Random.float(100, 200, 2, 2) }],
 }).list;
 const loadData = async () => {
   tableLoading.value = true;
@@ -233,7 +241,7 @@ const extractThirdLevelChildren = (dataArray) => {
   return result;
 };
 const seedTypeChange = () => {
-  console.log(formInline.seedTypeId);
+  console.log(formInline.seedId);
   // 重新获取表格数据，需添加参数
 };
 
@@ -397,9 +405,9 @@ const restDialogForm = () => {
 };
 
 const seedTypeList = ref([
-  { id: '1', seedName: '番茄' },
+  { id: '1', dataName: '番茄' },
-  { id: '2', seedName: '白菜' },
+  { id: '2', dataName: '白菜' },
-  { id: '3', seedName: '辣椒' },
+  { id: '3', dataName: '辣椒' },
 ]);
 const seedTypeDialogList = ref([]);
 const getSeedTypeList = async () => {
@@ -458,7 +466,7 @@ const unitList = ref([
 
 onMounted(() => {
   onSubmit();
-  // getSeedTypeList();
+  getSeedTypeList();
 });
 </script>
 <style lang="scss" scoped>

sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue

@@ -44,7 +44,7 @@
         </tableComponent>
       </div>
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="700" :close-on-click-modal="false">
+    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="700" :close-on-click-modal="false" align-center>
       <el-form
         ref="dialogRef"
         :model="dialogForm"
@@ -121,7 +121,7 @@
             :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-input-number v-model="item.useNumber" :min="1" controls-position="right" 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>

sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue

@@ -46,7 +46,7 @@
         </tableComponent>
       </div>
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false">
+    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false" align-center>
       <el-form
         ref="dialogRef"
         :model="dialogForm"

sub-government-affairs-service/src/views/inputSuppliesManage/subsidyManage/fertilizerSubsidy.vue

@@ -30,7 +30,7 @@
           <el-tab-pane label="待审核" :name="3" :value="3"></el-tab-pane>
         </el-tabs>
       </div>
-      <div class="table-cont">
+      <div class="table-cont" style="padding-top: 0">
         <tableComponent
           :table-data="tableData"
           :columns="columns"

sub-government-affairs-service/src/views/inputSuppliesManage/subsidyManage/pesticideSubsidy.vue

@@ -30,7 +30,7 @@
           <el-tab-pane label="待审核" :name="3" :value="3"></el-tab-pane>
         </el-tabs>
       </div>
-      <div class="table-cont">
+      <div class="table-cont" style="padding-top: 0">
         <tableComponent
           :table-data="tableData"
           :columns="columns"

sub-government-affairs-service/src/views/inputSuppliesManage/subsidyManage/seedSubsidy.vue

@@ -30,7 +30,7 @@
           <el-tab-pane label="待审核" :name="3" :value="3"></el-tab-pane>
         </el-tabs>
       </div>
-      <div class="table-cont">
+      <div class="table-cont" style="padding-top: 0">
         <tableComponent
           :table-data="tableData"
           :columns="columns"
@@ -86,7 +86,7 @@
           <el-input v-model="dialogForm.phone" clearable placeholder="请输入联系方式" />
         </el-form-item>
         <el-form-item label="使用量" required prop="useNumber" class="dialog-form-item">
-          <el-input-number v-model="dialogForm.useNumber" :min="1" :controls="false" placeholder="请输入用药量" style="width: 150px" />
+          <el-input-number v-model="dialogForm.useNumber" :min="1" controls-position="right" placeholder="请输入用药量" style="width: 150px" />
           <el-select v-model="dialogForm.useUnit" placeholder="请选择" style="width: 80px">
             <el-option v-for="el in unitList" :key="el.unit" :value="el.unit" :label="el.unit" />
           </el-select>

sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/fertilizerRegulation.vue

@@ -46,24 +46,17 @@
         </tableComponent>
       </div>
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false">
+    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false" align-center>
       <el-form :inline="true" :label-width="'auto'">
-        <LandSelect
+        <LandSelect ref="landSelectRef" v-model="dialogForm.landId" :options="landSelectList" :disabled="formDisabled" @change="handleLandChange" />
-          ref="landSelectRef"
-          v-model="dialogForm.landId"
-          :options="landSelectList"
-          :disabled="formDisabled"
-          :width="500"
-          @change="handleLandChange"
-        />
       </el-form>
       <el-descriptions title="地块信息" border class="mb-20 custom-descriptions" :column="2">
         <el-descriptions-item label="行政区域编码">{{ dialogForm.regionCode }}</el-descriptions-item>
         <el-descriptions-item label="行政区域名称">{{ dialogForm.regionName }}</el-descriptions-item>
         <el-descriptions-item label="网格编码">{{ dialogForm.gridId }}</el-descriptions-item>
         <el-descriptions-item label="网格名称">{{ dialogForm.gridName }}</el-descriptions-item>
-        <el-descriptions-item label="地块编码">{{ dialogForm.landName }}</el-descriptions-item>
+        <el-descriptions-item label="地块编码">{{ dialogForm.landId }}</el-descriptions-item>
-        <el-descriptions-item label="地块名称">{{ dialogForm.landId }}</el-descriptions-item>
+        <el-descriptions-item label="地块名称">{{ dialogForm.landName }}</el-descriptions-item>
       </el-descriptions>
       <el-descriptions title="经营主体信息" border class="mb-20 custom-descriptions" :column="2">
         <el-descriptions-item label="经营主体编码">{{ dialogForm.businessEntityCode }}</el-descriptions-item>
@@ -73,12 +66,12 @@
         ref="dialogRef"
         :model="dialogForm"
         :inline="true"
-        :label-width="'80'"
+        :label-width="'100'"
         :rules="dialogFormRules"
         :disabled="formDisabled"
         class="dialog-form-container"
       >
-        <div class="dialog-form-title">农药用药详情</div>
+        <div class="el-descriptions__title" style="margin-bottom: 16px">农药用药详情</div>
         <el-form-item label="肥料编号" prop="fertilizeId" class="dialog-form-item">
           <el-input v-model="dialogForm.fertilizeId" clearable placeholder="请输入肥料编号" />
         </el-form-item>
@@ -86,14 +79,42 @@
           <el-input v-model="dialogForm.fertilizeName" clearable placeholder="请输入肥料名称" />
         </el-form-item>
         <el-form-item label="使用量" required prop="useNumber" class="dialog-form-item">
-          <el-input-number v-model="dialogForm.useNumber" :min="1" :controls="false" placeholder="请输入使用量" style="width: 150px" />
+          <el-input-number v-model="dialogForm.useNumber" :min="1" controls-position="right" placeholder="请输入使用量" style="width: 150px" />
           <el-select v-model="dialogForm.useUnit" placeholder="请选择" style="width: 80px">
             <el-option v-for="el in unitList" :key="el.dictValue" :value="el.dictValue" :label="el.dictValue" />
           </el-select>
         </el-form-item>
-        <el-form-item label="使用时间" prop="detectionTime" class="dialog-form-item">
+        <el-form-item label="使用时间" prop="useTime" class="dialog-form-item">
-          <el-date-picker v-model="dialogForm.detectionTime" :clearable="false" type="date" value-format="YYYY-MM-DD" placeholder="请选择使用时间" />
+          <el-date-picker v-model="dialogForm.useTime" :clearable="false" type="date" value-format="YYYY-MM-DD" placeholder="请选择使用时间" />
         </el-form-item>
+        <div class="el-descriptions__title" style="margin-bottom: 16px">检测信息</div>
+        <div style="display: flex">
+          <div style="width: 48%; display: inline-block">
+            <el-form-item label="检测时间" prop="detectionTime" class="dialog-form-item" :label-width="'100'">
+              <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" :label-width="'100'">
+              <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" :label-width="'100'">
+              <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" :label-width="'80'">
+              <FileUploader v-model="dialogForm.detectionReport" :limit="1" />
+            </el-form-item>
+          </div>
+        </div>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -156,6 +177,8 @@ const columns = ref([
   { prop: 'phone', label: '联系方式' },
   { prop: 'fertilizeId', label: '肥料编号' },
   { prop: 'fertilizeName', label: '肥料名称' },
+  { prop: 'businessEntityCode', label: '生产经营主体编码' },
+  { prop: 'businessEntityName', label: '生产经营主体名称' },
   { prop: 'action', label: '操作', slotName: 'action', width: 230, fixed: 'right' },
 ]);
 const handlePaginationChange = ({ page, pageSize }) => {
@@ -206,6 +229,7 @@ const dialogRef = ref(null);
 const dialogTitle = ref('新增');
 const formDisabled = ref(false);
 const landSelectRef = ref(null);
+const nowSelectRow = ref({});
 const dialogForm = reactive({
   regionCode: '', //所属行政区域代码
   regionName: '', //所属行政区域名称
@@ -219,47 +243,56 @@ const dialogForm = reactive({
   fertilizeName: '', //肥料名称
   useNumber: 1, //使用量
   useUnit: 'g', //使用量单位
-  detectionTime: '', //使用时间
+  useTime: '', //使用时间
   businessEntityCode: '', //经营主体编码
   businessEntityName: '', //经营主体名称
+  detectionTime: '', //检测时间
+  detectionResult: '', //检测结果'
+  detectionUnit: '', //检测单位
+  detectionReport: '', //检测报告
 });
 const dialogFormRules = ref({
   fertilizeId: [{ required: true, message: '请输入肥料编号', trigger: 'blur' }],
   fertilizeName: [{ required: true, message: '请输入肥料名称', trigger: 'blur' }],
   useNumber: [{ required: true, message: '请输入使用量', trigger: ['change', 'blur'] }],
-  detectionTime: [{ required: true, message: '请选择使用时间', trigger: 'blur' }],
+  useTime: [{ required: true, message: '请选择使用时间', trigger: 'blur' }],
+  detectionTime: [{ required: true, message: '请选择检测时间', trigger: ['change', 'blur'] }],
+  detectionResult: [
+    {
+      required: true,
+      message: '请选择检测结果',
+      trigger: 'blur',
+    },
+  ],
+  detectionUnit: [{ required: true, message: '请输入检测单位', trigger: 'blur' }],
 });
 
 const addItem = async () => {
-  restDialogForm();
+  ElMessage.success('点击新增!');
-  dialogTitle.value = '新增';
+  // restDialogForm();
-  formDisabled.value = false;
+  // dialogTitle.value = '新增';
-  dialogFormVisible.value = true;
+  // formDisabled.value = false;
+  // dialogFormVisible.value = true;
 };
 const seeDetails = async (row) => {
-  dialogTitle.value = '详情';
+  ElMessage.success('查看详情!');
-  formDisabled.value = true;
+  // dialogTitle.value = '详情';
-  dialogForm.landId = row.landId;
+  // formDisabled.value = true;
-  getDetails();
+  // dialogForm.landId = row.landId;
-  dialogForm.fertilizeId = row.fertilizeId;
+  // getDetails();
-  dialogForm.fertilizeName = row.fertilizeName;
+  // setDialogForm2();
-  dialogForm.useNumber = row.useNumber;
+  // dialogFormVisible.value = true;
-  dialogForm.useUnit = row.useUnit;
-  dialogForm.detectionTime = row.useTime;
-  dialogFormVisible.value = true;
 };
 const handleEdit = (row) => {
+  ElMessage.success('点击编辑!');
   console.log('要编辑的行: ', row);
-  dialogTitle.value = '编辑';
+  // nowSelectRow.value = row;
-  formDisabled.value = false;
+  // dialogTitle.value = '编辑';
-  dialogForm.landId = row.landId;
+  // formDisabled.value = false;
-  getDetails();
+  // dialogForm.landId = row.landId;
-  dialogForm.fertilizeId = row.fertilizeId;
+  // getDetails();
-  dialogForm.fertilizeName = row.fertilizeName;
+  // setDialogForm2();
-  dialogForm.useNumber = row.useNumber;
+  // dialogFormVisible.value = true;
-  dialogForm.useUnit = row.useUnit;
-  dialogForm.detectionTime = row.useTime;
-  dialogFormVisible.value = true;
 };
 const setDialogForm = (row) => {
   dialogForm.regionCode = row.gridAreaCode;
@@ -273,6 +306,17 @@ const setDialogForm = (row) => {
   dialogForm.businessEntityCode = row.businessEntityCode ?? '';
   dialogForm.businessEntityName = row.businessEntityName ?? '';
 };
+const setDialogForm2 = (row) => {
+  dialogForm.fertilizeId = row.fertilizeId;
+  dialogForm.fertilizeName = row.fertilizeName;
+  dialogForm.useNumber = row.useNumber;
+  dialogForm.useUnit = row.useUnit;
+  dialogForm.useTime = row.useTime;
+  dialogForm.detectionTime = row.detectionTime;
+  dialogForm.detectionResult = row.detectionResult;
+  dialogForm.detectionUnit = row.detectionUnit;
+  dialogForm.detectionReport = row.detectionReport ?? '';
+};
 // 获取地块信息
 const getDetails = async () => {
   let response = await request({
@@ -333,9 +377,10 @@ const onSaveCategory = () => {
         if (dialogTitle.value == '新增') {
           response = await fertilizeUseRegulatorySave(param);
         } else {
+          param.id = nowSelectRow.value.id;
           response = await editFertilizeUseRegulatory(param);
         }
-        if (response.code == 200) {
+        if (response?.code == 200) {
           cancelDialog();
           onSubmit();
           if (dialogTitle.value == '新增') {
@@ -373,7 +418,12 @@ const restDialogForm = () => {
     useTime: '', //使用时间
     businessEntityCode: '', //经营主体编码
     businessEntityName: '', //经营主体名称
+    detectionTime: '', //检测时间
+    detectionResult: '', //检测结果'
+    detectionUnit: '', //检测单位
+    detectionReport: '', //检测报告
   });
+  nowSelectRow.value = ref({});
 };
 
 const seedTypeList = ref([]);

sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/pesticideRegulation.vue

@@ -46,50 +46,111 @@
         </tableComponent>
       </div>
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false">
+    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false" align-center>
+      <el-form :inline="true" :label-width="'auto'">
+        <LandSelect ref="landSelectRef" v-model="dialogForm.landId" :options="landSelectList" :disabled="formDisabled" @change="handleLandChange" />
+      </el-form>
+      <el-descriptions title="地块信息" border class="mb-20 custom-descriptions" :column="2">
+        <el-descriptions-item label="行政区域编码">{{ dialogForm.regionCode }}</el-descriptions-item>
+        <el-descriptions-item label="行政区域名称">{{ dialogForm.regionName }}</el-descriptions-item>
+        <el-descriptions-item label="网格编码">{{ dialogForm.gridId }}</el-descriptions-item>
+        <el-descriptions-item label="网格名称">{{ dialogForm.gridName }}</el-descriptions-item>
+        <el-descriptions-item label="地块编码">{{ dialogForm.landId }}</el-descriptions-item>
+        <el-descriptions-item label="地块名称">{{ dialogForm.landName }}</el-descriptions-item>
+      </el-descriptions>
+      <el-descriptions title="经营主体信息" border class="mb-20 custom-descriptions" :column="2">
+        <el-descriptions-item label="经营主体编码">{{ dialogForm.businessEntityCode }}</el-descriptions-item>
+        <el-descriptions-item label="经营主体名称">{{ dialogForm.businessEntityName }}</el-descriptions-item>
+      </el-descriptions>
       <el-form
         ref="dialogRef"
         :model="dialogForm"
         :inline="true"
-        :label-width="'120'"
+        :label-width="'100'"
         :rules="dialogFormRules"
         :disabled="formDisabled"
         class="dialog-form-container"
       >
-        <el-form-item label="种子种苗名称" prop="seedName" class="dialog-form-item">
+        <div class="el-descriptions__title" style="margin-bottom: 16px">
-          <el-input v-model="dialogForm.seedName" clearable placeholder="请输入种子种苗名称" />
+          农药用药信息
-        </el-form-item>
+          <el-button v-if="!formDisabled" type="primary" icon="plus" size="small" style="margin-left: 10px" @click="addMedicationInfo()"
-        <el-form-item label="品种名称" prop="varietyName" class="dialog-form-item">
+            >添加用药信息</el-button
-          <el-input v-model="dialogForm.varietyName" clearable placeholder="请输入品种名称" />
+          >
-        </el-form-item>
+        </div>
-        <el-form-item label="品牌" prop="brand" class="dialog-form-item">
+        <div v-for="(item, index) in dialogForm.pesticideSuperviseDetailVO" :key="index" class="dialog-form-many">
-          <el-input v-model="dialogForm.brand" clearable placeholder="请输入品牌" />
+          <el-form-item
-        </el-form-item>
+            label="农药名称"
-        <el-form-item label="生产厂家" prop="manufacturer" class="dialog-form-item">
+            required
-          <el-input v-model="dialogForm.manufacturer" clearable placeholder="请输入生产厂家" />
+            :prop="`pesticideSuperviseDetailVO.${index}.pesticideId`"
-        </el-form-item>
+            :rules="dialogFormRules.pesticideSuperviseDetailVO.defaultField.pesticideId"
-        <el-form-item label="蔬菜种苗" prop="classifyId" class="dialog-form-item">
+            class="dialog-form-item"
-          <el-cascader
+          >
-            v-model="dialogForm.classifyId"
+            <el-select v-model="item.pesticideId" placeholder="请选择" @change="handlePesticideChange(item, index)">
-            :options="seedTypeDialogList"
+              <el-option v-for="el in pesticideList" :key="el.id" :value="el.id" :label="el.pesticideName" />
-            :props="cascaderProps"
+            </el-select>
-            placeholder="请选择"
+          </el-form-item>
-            @change="handleCascaderChange"
+          <el-form-item
-          />
+            label="用药量"
-        </el-form-item>
+            required
-        <el-form-item label="产品规格" prop="productUnit" class="dialog-form-item">
+            :prop="`pesticideSuperviseDetailVO.${index}.useNumber`"
-          <el-input v-model="dialogForm.productUnit" clearable placeholder="请输入产品规格" />
+            :rules="dialogFormRules.pesticideSuperviseDetailVO.defaultField.useNumber"
-        </el-form-item>
+            class="dialog-form-item"
-
+          >
+            <el-input-number v-model="item.useNumber" :min="1" controls-position="right" placeholder="请输入用药量" style="width: 120px" />
+            <el-select v-model="item.useUnit" placeholder="请选择" style="width: 80px">
+              <el-option v-for="el in unitList" :key="el.dictValue" :value="el.dictValue" :label="el.dictValue" />
+            </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>
+        <div class="el-descriptions__title" style="margin-bottom: 16px">检测信息</div>
         <div style="display: flex">
-          <div style="width: 50%; display: inline-block">
+          <div style="width: 48%; display: inline-block">
-            <el-form-item label="种子种苗主图" prop="photoUrl" class="dialog-form-item" style="width: 100%">
+            <el-form-item label="检测时间" prop="detectionTime" class="dialog-form-item" :label-width="'100'">
-              <FileUploader v-model="dialogForm.photoUrl" :limit="1" />
+              <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" :label-width="'100'">
+              <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" :label-width="'100'">
+              <el-input v-model="dialogForm.detectionUnit" clearable placeholder="请输入检测单位" />
             </el-form-item>
           </div>
           <div style="width: 50%; display: inline-block">
-            <el-form-item label="种子种苗详情图" prop="photoUrlDetail" class="dialog-form-item" style="width: 100%">
+            <el-form-item label="检测报告" prop="detectionReport" class="dialog-form-item" :label-width="'80'">
-              <FileUploader v-model="dialogForm.photoUrlDetail" :limit="1" />
+              <FileUploader v-model="dialogForm.detectionReport" :limit="1" />
             </el-form-item>
           </div>
         </div>
@@ -110,14 +171,16 @@ import { ref, reactive, computed, onMounted, onBeforeUnmount, nextTick } from 'v
 import tableComponent from '@/components/tableComponent.vue';
 import { ElMessage } from 'element-plus';
 import inputSuppliesApi from '@/apis/inputSuppliesApi';
-const { getMaterailTypes } = inputSuppliesApi;
+const { getMaterailTypes, getPesticideSelectList } = inputSuppliesApi;
 import {
   getPesticideUseRegulatoryRecords,
   pesticideUseRegulatorySave,
   editPesticideUseRegulatory,
   delPesticideUseRegulatory,
-  getRowDetails,
+  getLandList,
 } from '@/apis/inputSuppliesApi/supervisionOfInputs';
+import request from '@/utils/axios';
+import { GetDictTypeInfo } from '@/apis/system/dictType';
 import { useApp } from '@/hooks';
 const app = useApp();
 
@@ -143,14 +206,18 @@ const selectedIds = ref([]);
 const tableLoading = ref(false);
 const tableTotal = ref(0);
 const columns = ref([
-  { prop: 'name', label: '姓名' },
+  { prop: 'regionCode', label: '行政区域编码' },
-  { prop: 'phone', label: '联系方式' },
+  { prop: 'regionName', label: '行政区域名称' },
-  { prop: 'landName', label: '用药地块' },
+  { prop: 'gridId', label: '网格编码' },
+  { prop: 'gridName', label: '网格名称' },
   { prop: 'landId', label: '地块编码' },
+  { prop: 'landName', label: '地块名称' },
   { prop: 'detectionTime', label: '检测时间' },
   { prop: 'detectionResult', label: '检测结果' },
   { prop: 'detectionUnit', label: '检测单位' },
   { prop: 'isUpload', label: '检测报告(是否上传)' },
+  { prop: 'businessEntityCode', label: '生产经营主体编码' },
+  { prop: 'businessEntityName', label: '生产经营主体名称' },
   { prop: 'action', label: '操作', slotName: 'action', width: 230, fixed: 'right' },
 ]);
 const handlePaginationChange = ({ page, pageSize }) => {
@@ -196,38 +263,104 @@ const seedTypeChange = () => {
   // 重新获取表格数据，需添加参数
 };
 
+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([
+  { dictCode: '52', dictValue: 'g' },
+  { dictCode: '53', dictValue: 'kg' },
+  { dictCode: '54', dictValue: 'ml' },
+  { dictCode: '55', dictValue: 'L' },
+]);
+const landSelectList = ref([]);
+const getLandsList = async () => {
+  let res = await getLandList();
+  if (res.code == 200) {
+    landSelectList.value = res.data;
+  }
+};
+const handleLandChange = (val) => {
+  console.log(val);
+  if (val) {
+    getDetails();
+  } else {
+    restDialogForm();
+  }
+};
+
 const dialogFormVisible = ref(false);
 const dialogRef = ref(null);
 const dialogTitle = ref('新增');
 const formDisabled = ref(false);
+const landSelectRef = ref(null);
+const nowSelectRow = ref({});
 const dialogForm = reactive({
-  id: '',
+  regionCode: '', //所属行政区域代码
-  seedName: '', //种子种苗名称
+  regionName: '', //所属行政区域名称
-  varietyName: '', //品种名称
+  gridId: '', //所属网格代码
-  brand: '', //品牌
+  gridName: '', //所属网格名称
-  manufacturer: '', //生产厂家
+  landId: '', //地块id
-  classifyId: '', //蔬菜种苗id
+  landName: '', //地块名称
-  classifyName: '', //蔬菜种苗名称
+  name: '', //姓名
-  productSpecification: '', //产品规格（number）
+  phone: '', //联系方式
-  productUnit: '', //产品规格单位
+  businessEntityCode: '', //经营主体编码
-  productAttributes: '', //自定义商品属性
+  businessEntityName: '', //经营主体名称
-  photoUrl: '', //种子种苗主图
+  detectionTime: '', //检测时间
-  photoUrlDetail: '', //种子种苗详情图
+  detectionResult: '', //检测结果'
+  detectionUnit: '', //检测单位
+  detectionReport: '', //检测报告
+  pesticideSuperviseDetailVO: [{ pesticideId: '', pesticideName: '', useNumber: 1, useTime: '', useUnit: 'ml', detailDetectionResult: '' }],
 });
 const dialogFormRules = ref({
-  seedName: [{ required: true, message: '请输入种子种苗名称', trigger: 'blur' }],
+  detectionTime: [{ required: true, message: '请选择检测时间', trigger: ['change', 'blur'] }],
-  varietyName: [{ required: true, message: '请输入品种名称', trigger: 'blur' }],
+  detectionResult: [
-  brand: [{ required: true, message: '请输入品牌', trigger: 'blur' }],
-  manufacturer: [{ required: true, message: '请输入品牌', trigger: 'blur' }],
-  classifyId: [
     {
       required: true,
-      message: '请选择蔬菜种苗',
+      message: '请选择检测结果',
       trigger: ['change', 'blur'],
     },
   ],
-  productUnit: [{ required: true, message: '请输入产品规格', trigger: '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 handlePesticideChange = (item, index) => {
+  dialogForm.pesticideSuperviseDetailVO[index].pesticideName = pesticideList.value[index].pesticideName;
+  console.log(dialogForm.pesticideSuperviseDetailVO);
+};
+const deleteMedicationInfo = (index) => {
+  dialogForm.pesticideSuperviseDetailVO.splice(index, 1);
+};
 
 const addItem = async () => {
   ElMessage.success('点击新增!');
@@ -237,33 +370,65 @@ const addItem = async () => {
   // dialogFormVisible.value = true;
 };
 const seeDetails = async (row) => {
-  ElMessage.success('点击查看详情!');
+  ElMessage.success('查看详情!');
-  dialogTitle.value = '详情';
+  console.log('查看详情的行: ', row);
-  setDialogForm(row);
+  // dialogTitle.value = '详情';
-  formDisabled.value = true;
+  // formDisabled.value = true;
-  dialogFormVisible.value = true;
+  // getDetails();
+  // setDialogForm2(row);
+  // dialogFormVisible.value = true;
 };
 const handleEdit = (row) => {
   ElMessage.success('点击编辑!');
   console.log('要编辑的行: ', row);
+  // nowSelectRow.value = row;
   // dialogTitle.value = '编辑';
-  // setDialogForm(row);
   // formDisabled.value = false;
+  // dialogForm.landId = row.landId;
+  // getDetails();
+  // setDialogForm2(row);
   // dialogFormVisible.value = true;
 };
 const setDialogForm = (row) => {
-  dialogForm.id = row.id;
+  dialogForm.regionCode = row.gridAreaCode;
-  dialogForm.seedName = row.seedName;
+  dialogForm.regionName = row.fullRegionName;
-  dialogForm.varietyName = row.varietyName;
+  dialogForm.gridId = row.gridId;
-  dialogForm.brand = row.brand;
+  dialogForm.gridName = row.gridName;
-  dialogForm.manufacturer = row.manufacturer;
+  dialogForm.landId = row.id;
-  dialogForm.classifyId = row.classifyId;
+  dialogForm.landName = row.landName;
-  dialogForm.classifyName = row.classifyName;
+  dialogForm.name = row.propertyName;
-  dialogForm.productSpecification = row.productSpecification;
+  dialogForm.phone = row.propertyPhone;
-  dialogForm.productUnit = row.productUnit;
+  dialogForm.businessEntityCode = row.businessEntityCode ?? '';
-  dialogForm.productAttributes = row.productAttributes;
+  dialogForm.businessEntityName = row.businessEntityName ?? '';
-  dialogForm.photoUrl = row.photoUrl;
+};
-  dialogForm.photoUrlDetail = row.photoUrlDetail;
+const setDialogForm2 = (row) => {
+  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 getDetails = async () => {
+  let response = await request({
+    url: `/land-resource/landManage/getLandInfo?landId=${dialogForm.landId}`,
+  });
+  console.log(response);
+  if (response.code == 200) {
+    if (response.data) {
+      setDialogForm(response.data);
+    } else {
+      ElMessage.error('未查询到数据');
+    }
+  } else {
+    ElMessage.error(response.message);
+  }
 };
 const handleDelete = (row) => {
   app
@@ -296,17 +461,20 @@ const deleteGoods = async (ids) => {
 };
 const onSaveCategory = () => {
   console.log(dialogForm);
+  if (dialogForm.landId == '') {
+    landSelectRef.value.handleChange();
+    return;
+  }
   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 pesticideUseRegulatorySave(param);
         } else {
+          param.id = nowSelectRow.value.id;
           response = await editPesticideUseRegulatory(param);
         }
         if (response.code == 200) {
@@ -332,19 +500,23 @@ const cancelDialog = async () => {
 };
 const restDialogForm = () => {
   Object.assign(dialogForm, {
-    id: '',
+    regionCode: '', //所属行政区域代码
-    seedName: '', //种子种苗名称
+    regionName: '', //所属行政区域名称
-    varietyName: '', //品种名称
+    gridId: '', //所属网格代码
-    brand: '', //品牌
+    gridName: '', //所属网格名称
-    manufacturer: '', //生产厂家
+    landId: '', //地块id
-    classifyId: '', //蔬菜种苗id
+    landName: '', //地块名称
-    classifyName: '', //蔬菜种苗名称
+    name: '', //姓名
-    productSpecification: '', //产品规格（number）
+    phone: '', //联系方式
-    productUnit: '', //产品规格单位
+    businessEntityCode: '', //经营主体编码
-    productAttributes: '', //自定义商品属性
+    businessEntityName: '', //经营主体名称
-    photoUrl: '', //种子种苗主图
+    detectionTime: '',
-    photoUrlDetail: '', //种子种苗详情图
+    detectionResult: '',
+    detectionUnit: '',
+    detectionReport: '',
+    pesticideSuperviseDetailVO: [{ pesticideId: '', pesticideName: '', useNumber: 1, useTime: '', useUnit: 'ml' }],
   });
+  nowSelectRow.value = ref({});
 };
 
 const seedTypeList = ref([]);
@@ -396,9 +568,32 @@ const getSelectedNames = (ids) => {
   return names;
 };
 
+const getEntityOptions = async () => {
+  let res = await GetDictTypeInfo('sys_use_supervise_number');
+  console.log(res);
+  if (res.code == 200) {
+    unitList.value = res.data;
+    let arr = [
+      { dictCode: '54', dictValue: 'ml' },
+      { dictCode: '55', dictValue: 'L' },
+    ];
+    unitList.value = [...arr, ...res.data];
+  } else {
+    unitList.value = [
+      { dictCode: '52', dictValue: 'g' },
+      { dictCode: '53', dictValue: 'kg' },
+      { dictCode: '54', dictValue: 'ml' },
+      { dictCode: '55', dictValue: 'L' },
+    ];
+  }
+};
+
 onMounted(() => {
   onSubmit();
   getSeedTypeList();
+  getPesticidesList();
+  getLandsList();
+  getEntityOptions();
 });
 </script>
 <style lang="scss" scoped>
@@ -418,4 +613,23 @@ onMounted(() => {
     height: 100px;
   }
 }
+
+/* 必须使用深度选择器 + 精确DOM层级 */
+.custom-descriptions :deep(.el-descriptions__body) table.el-descriptions__table {
+  table-layout: fixed; /* 关键属性1：强制等宽 */
+  width: 100%;
+}
+.custom-descriptions :deep(.el-descriptions__label) {
+  width: 130px !important; /* 关键属性2：固定宽度 */
+  min-width: 130px !important;
+  max-width: 130px !important;
+  background: #f5f7fa;
+  font-weight: bold;
+  text-align: left;
+  padding-right: 20px;
+}
+.custom-descriptions :deep(.el-descriptions__content) {
+  width: calc(100% - 130px) !important; /* 自动填充剩余空间 */
+  word-break: break-word;
+}
 </style>

sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue

@@ -46,44 +46,40 @@
         </tableComponent>
       </div>
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false">
+    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false" align-center>
       <el-form :inline="true" :label-width="'auto'">
-        <LandSelect
+        <LandSelect ref="landSelectRef" v-model="dialogForm.landId" :options="landSelectList" :disabled="formDisabled" @change="handleLandChange" />
-          ref="landSelectRef"
-          v-model="dialogForm.landId"
-          :options="landSelectList"
-          :disabled="formDisabled"
-          :width="500"
-          @change="handleLandChange"
-        />
       </el-form>
       <el-descriptions title="地块信息" border class="mb-20 custom-descriptions" :column="2">
-        <el-descriptions-item label="地块">{{ dialogForm.landName }}</el-descriptions-item>
+        <el-descriptions-item label="行政区域编码">{{ dialogForm.regionCode }}</el-descriptions-item>
-        <el-descriptions-item label="所属行政区">{{ dialogForm.regionName }}</el-descriptions-item>
+        <el-descriptions-item label="行政区域名称">{{ dialogForm.regionName }}</el-descriptions-item>
-        <el-descriptions-item label="所属网格">{{ dialogForm.gridName }}</el-descriptions-item>
+        <el-descriptions-item label="网格编码">{{ dialogForm.gridId }}</el-descriptions-item>
+        <el-descriptions-item label="网格名称">{{ dialogForm.gridName }}</el-descriptions-item>
+        <el-descriptions-item label="地块编码">{{ dialogForm.landId }}</el-descriptions-item>
+        <el-descriptions-item label="地块名称">{{ dialogForm.landName }}</el-descriptions-item>
       </el-descriptions>
       <el-descriptions title="经营主体信息" border class="mb-20 custom-descriptions" :column="2">
-        <el-descriptions-item label="姓名">{{ dialogForm.name }}</el-descriptions-item>
+        <el-descriptions-item label="经营主体编码">{{ dialogForm.businessEntityCode }}</el-descriptions-item>
-        <el-descriptions-item label="联系方式">{{ dialogForm.phone }}</el-descriptions-item>
+        <el-descriptions-item label="经营主体名称">{{ dialogForm.businessEntityName }}</el-descriptions-item>
       </el-descriptions>
       <el-form
         ref="dialogRef"
         :model="dialogForm"
         :inline="true"
-        :label-width="'80'"
+        :label-width="'120'"
         :rules="dialogFormRules"
         :disabled="formDisabled"
         class="dialog-form-container"
       >
-        <div class="dialog-form-title">农药用药详情</div>
+        <div class="el-descriptions__title" style="margin-bottom: 16px">使用信息</div>
-        <el-form-item label="种子编号" prop="provenanceId" class="dialog-form-item">
+        <el-form-item label="种子种苗编号" prop="provenanceId" class="dialog-form-item">
-          <el-input v-model="dialogForm.provenanceId" clearable placeholder="请输入种子编号" />
+          <el-input v-model="dialogForm.provenanceId" clearable placeholder="请输入种子种苗编号" />
         </el-form-item>
-        <el-form-item label="种子名称" prop="provenanceName" class="dialog-form-item">
+        <el-form-item label="种子种苗名称" prop="provenanceName" class="dialog-form-item">
-          <el-input v-model="dialogForm.provenanceName" clearable placeholder="请输入种子名称" />
+          <el-input v-model="dialogForm.provenanceName" clearable placeholder="请输入种子种苗名称" />
         </el-form-item>
         <el-form-item label="使用量" required prop="useNumber" class="dialog-form-item">
-          <el-input-number v-model="dialogForm.useNumber" :min="1" :controls="false" placeholder="请输入使用量" style="width: 150px" />
+          <el-input-number v-model="dialogForm.useNumber" :min="1" controls-position="right" placeholder="请输入使用量" style="width: 150px" />
           <el-select v-model="dialogForm.useUnit" placeholder="请选择" style="width: 80px">
             <el-option v-for="el in unitList" :key="el.dictValue" :value="el.dictValue" :label="el.dictValue" />
           </el-select>
@@ -150,8 +146,8 @@ const columns = ref([
   { prop: 'gridName', label: '网格名称' },
   { prop: 'landId', label: '地块编码' },
   { prop: 'landName', label: '地块名称' },
-  { prop: 'provenanceId', label: '种子编号' },
+  { prop: 'provenanceId', label: '种子种苗编号' },
-  { prop: 'provenanceName', label: '种子名称' },
+  { prop: 'provenanceName', label: '种子种苗名称' },
   { prop: 'useNumber', label: '使用量' },
   { prop: 'useUnit', label: '使用单位' },
   { prop: 'useTime', label: '使用时间' },
@@ -207,6 +203,7 @@ const dialogRef = ref(null);
 const dialogTitle = ref('新增');
 const formDisabled = ref(false);
 const landSelectRef = ref(null);
+const nowSelectRow = ref({});
 const dialogForm = reactive({
   regionCode: '', //所属行政区域代码
   regionName: '', //所属行政区域名称
@@ -216,8 +213,8 @@ const dialogForm = reactive({
   landName: '', //地块名称
   name: '', //姓名
   phone: '', //联系方式
-  provenanceId: '', //种子名称id
+  provenanceId: '', //种子种苗名称id
-  provenanceName: '', //种子名称
+  provenanceName: '', //种子种苗名称
   useNumber: 1, //使用量
   useUnit: 'g', //使用量单位
   detectionTime: '', //使用时间
@@ -225,18 +222,20 @@ const dialogForm = reactive({
   businessEntityName: '', //经营主体名称
 });
 const dialogFormRules = ref({
-  provenanceId: [{ required: true, message: '请输入种子编号', trigger: 'blur' }],
+  provenanceId: [{ required: true, message: '请输入种子种苗编号', trigger: 'blur' }],
-  provenanceName: [{ required: true, message: '请输入种子名称', trigger: 'blur' }],
+  provenanceName: [{ required: true, message: '请输入种子种苗名称', trigger: 'blur' }],
   useNumber: [{ required: true, message: '请输入使用量', trigger: ['change', 'blur'] }],
   detectionTime: [{ required: true, message: '请选择使用时间', trigger: 'blur' }],
 });
 const addItem = async () => {
+  // ElMessage.success('点击新增!');
   restDialogForm();
   dialogTitle.value = '新增';
   formDisabled.value = false;
   dialogFormVisible.value = true;
 };
 const seeDetails = async (row) => {
+  // ElMessage.success('查看详情!');
   dialogTitle.value = '详情';
   console.log(row);
   formDisabled.value = true;
@@ -250,6 +249,8 @@ const seeDetails = async (row) => {
   dialogFormVisible.value = true;
 };
 const handleEdit = (row) => {
+  // ElMessage.success('点击编辑!');
+  nowSelectRow.value = row;
   dialogTitle.value = '编辑';
   console.log(row);
   formDisabled.value = false;
@@ -338,7 +339,7 @@ const onSaveCategory = () => {
         if (dialogTitle.value == '新增') {
           response = await seedUseRegulatorySave(param);
         } else {
-          param.id = dialogForm.id;
+          param.id = nowSelectRow.value.id;
           response = await editSeedUseRegulatory(param);
         }
         if (response.code == 200) {
@@ -372,14 +373,15 @@ const restDialogForm = () => {
     landName: '', //地块名称
     name: '', //姓名
     phone: '', //联系方式
-    provenanceId: '', //种子名称id
+    provenanceId: '', //种子种苗名称id
-    provenanceName: '', //种子名称
+    provenanceName: '', //种子种苗名称
     useNumber: 1, //使用量
     useUnit: 'g', //使用量单位
     useTime: '', //使用时间
     businessEntityCode: '', //经营主体编码
     businessEntityName: '', //经营主体名称
   });
+  nowSelectRow.value = ref({});
 };
 
 const seedTypeList = ref([]);