From 30cccd796d6e3475412f373c52364854b45f6649 Mon Sep 17 00:00:00 2001
From: hejunjie <hejunjie@datametatech.com>
Date: Sun, 16 Mar 2025 14:14:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E8=BD=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionRecordDetails.vue               |  3 +-
 .../componentsDetails/maintenanceDetails.vue  | 75 +++++++++++++++++--
 .../patrolMaintenance/defectList/index.vue    | 26 ++++++-
 .../maintenanceRecords/index.vue              |  2 +-
 .../inspectionRecordDetails.vue               |  3 +-
 .../componentsDetails/maintenanceDetails.vue  | 73 ++++++++++++++++--
 .../maintenanceRecords/index.vue              |  2 +-
 .../inspectionRecordDetails.vue               |  3 +-
 .../componentsDetails/maintenanceDetails.vue  | 75 +++++++++++++++++--
 .../patrolMaintenance/defectList/index.vue    | 27 ++++++-
 .../maintenanceRecords/index.vue              |  2 +-
 11 files changed, 260 insertions(+), 31 deletions(-)

diff --git a/src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue b/src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
index b8137f5..8225833 100644
--- a/src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
+++ b/src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
@@ -30,7 +30,7 @@
               :disabled="$route.query.mode === 'check'"
               v-model="form.time"
               type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
@@ -107,7 +107,6 @@
             <el-select
               clearable
               size="small"
-              class="w-202 ml-10"
               :disabled="$route.query.mode === 'check'"
               v-model="scope.row.itemId"
               filterable
diff --git a/src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue b/src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue
index b839570..6c729bc 100644
--- a/src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue
+++ b/src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue
@@ -180,6 +180,51 @@
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="this.$route.query.status === '5'">
+        <div class="form-row-title">验收意见</div>
+        <el-form ref="form" :model="acceptanceForm" :rules="acceptanceRules" label-width="120px" label-position="right">
+          <el-row :gutter="48">
+            <el-col :span="8">
+              <el-form-item label="复核人:" prop="operator">
+                <el-input
+                  disabled
+                  placeholder="请输入内容"
+                  v-model="acceptanceForm.operator">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="复核时间：" prop="approvalTime">
+                <el-date-picker
+                  size="small"
+                  class="ml-10"
+                  disabled
+                  style="width: 100%;"
+                  v-model="acceptanceForm.approvalTime"
+                  type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <el-form-item label="复核意见：" prop="comment">
+                <el-input
+                  type="textarea"
+                  :rows="4"
+                  disabled
+                  placeholder="请输入内容"
+                  maxlength="200"
+                  show-word-limit
+                  v-model="acceptanceForm.comment">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
     </div>
     <div class="bottom-btns" v-if="$route.query.mode !== 'check'">
       <el-button
@@ -203,7 +248,7 @@ import TopBackTitle from "@/components/TopBackTitle/index.vue";
 import { calcTableHeight } from "@/mixins/calcTableHeight";
 import SyMixMap from "@/views/components/SyMixMap.vue";
 import { uploadFileData } from "@/api/system/upload";
-import { getV2Yh, postV2Yh, gettV2Record } from "@/api/dike/patrolMaintenance";
+import {getV2Yh, postV2Yh, gettV2Record, getV2ApprovalComment} from "@/api/dike/patrolMaintenance";
 import { getDictMapData } from "@/api/system/dict/data";
 import { mapGetters } from "vuex";
 
@@ -253,6 +298,16 @@ export default {
         time: [],
         scope: '',
       },
