From dcf27eaf48455adb8766701a937697491c0d6cc1 Mon Sep 17 00:00:00 2001
From: hejunjie <hejunjie@datametatech.com>
Date: Mon, 17 Mar 2025 18:06:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../patrolMaintenance/InspectionRecords/index.vue    |  2 ++
 .../patrolMaintenance/acceptanceRecords/index.vue    |  2 ++
 .../runManage/patrolMaintenance/defectList/index.vue |  4 +++-
 .../patrolMaintenance/maintenanceRecords/index.vue   |  2 ++
 .../pestAnimalControl2/InspectionRecords/index.vue   | 10 +++++-----
 .../pestAnimalControl2/acceptanceRecords/index.vue   | 10 +++++-----
 .../componentsDetails/acceptanceDetails.vue          |  2 +-
 .../componentsDetails/defectDetails.vue              |  2 +-
 .../componentsDetails/inspectionRecordDetails.vue    |  4 ++--
 .../componentsDetails/maintenanceDetails.vue         |  2 +-
 .../pestAnimalControl2/defectList/index.vue          | 12 ++++++------
 .../pestAnimalControl2/maintenanceRecords/index.vue  | 10 +++++-----
 .../patrolMaintenance/InspectionRecords/index.vue    |  2 ++
 .../patrolMaintenance/acceptanceRecords/index.vue    |  2 ++
 .../runManage/patrolMaintenance/defectList/index.vue |  4 +++-
 .../patrolMaintenance/maintenanceRecords/index.vue   |  2 ++
 16 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/src/views/dike/runManage/patrolMaintenance/InspectionRecords/index.vue b/src/views/dike/runManage/patrolMaintenance/InspectionRecords/index.vue
index f521593..3054326 100644
--- a/src/views/dike/runManage/patrolMaintenance/InspectionRecords/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/InspectionRecords/index.vue
@@ -137,6 +137,8 @@
         <!--<el-table-column prop="id" align="center" label="单号"/>-->
         <el-table-column type="index" label="序号"/>
         <el-table-column prop="checkingName" align="center" label="巡查名称"/>
