Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0

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>{{

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>{{

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

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>{{

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="dikeName" align="center" label="堤防名称"/>
-        <el-table-column prop="dikeCode" 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;
     });
   },

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="dikeName" align="center" label="堤防名称"/>
-        <el-table-column prop="dikeCode" 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) => {

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) => {

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) => {

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) => {

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) => {

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="dikeName" align="center" label="堤防名称"/>
-        <el-table-column prop="dikeCode" 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) => {

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="dikeName" align="center" label="堤防名称"/>
-        <el-table-column prop="dikeCode" 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) => {

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>{{

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>{{

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

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>{{