+      acceptanceForm: {
+        operator: '',
+        approvalTime: '',
+        comment: '',
+      },
+      acceptanceRules: {
+        operator: [{required: true}],
+        approvalTime: [{required: true}],
+        comment: [{required: true}],
+      },
       rules: {
         userName: [{required: true}],
         projectName: [{required: true}],
@@ -320,13 +375,19 @@ export default {
         }
       })
       if (this.$route.query.id) {
-        const ApprovalComment = await getV2Yh(this.$route.query.id)
-        this.form.time[0] = ApprovalComment.data.startDate
-        this.form.time[1] = ApprovalComment.data.endDate
-        this.form.describe = ApprovalComment.data.content
+        const Yh = await getV2Yh(this.$route.query.id)
+        this.form.time[0] = Yh.data.startDate
+        this.form.time[1] = Yh.data.endDate
+        this.form.describe = Yh.data.content
         this.form.time = [...this.form.time]
-        this.form.images = ApprovalComment.data.doc.images
-        this.fileData = ApprovalComment.data.doc.docs
+        this.form.images = Yh.data.doc.images
+        this.fileData = Yh.data.doc.docs
+      }
+      if (this.$route.query.status === '5') {
+        const ApprovalComment = await getV2ApprovalComment(this.$route.query.id)
+        this.acceptanceForm.operator = ApprovalComment.data[0].operator.name
+        this.acceptanceForm.approvalTime = ApprovalComment.data[0].approvalTime
+        this.acceptanceForm.comment = ApprovalComment.data[0].comment
       }
     },
     getDictLabelName(type, dictListName) {
diff --git a/src/views/dike/runManage/patrolMaintenance/defectList/index.vue b/src/views/dike/runManage/patrolMaintenance/defectList/index.vue
index 800a3d5..27b4f73 100644
--- a/src/views/dike/runManage/patrolMaintenance/defectList/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/defectList/index.vue
@@ -89,7 +89,7 @@
           </div>
 
           <div class="search-item flex items-center">
-            <span class="search-label">巡查状态</span>
+            <span class="search-label">养护状态</span>
             <el-select
               clearable
               size="small"
@@ -176,6 +176,30 @@
               }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="status" align="center" label="巡查状态" width="100">