+        <el-table-column prop="dikeName" align="center" label="堤防名称"/>
+        <el-table-column prop="dikeCode" align="center" label="堤防代码"/>
         <el-table-column prop="type" align="center" label="巡查类型">
           <template slot-scope="scope">
             <span>{{
diff --git a/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue b/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
index 3920ad0..09d7e3b 100644
--- a/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
@@ -152,6 +152,8 @@
         <!--<el-table-column prop="id" align="center" label="单号"/>-->
         <el-table-column type="index" label="序号"/>
         <el-table-column prop="detail.name" align="center" label="巡查名称" />
+        <el-table-column prop="dikeName" align="center" label="堤防名称"/>
+        <el-table-column prop="dikeCode" align="center" label="堤防代码"/>
         <el-table-column align="center" label="巡查类型">
           <template slot-scope="scope">
             <span>{{
diff --git a/src/views/dike/runManage/patrolMaintenance/defectList/index.vue b/src/views/dike/runManage/patrolMaintenance/defectList/index.vue
index af91db8..4ebe08f 100644
--- a/src/views/dike/runManage/patrolMaintenance/defectList/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/defectList/index.vue
@@ -156,6 +156,8 @@
         <!--<el-table-column prop="id" align="center" label="单号"/>-->
         <el-table-column type="index" label="序号"/>
         <el-table-column prop="checkingName" align="center" label="巡查名称" />
+        <el-table-column prop="dikeName" align="center" label="堤防名称"/>
+        <el-table-column prop="dikeCode" align="center" label="堤防代码"/>
         <el-table-column prop="type" align="center" label="巡查类型">
           <template slot-scope="scope">
             <span>{{
@@ -227,7 +229,7 @@
             <el-button
               type="text"
               size="small"
-              :disabled="scope.row.status !== '4'"
+              :disabled="scope.row.neckFlag === '0'"
               v-hasPermi="['df:run:patrol:defect:list:item:getInvoices']"
               @click="handleReceiveDetails(scope.row)"
             >领单</el-button
diff --git a/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue
index 490b019..eeeff8b 100644
--- a/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue
@@ -156,6 +156,8 @@
         <!--<el-table-column prop="id" align="center" label="单号"/>-->
         <el-table-column type="index" label="序号"/>
         <el-table-column prop="name" align="center" label="巡查名称" />
+        <el-table-column prop="dikeName" align="center" label="堤防名称"/>
+        <el-table-column prop="dikeCode" align="center" label="堤防代码"/>
         <el-table-column prop="type" align="center" label="巡查类型">
           <template slot-scope="scope">
             <span>{{
diff --git a/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue b/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
index 069b2f7..bdb0f0b 100644
--- a/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
@@ -136,8 +136,8 @@
       >
         <el-table-column prop="id" align="center" label="单号"/>
         <el-table-column prop="checkingName" align="center" label="防治项目名称"/>
-        <el-table-column prop="dikeName" align="center" label="工程名称"/>
-        <el-table-column prop="dikeCode" align="center" label="工程代码"/>
+        <el-table-column prop="dikeName" align="center" label="堤防名称"/>
+        <el-table-column prop="dikeCode" align="center" label="堤防代码"/>
 
         <el-table-column prop="type" align="center" label="检查类型">
           <template slot-scope="scope">
@@ -269,13 +269,13 @@ export default {
     };
   },
   created() {
-    this.getDicts("patrol_maintenance_status").then((response) => {
+    this.getDicts("animal_check_status").then((response) => {
       this.maintenanceStatus = response.data;
     });
-    this.getDicts("patrol_maintenance_category").then((response) => {
+    this.getDicts("animal_prevention_category").then((response) => {
       this.maintenanceCategory = response.data;
     });
-    this.getDicts("patrol_maintenance_type").then((response) => {
+    this.getDicts("animal_check_type").then((response) => {
       this.maintenanceType = response.data;
     });
   },
diff --git a/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
index 049abb9..4cf711a 100644
--- a/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
@@ -151,8 +151,8 @@
       <el-table :height="tableHeight" :data="tableData" border>
         <el-table-column prop="id" align="center" label="单号" />
         <el-table-column prop="detail.name" align="center" label="防治项目名称" />
-        <el-table-column prop="dikeName" align="center" label="工程名称"/>
-        <el-table-column prop="dikeCode" align="center" label="工程代码"/>
+        <el-table-column prop="dikeName" align="center" label="堤防名称"/>
+        <el-table-column prop="dikeCode" align="center" label="堤防代码"/>
         <el-table-column align="center" label="检查类型">
           <template slot-scope="scope">
             <span>{{
@@ -280,13 +280,13 @@ export default {
     };
   },
   created() {
-    this.getDicts("patrol_maintenance_status").then((response) => {
+    this.getDicts("animal_check_status").then((response) => {
       this.maintenanceStatus = response.data;
     });
-    this.getDicts("patrol_maintenance_category").then((response) => {
+    this.getDicts("animal_prevention_category").then((response) => {
       this.maintenanceCategory = response.data;
     });
-    this.getDicts("patrol_maintenance_type").then((response) => {
+    this.getDicts("animal_check_type").then((response) => {
       this.maintenanceType = response.data;
     });
     this.getDicts("patrol_maintenance_level").then((response) => {
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue
index d338b49..eec7a87 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue
@@ -229,7 +229,7 @@ export default {
     };
   },
   created() {
-    this.getDicts("patrol_maintenance_category").then((response) => {
+    this.getDicts("animal_prevention_category").then((response) => {
       this.maintenanceCategory = response.data;
     });
     this.getDicts("patrol_maintenance_level").then((response) => {
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/defectDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/defectDetails.vue
index 57130e0..4d1358e 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/defectDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/defectDetails.vue
@@ -91,7 +91,7 @@ export default {
     };
   },
   created() {
-    this.getDicts("patrol_maintenance_category").then((response) => {
+    this.getDicts("animal_prevention_category").then((response) => {
       this.maintenanceCategory = response.data;
     });
     this.getDicts("patrol_maintenance_level").then((response) => {
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
index 02f21f5..66cd1ca 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
@@ -333,10 +333,10 @@ export default {
     };
   },
   created() {
-    this.getDicts("patrol_maintenance_status").then((response) => {
+    this.getDicts("animal_check_status").then((response) => {
       this.maintenanceStatus = response.data;
     });
-    this.getDicts("patrol_maintenance_category").then((response) => {
+    this.getDicts("animal_prevention_category").then((response) => {
       this.maintenanceCategory = response.data;
     });
     this.getDicts("patrol_maintenance_level").then((response) => {
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
index d23a230..8a5c8d0 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
@@ -257,7 +257,7 @@ export default {
     };
   },
   created() {
-    this.getDicts("patrol_maintenance_category").then((response) => {
+    this.getDicts("animal_prevention_category").then((response) => {
       this.maintenanceCategory = response.data;
     });
     this.getDicts("patrol_maintenance_level").then((response) => {
diff --git a/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue b/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
index f88ca45..1034ace 100644
--- a/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
@@ -155,8 +155,8 @@
       >
         <el-table-column prop="id" align="center" label="单号" />
         <el-table-column prop="checkingName" align="center" label="防治项目名称" />
-        <el-table-column prop="dikeName" align="center" label="工程名称"/>
-        <el-table-column prop="dikeCode" align="center" label="工程代码"/>
+        <el-table-column prop="dikeName" align="center" label="堤防名称"/>
+        <el-table-column prop="dikeCode" align="center" label="堤防代码"/>
         <el-table-column prop="type" align="center" label="检查类型">
           <template slot-scope="scope">
             <span>{{
@@ -204,7 +204,7 @@
             <el-button
               type="text"
               size="small"
-              :disabled="scope.row.status !== '4'"
+              :disabled="scope.row.neckFlag === '0'"
               v-hasPermi="['df:run:pestanimal2:defect:list:item:getInvoices']"
               @click="handleReceiveDetails(scope.row)"
             >领单</el-button
@@ -269,13 +269,13 @@ export default {
     };
   },
   created() {
-    this.getDicts("patrol_maintenance_status").then((response) => {
+    this.getDicts("animal_check_status").then((response) => {
       this.maintenanceStatus = response.data;
     });
-    this.getDicts("patrol_maintenance_category").then((response) => {
+    this.getDicts("animal_prevention_category").then((response) => {
       this.maintenanceCategory = response.data;
     });
-    this.getDicts("patrol_maintenance_type").then((response) => {
+    this.getDicts("animal_check_type").then((response) => {
       this.maintenanceType = response.data;
     });
     this.getDicts("patrol_maintenance_level").then((response) => {
diff --git a/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
index 4e8f088..0942f56 100644
--- a/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
@@ -155,8 +155,8 @@
       >
         <el-table-column prop="id" align="center" label="单号" />
         <el-table-column prop="name" align="center" label="防治项目名称" />
-        <el-table-column prop="dikeName" align="center" label="工程名称"/>
-        <el-table-column prop="dikeCode" align="center" label="工程代码"/>
+        <el-table-column prop="dikeName" align="center" label="堤防名称"/>
+        <el-table-column prop="dikeCode" align="center" label="堤防代码"/>
         <el-table-column prop="type" align="center" label="检查类型">
           <template slot-scope="scope">
             <span>{{
@@ -293,13 +293,13 @@ export default {
     };
   },
   created() {
-    this.getDicts("patrol_maintenance_status").then((response) => {
+    this.getDicts("animal_check_status").then((response) => {
       this.maintenanceStatus = response.data;
     });
-    this.getDicts("patrol_maintenance_category").then((response) => {
+    this.getDicts("animal_prevention_category").then((response) => {
       this.maintenanceCategory = response.data;
     });
-    this.getDicts("patrol_maintenance_type").then((response) => {
+    this.getDicts("animal_check_type").then((response) => {
       this.maintenanceType = response.data;
     });
     this.getDicts("patrol_maintenance_level").then((response) => {
diff --git a/src/views/sluice/runManage/patrolMaintenance/InspectionRecords/index.vue b/src/views/sluice/runManage/patrolMaintenance/InspectionRecords/index.vue
index b66f1f2..a3249b8 100644
--- a/src/views/sluice/runManage/patrolMaintenance/InspectionRecords/index.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/InspectionRecords/index.vue
@@ -137,6 +137,8 @@
         <!--<el-table-column prop="id" align="center" label="单号"/>-->
         <el-table-column type="index" label="序号"/>
         <el-table-column prop="checkingName" align="center" label="巡查名称"/>
+        <el-table-column prop="wagaName" align="center" label="水闸名称"/>
+        <el-table-column prop="wagaCode" align="center" label="水闸代码"/>
         <el-table-column prop="type" align="center" label="巡查类型">
           <template slot-scope="scope">
             <span>{{
diff --git a/src/views/sluice/runManage/patrolMaintenance/acceptanceRecords/index.vue b/src/views/sluice/runManage/patrolMaintenance/acceptanceRecords/index.vue
index 57d34be..bff4c99 100644
--- a/src/views/sluice/runManage/patrolMaintenance/acceptanceRecords/index.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/acceptanceRecords/index.vue
@@ -152,6 +152,8 @@
         <!--<el-table-column prop="id" align="center" label="单号"/>-->
         <el-table-column type="index" label="序号"/>
         <el-table-column prop="detail.name" align="center" label="巡查名称" />
+        <el-table-column prop="wagaName" align="center" label="水闸名称"/>
+        <el-table-column prop="wagaCode" align="center" label="水闸代码"/>
         <el-table-column align="center" label="巡查类型">
           <template slot-scope="scope">
             <span>{{
diff --git a/src/views/sluice/runManage/patrolMaintenance/defectList/index.vue b/src/views/sluice/runManage/patrolMaintenance/defectList/index.vue
index 94221f3..65a57a4 100644
--- a/src/views/sluice/runManage/patrolMaintenance/defectList/index.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/defectList/index.vue
@@ -156,6 +156,8 @@
         <!--<el-table-column prop="id" align="center" label="单号"/>-->
         <el-table-column type="index" label="序号"/>
         <el-table-column prop="checkingName" align="center" label="巡查名称" />
+        <el-table-column prop="wagaName" align="center" label="水闸名称"/>
+        <el-table-column prop="wagaCode" align="center" label="水闸代码"/>
         <el-table-column prop="type" align="center" label="巡查类型">
           <template slot-scope="scope">
             <span>{{
@@ -228,7 +230,7 @@
             <el-button
               type="text"
               size="small"
-              :disabled="scope.row.status !== '4'"
+              :disabled="scope.row.neckFlag === '0'"
               v-hasPermi="['sz:run:patrol:defect:list:item:getInvoices']"
               @click="handleReceiveDetails(scope.row)"
             >领单</el-button
diff --git a/src/views/sluice/runManage/patrolMaintenance/maintenanceRecords/index.vue b/src/views/sluice/runManage/patrolMaintenance/maintenanceRecords/index.vue
index af6daf5..301836e 100644
--- a/src/views/sluice/runManage/patrolMaintenance/maintenanceRecords/index.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/maintenanceRecords/index.vue
@@ -156,6 +156,8 @@
         <!--<el-table-column prop="id" align="center" label="单号"/>-->
         <el-table-column type="index" label="序号"/>
         <el-table-column prop="name" align="center" label="巡查名称" />
+        <el-table-column prop="wagaName" align="center" label="水闸名称"/>
+        <el-table-column prop="wagaCode" align="center" label="水闸代码"/>
         <el-table-column prop="type" align="center" label="巡查类型">
           <template slot-scope="scope">
             <span>{{