+          <template slot-scope="scope">
+            <span style="position: relative"
+                  :style="['3', '5', '6'].includes(scope.row.status) && {color: 'rgba(0,0,0,0.4)'}">
+                <div
+                  v-if="scope.row.status === '1'"
+                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #FFB20D"
+                ></div>
+                <div
+                  v-if="scope.row.status === '2'"
+                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #0EC885"
+                ></div>
+                <div
+                  v-if="scope.row.status === '4'"
+                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #3A89FE"
+                ></div>
+                <div
+                  v-if="['3', '5', '6'].includes(scope.row.status)"
+                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #A6A6A6"
+                ></div>
+                  {{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
+                </span>
+          </template>
+        </el-table-column>
         <el-table-column prop="dutyHolderName" align="center" label="责任人" />
         <el-table-column
           prop="startDate"
diff --git a/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue
index df654b8..12ce488 100644
--- a/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue
@@ -319,7 +319,7 @@ export default {
     handleCheckDetails(row, mode) {
       this.$router.push({
         path: "maintenanceDetails",
-        query: { id: row.id, recordId: row.recordId, defectId: row.problemId, mode: mode },
+        query: { id: row.id, recordId: row.recordId, defectId: row.problemId,status: row.status, mode: mode },
       });
     },
     getDictLabelName(type, dictListName) {
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
index 9331cd0..38616f4 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
@@ -30,7 +30,7 @@
               :disabled="$route.query.mode === 'check'"
               v-model="form.time"
               type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
@@ -107,7 +107,6 @@
             <el-select
               clearable
               size="small"
-              class="w-202 ml-10"
               :disabled="$route.query.mode === 'check'"
               v-model="scope.row.itemId"
               filterable
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
index 0269907..fa906e5 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
@@ -130,6 +130,51 @@
         </el-form-item>
       </el-form>
     </div>
+    <div v-if="this.$route.query.status === '5'">
+      <div class="form-row-title">验收意见</div>
+      <el-form ref="form" :model="acceptanceForm" :rules="acceptanceRules" label-width="120px" label-position="right">
+        <el-row :gutter="48">
+          <el-col :span="8">
+            <el-form-item label="复核人:" prop="operator">
+              <el-input
+                disabled
+                placeholder="请输入内容"
+                v-model="acceptanceForm.operator">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="复核时间：" prop="approvalTime">
+              <el-date-picker
+                size="small"
+                class="ml-10"
+                disabled
+                style="width: 100%;"
+                v-model="acceptanceForm.approvalTime"
+                type="date"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <el-form-item label="复核意见：" prop="comment">
+              <el-input
+                type="textarea"
+                :rows="4"
+                disabled
+                placeholder="请输入内容"
+                maxlength="200"
+                show-word-limit
+                v-model="acceptanceForm.comment">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
     <div class="bottom-btns" v-if="$route.query.mode !== 'check'">
       <el-button
         type="primary"
@@ -152,7 +197,7 @@ import TopBackTitle from "@/components/TopBackTitle/index.vue";
 import { calcTableHeight } from "@/mixins/calcTableHeight";
 import SyMixMap from "@/views/components/SyMixMap.vue";
 import { uploadFileData } from "@/api/system/upload";
-import { getV2Yh, postV2Yh, gettV2Record } from "@/api/dike/pestAnimalControl2";
+import { getV2Yh, postV2Yh, gettV2Record, getV2ApprovalComment } from "@/api/dike/pestAnimalControl2";
 import { getDictMapData } from "@/api/system/dict/data";
 import { mapGetters } from "vuex";
 
@@ -172,6 +217,16 @@ export default {
         nspectionLocation: '堤坡与戗台',
         inspectionContent: '是否坚实平整',
       }],
+      acceptanceForm: {
+        operator: '',
+        approvalTime: '',
+        comment: '',
+      },
+      acceptanceRules: {
+        operator: [{required: true}],
+        approvalTime: [{required: true}],
+        comment: [{required: true}],
+      },
       form: {
         images: [],
         createName: '',
@@ -257,12 +312,18 @@ export default {
         }
       })
       if (this.$route.query.id) {
-        const ApprovalComment = await getV2Yh(this.$route.query.id)
-        this.form.time[0] = ApprovalComment.data.startDate
-        this.form.time[1] = ApprovalComment.data.endDate
-        this.form.describe = ApprovalComment.data.content
+        const yh = await getV2Yh(this.$route.query.id)
+        this.form.time[0] = yh.data.startDate
+        this.form.time[1] = yh.data.endDate
+        this.form.describe = yh.data.content
         this.form.time = [...this.form.time]
-        this.form.images = ApprovalComment.data.doc.images
+        this.form.images = yh.data.doc.images
+      }
+      if (this.$route.query.status === '5') {
+        const ApprovalComment = await getV2ApprovalComment(this.$route.query.id)
+        this.acceptanceForm.operator = ApprovalComment.data[0].operator.name
+        this.acceptanceForm.approvalTime = ApprovalComment.data[0].approvalTime
+        this.acceptanceForm.comment = ApprovalComment.data[0].comment
       }
     },
     getDictLabelName(type, dictListName) {
diff --git a/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
index dad0240..4e8f088 100644
--- a/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
@@ -321,7 +321,7 @@ export default {
     handleCheckDetails(row, mode) {
       this.$router.push({
         path: "maintenanceDetails",
-        query: { id: row.id, recordId: row.recordId, defectId: row.problemId, mode: mode },
+        query: { id: row.id, recordId: row.recordId, defectId: row.problemId, status: row.status, mode: mode },
       });
     },
     getDictLabelName(type, dictListName) {
diff --git a/src/views/sluice/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue b/src/views/sluice/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
index d105872..8a05123 100644
--- a/src/views/sluice/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
@@ -30,7 +30,7 @@
               :disabled="$route.query.mode === 'check'"
               v-model="form.time"
               type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
@@ -107,7 +107,6 @@
             <el-select
               clearable
               size="small"
-              class="w-202 ml-10"
               :disabled="$route.query.mode === 'check'"
               v-model="scope.row.itemId"
               filterable
diff --git a/src/views/sluice/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue b/src/views/sluice/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue
index 65d9379..8fa453c 100644
--- a/src/views/sluice/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue
@@ -180,6 +180,51 @@
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="this.$route.query.status === '5'">
+        <div class="form-row-title">验收意见</div>
+        <el-form ref="form" :model="acceptanceForm" :rules="acceptanceRules" label-width="120px" label-position="right">
+          <el-row :gutter="48">
+            <el-col :span="8">
+              <el-form-item label="复核人:" prop="operator">
+                <el-input
+                  disabled
+                  placeholder="请输入内容"
+                  v-model="acceptanceForm.operator">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="复核时间：" prop="approvalTime">
+                <el-date-picker
+                  size="small"
+                  class="ml-10"
+                  disabled
+                  style="width: 100%;"
+                  v-model="acceptanceForm.approvalTime"
+                  type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <el-form-item label="复核意见：" prop="comment">
+                <el-input
+                  type="textarea"
+                  :rows="4"
+                  disabled
+                  placeholder="请输入内容"
+                  maxlength="200"
+                  show-word-limit
+                  v-model="acceptanceForm.comment">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
     </div>
     <div class="bottom-btns" v-if="$route.query.mode !== 'check'">
       <el-button
@@ -203,7 +248,7 @@ import TopBackTitle from "@/components/TopBackTitle/index.vue";
 import { calcTableHeight } from "@/mixins/calcTableHeight";
 import SyMixMap from "@/views/components/SyMixMap.vue";
 import { uploadFileData } from "@/api/system/upload";
-import { getV2Yh, postV2Yh, gettV2Record } from "@/api/sluice/patrolMaintenance";
+import { getV2Yh, postV2Yh, gettV2Record, getV2ApprovalComment } from "@/api/sluice/patrolMaintenance";
 import { getDictMapData } from "@/api/system/dict/data";
 import { mapGetters } from "vuex";
 
@@ -233,6 +278,16 @@ export default {
         nspectionLocation: '堤坡与戗台',
         inspectionContent: '是否坚实平整',
       }],
+      acceptanceForm: {
+        operator: '',
+        approvalTime: '',
+        comment: '',
+      },
+      acceptanceRules: {
+        operator: [{required: true}],
+        approvalTime: [{required: true}],
+        comment: [{required: true}],
+      },
       form: {
         images: [],
         createName: '',
@@ -320,13 +375,19 @@ export default {
         }
       })
       if (this.$route.query.id) {
-        const ApprovalComment = await getV2Yh(this.$route.query.id)
-        this.form.time[0] = ApprovalComment.data.startDate
-        this.form.time[1] = ApprovalComment.data.endDate
-        this.form.describe = ApprovalComment.data.content
+        const yh = await getV2Yh(this.$route.query.id)
+        this.form.time[0] = yh.data.startDate
+        this.form.time[1] = yh.data.endDate
+        this.form.describe = yh.data.content
         this.form.time = [...this.form.time]
-        this.form.images = ApprovalComment.data.doc.images
-        this.fileData = ApprovalComment.data.doc.docs
+        this.form.images = yh.data.doc.images
+        this.fileData = yh.data.doc.docs
+      }
+      if (this.$route.query.status === '5') {
+        const ApprovalComment = await getV2ApprovalComment(this.$route.query.id)
+        this.acceptanceForm.operator = ApprovalComment.data[0].operator.name
+        this.acceptanceForm.approvalTime = ApprovalComment.data[0].approvalTime
+        this.acceptanceForm.comment = ApprovalComment.data[0].comment
       }
     },
     getDictLabelName(type, dictListName) {
diff --git a/src/views/sluice/runManage/patrolMaintenance/defectList/index.vue b/src/views/sluice/runManage/patrolMaintenance/defectList/index.vue
index 4071115..cde6f2a 100644
--- a/src/views/sluice/runManage/patrolMaintenance/defectList/index.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/defectList/index.vue
@@ -89,7 +89,7 @@
           </div>
 
           <div class="search-item flex items-center">
-            <span class="search-label">巡查状态</span>
+            <span class="search-label">养护状态</span>
             <el-select
               clearable
               size="small"
@@ -176,6 +176,31 @@
               }}</span>
           </template>
         </el-table-column>
+
+        <el-table-column prop="status" align="center" label="巡查状态" width="100">
+          <template slot-scope="scope">
+            <span style="position: relative"
+                  :style="['3', '5', '6'].includes(scope.row.status) && {color: 'rgba(0,0,0,0.4)'}">
+                <div
+                  v-if="scope.row.status === '1'"
+                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #FFB20D"
+                ></div>
+                <div
+                  v-if="scope.row.status === '2'"
+                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #0EC885"
+                ></div>
+                <div
+                  v-if="scope.row.status === '4'"
+                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #3A89FE"
+                ></div>
+                <div
+                  v-if="['3', '5', '6'].includes(scope.row.status)"
+                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #A6A6A6"
+                ></div>
+                  {{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
+                </span>
+          </template>
+        </el-table-column>
         <el-table-column prop="dutyHolderName" align="center" label="责任人" />
         <el-table-column
           prop="startDate"
diff --git a/src/views/sluice/runManage/patrolMaintenance/maintenanceRecords/index.vue b/src/views/sluice/runManage/patrolMaintenance/maintenanceRecords/index.vue
index 3e5038e..56df550 100644
--- a/src/views/sluice/runManage/patrolMaintenance/maintenanceRecords/index.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/maintenanceRecords/index.vue
@@ -319,7 +319,7 @@ export default {
     handleCheckDetails(row, mode) {
       this.$router.push({
         path: "maintenanceDetails",
-        query: { id: row.id, recordId: row.recordId, defectId: row.problemId, mode: mode },
+        query: { id: row.id, recordId: row.recordId, defectId: row.problemId, status: row.status, mode: mode },
       });
     },
     getDictLabelName(type, dictListName) {