From a03e28c7fa9eb65207be70d5435c08df3f9b9d32 Mon Sep 17 00:00:00 2001
From: hejunjie <hejunjie@datametatech.com>
Date: Tue, 23 Jul 2024 18:43:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E8=BD=AE=E6=8F=90=E6=B5=8B=E5=9B=9E=E5=BD=92bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenancePlan/components/PlanDetail.vue |  7 ++---
 .../maintenance/maintenancePlan/index.vue     | 14 +++++-----
 .../maintenancePlanAccept/index.vue           | 11 +++++---
 .../maintenancePlanAudit/index.vue            |  8 +++---
 .../CreateMaintenanceRecord.vue               |  3 +++
 .../components/RecordDetail.vue               | 20 ++++++++++----
 .../maintenance/maintenanceRecords/index.vue  | 27 ++++++++++---------
 .../maintenancePlan/components/PlanDetail.vue |  2 ++
 .../maintenance/maintenancePlan/index.vue     |  4 +--
 .../maintenancePlanAccept/index.vue           | 11 +++++---
 .../maintenancePlanAudit/index.vue            |  9 ++++---
 .../CreateMaintenanceRecord.vue               |  3 +++
 .../components/RecordDetail.vue               | 24 ++++++++++++-----
 .../maintenance/maintenanceRecords/index.vue  | 13 ++++-----
 14 files changed, 100 insertions(+), 56 deletions(-)

diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue b/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
index 15252ab..e7e4791 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
@@ -122,6 +122,7 @@
           <el-form-item label="资金金额" prop="amount" class="ml-24">
             <el-input-number
               :disabled="!canEdit || type === 'audit'"
+              :controls="false"
               class="w-240"
               size="small"
               :min="0"
@@ -252,6 +253,7 @@
         <div class="form-row-title">验收意见</div>
         <el-timeline :reverse="true">
           <el-timeline-item
+            placement="top"
             v-for="(activity, index) in activities"
             :key="index"
             :timestamp="activity.approvalTime">
@@ -657,17 +659,16 @@ export default {
                   },
                 })
                   .then((res) => {
+                    console.log(1421241)
                     if (type === 'passed') {
                       this.$message.success("通过成功");
                     } else {
                       this.$message.success("驳回成功");
                     }
-                    if (reset) {
-                      this.reset();
-                    }
                     r();
                   })
                   .catch(() => {
+                    console.log(12312);
                     j();
                   });
               })
diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
index e49a691..a14a2c0 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
@@ -511,13 +511,13 @@ export default {
         ></PlanDetail>
       </div>
       <div class="drawer-footer p-16">
-        <el-button
-          size="mini"
-          type="primary"
-          v-hasPermi="['df:run:inspection:plan:item:edit']"
-          @click="handleEdit(currentRow)"
-          >编辑</el-button
-        >
+<!--        <el-button-->
+<!--          size="mini"-->
+<!--          type="primary"-->
+<!--          v-hasPermi="['df:run:inspection:plan:item:edit']"-->
+<!--          @click="handleEdit(currentRow)"-->
+<!--          >编辑</el-button-->
+<!--        >-->
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>
       </div>
     </el-drawer>
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
index 8a1572f..c3841b1 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
@@ -385,8 +385,8 @@ export default {
         >
           <el-radio-button label="">全部</el-radio-button>
           <el-radio-button label="1">待验收</el-radio-button>
-          <el-radio-button label="2">已驳回</el-radio-button>
-          <el-radio-button label="3">已验收</el-radio-button>
+          <el-radio-button label="2">已验收</el-radio-button>
+          <el-radio-button label="3">已驳回</el-radio-button>
         </el-radio-group>
       </div>
 
@@ -561,10 +561,10 @@ export default {
         ></RecordDetail>
       </div>
       <div class="drawer-footer p-16">
-        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+<!--        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
                    v-hasPermi="['df:run:inspection:accept:item:edit']"
           >编辑</el-button
-        >
+        >-->
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>
       </div>
     </el-drawer>
@@ -657,4 +657,7 @@ export default {
   padding-bottom: 72px;
   overflow: auto;
 }
+/deep/.el-button--text {
+  text-wrap: wrap;
+}
 </style>
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
index 39dc0d7..60c0fe2 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -374,7 +374,6 @@ export default {
         border
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="dikeName" align="center" label="堤防名称" >
           <template slot-scope="scope">
             <span>{{ scope.row.detail.dikeName }}</span>
@@ -559,10 +558,10 @@ export default {
         ></PlanDetail>
       </div>
       <div class="drawer-footer p-16">
-        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+<!--        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
                    v-hasPermi="['df:run:inspection:audit:item:edit']"
           >编辑</el-button
-        >
+        >-->
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>
       </div>
     </el-drawer>
@@ -655,4 +654,7 @@ export default {
   padding-bottom: 72px;
   overflow: auto;
 }
+/deep/.el-button--text {
+  text-wrap: wrap;
+}
 </style>
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
index 299c569..ff0a003 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
@@ -66,8 +66,11 @@ export default {
           } else {
             await postYhRecord(data)
           }
+          this.$message.success("提交成功");
           if (!reset) {
             this.$router.go(-1)
+          } else {
+            formRef.reset()
           }
         } catch (error) {
           console.log(error)
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
index dc29145..53dc5eb 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
@@ -127,6 +127,7 @@
           <el-form-item label="资金金额" prop="amount" class="ml-24">
             <el-input-number
               :disabled="!canEdit || type === 'audit'"
+              :controls="false"
               class="w-240"
               size="small"
               :min="0"
@@ -258,6 +259,7 @@
         <div class="form-row-title">验收意见</div>
         <el-timeline :reverse="true">
           <el-timeline-item
+            placement="top"
             v-for="(activity, index) in activities"
             :key="index"
             :timestamp="activity.approvalTime">
@@ -332,7 +334,7 @@ export default {
       activities: [],
       rules: {
         planId: [
-          { required: false, message: "请输入维养计划名称", trigger: "blur" },
+          { required: true, message: "请选择维养计划名称", trigger: "blur" },
         ],
         remark: [
           { required: true, message: "请输入维修描述", trigger: "blur" },
@@ -686,13 +688,21 @@ export default {
       });
     },
     reset() {
-      this.formData = {};
-      this.$refs.formRef.resetFields();
-      if (this.$refs.subFormRef) {
-        this.$refs.subFormRef.forEach((item) => {
+      this.$refs.ruleForm.resetFields();
+      if (this.$refs.supplementFormRef) {
+        this.$refs.supplementFormRef.forEach((item) => {
           item.resetFields();
         });
       }
+      this.filesList1 = [];
+      this.filesList = [];
+      this.ledgerList = [];
+      this.formData.supplements = [
+        {
+          supplement: "",
+          amount: 0,
+        },
+      ];
     },
   },
 };
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
index ced8a16..5bbb51d 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
@@ -414,30 +414,33 @@ export default {
             <span>{{ getDikeTypeName(scope.row.dikeType) }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="维养计划名称" >
+        <el-table-column prop="name" align="center" label="维养计划名称">
           <template slot-scope="scope">
-            <span>{{ scope.row.plan.name }}</span>
+            <span>{{ scope.row.plan ? scope.row.plan.name : '' }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="维养类型" >
+        <el-table-column align="center" label="维养类型">
           <template slot-scope="scope">
-            <span>{{ getTypeName(scope.row.plan.type) }}</span>
+            <span>{{ getTypeName(scope.row.plan ? scope.row.plan.type : '') }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="完成维养时间" >
+        <el-table-column align="center" label="完成维养时间">
           <template slot-scope="scope">
-            <span>{{scope.row.plan.endDate}}</span>
+            <span>{{ scope.row.plan ? scope.row.plan.endDate : '' }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="维养单位" >
+        <el-table-column align="center" label="维养单位">
           <template slot-scope="scope">
             <span>{{ scope.row.plan && scope.row.plan.engineeringUnit }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="维养负责人" >
+        <el-table-column align="center" label="维养负责人">
           <template slot-scope="scope">
-            <span>{{ scope.row.plan.responsiblePerson &&
-            scope.row.plan.responsiblePerson.name }}</span>
+            <span>{{
+                scope.row.plan &&
+                scope.row.plan.responsiblePerson &&
+                scope.row.plan.responsiblePerson.name
+              }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="supplements" align="center" label="资金来源/万元" >
@@ -562,10 +565,10 @@ export default {
         ></RecordDetail>
       </div>
       <div class="drawer-footer p-16">
-        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+<!--        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
                    v-hasPermi="['df:run:inspection:record:item:edit']"
         >编辑</el-button
-        >
+        >-->
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>
       </div>
     </el-drawer>
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue b/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
index 6b70ab4..5ab4c4b 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
@@ -122,6 +122,7 @@
           <el-form-item label="资金金额" prop="amount" class="ml-24">
             <el-input-number
               :disabled="!canEdit || type === 'audit'"
+              :controls="false"
               class="w-240"
               size="small"
               :min="0"
@@ -252,6 +253,7 @@
         <div class="form-row-title">验收意见</div>
         <el-timeline :reverse="true">
           <el-timeline-item
+            placement="top"
             v-for="(activity, index) in activities"
             :key="index"
             :timestamp="activity.approvalTime">
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
index ea75c1d..f8d87c3 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
@@ -511,10 +511,10 @@ export default {
         ></PlanDetail>
       </div>
       <div class="drawer-footer p-16">
-        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+<!--        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
                    v-hasPermi="['sz:run:inspection:plan:item:edit']"
           >编辑</el-button
-        >
+        >-->
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>
       </div>
     </el-drawer>
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
index 5f3e40c..4e80699 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
@@ -378,8 +378,8 @@ export default {
         >
           <el-radio-button label="">全部</el-radio-button>
           <el-radio-button label="1">待验收</el-radio-button>
-          <el-radio-button label="2">已驳回</el-radio-button>
-          <el-radio-button label="3">已验收</el-radio-button>
+          <el-radio-button label="2">已验收</el-radio-button>
+          <el-radio-button label="3">已驳回</el-radio-button>
         </el-radio-group>
       </div>
 
@@ -554,10 +554,10 @@ export default {
         ></RecordDetail>
       </div>
       <div class="drawer-footer p-16">
-        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+<!--        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
                    v-hasPermi="['sz:run:inspection:accept:item:edit']"
           >编辑</el-button
-        >
+        >-->
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>
       </div>
     </el-drawer>
@@ -650,4 +650,7 @@ export default {
   padding-bottom: 72px;
   overflow: auto;
 }
+/deep/.el-button--text {
+  text-wrap: wrap;
+}
 </style>
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
index 58e240e..38c90e4 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -365,7 +365,6 @@ export default {
         border
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="wagaName" align="center" label="水闸名称" >
           <template slot-scope="scope">
             <span>{{ scope.row.detail.wagaName }}</span>
@@ -420,6 +419,7 @@ export default {
             <el-button
               type="text"
               size="small"
+
               v-for="item in getFileName(scope.row.detail.doc)"
               @click="handlePreview(item.file)"
             >
@@ -550,10 +550,10 @@ export default {
         ></PlanDetail>
       </div>
       <div class="drawer-footer p-16">
-        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+<!--        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
                    v-hasPermi="['sz:run:inspection:audit:item:edit']"
           >编辑</el-button
-        >
+        >-->
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>
       </div>
     </el-drawer>
@@ -646,4 +646,7 @@ export default {
   padding-bottom: 72px;
   overflow: auto;
 }
+/deep/.el-button--text {
+  text-wrap: wrap;
+}
 </style>
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
index b266129..174e250 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
@@ -66,8 +66,11 @@ export default {
           } else {
             await postRunSzYhRecord(data)
           }
+          this.$message.success("提交成功");
           if (!reset) {
             this.$router.go(-1)
+          } else {
+            formRef.reset()
           }
         } catch (error) {
           console.log(error)
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
index 28f62cd..44fafbb 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
@@ -127,6 +127,7 @@
           <el-form-item label="资金金额" prop="amount" class="ml-24">
             <el-input-number
               :disabled="!canEdit || type === 'audit'"
+              :controls="false"
               class="w-240"
               size="small"
               :min="0"
@@ -260,6 +261,7 @@
         <div class="form-row-title">验收意见</div>
         <el-timeline :reverse="true">
           <el-timeline-item
+            placement="top"
             v-for="(activity, index) in activities"
             :key="index"
             :timestamp="activity.approvalTime">
@@ -331,7 +333,7 @@ export default {
       activities: [],
       rules: {
         planId: [
-          { required: false, message: "请输入维养计划名称", trigger: "blur" },
+          { required: true, message: "请选择维养计划名称", trigger: "blur" },
         ],
         remark: [
           { required: true, message: "请输入维修描述", trigger: "blur" },
@@ -401,7 +403,7 @@ export default {
     // 验证维养台账
     validatorProjectList(rule, value, callback) {
       if (this.filesList.length === 0) {
-        callback(new Error("请上传计划方案"));
+        callback(new Error("请上传维养台账"));
       } else {
         callback();
       }
@@ -410,7 +412,7 @@ export default {
     // 验证维养图片
     validatorProjectListImg(rule, value, callback) {
       if (this.ledgerList.length === 0) {
-        callback(new Error("请上传计划方案"));
+        callback(new Error("请上传维养图片"));
       } else {
         callback();
       }
@@ -685,13 +687,21 @@ export default {
       });
     },
     reset() {
-      this.formData = {};
-      this.$refs.formRef.resetFields();
-      if (this.$refs.subFormRef) {
-        this.$refs.subFormRef.forEach((item) => {
+      this.$refs.ruleForm.resetFields();
+      if (this.$refs.supplementFormRef) {
+        this.$refs.supplementFormRef.forEach((item) => {
           item.resetFields();
         });
       }
+      this.filesList1 = [];
+      this.filesList = [];
+      this.ledgerList = [];
+      this.formData.supplements = [
+        {
+          supplement: "",
+          amount: 0,
+        },
+      ];
     },
   },
 };
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
index 512c182..48d4953 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
@@ -143,7 +143,7 @@ export default {
         .then(() => {
           console.log("删除");
           const ids = this.tableCheckData.map((item) => item.id);
-          delRunSzYhRecord(ids.join(",")).then((res) => {
+          delRunSzYhRecord({id: ids.join(",")}).then((res) => {
             if (res) {
               this.$message.success("删除成功");
               this.getTableData();
@@ -411,17 +411,17 @@ export default {
         </el-table-column>
         <el-table-column prop="name" align="center" label="维养计划名称">
           <template slot-scope="scope">
-            <span>{{ scope.row.plan.name }}</span>
+            <span>{{ scope.row.plan ? scope.row.plan.name : '' }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="维养类型">
           <template slot-scope="scope">
-            <span>{{ getTypeName(scope.row.plan.type) }}</span>
+            <span>{{ getTypeName(scope.row.plan ? scope.row.plan.type : '') }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="完成维养时间">
           <template slot-scope="scope">
-            <span>{{ scope.row.plan.endDate }}</span>
+            <span>{{ scope.row.plan ? scope.row.plan.endDate : '' }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="维养单位">
@@ -432,6 +432,7 @@ export default {
         <el-table-column align="center" label="维养负责人">
           <template slot-scope="scope">
             <span>{{
+                scope.row.plan &&
                 scope.row.plan.responsiblePerson &&
                 scope.row.plan.responsiblePerson.name
               }}</span>
@@ -563,11 +564,11 @@ export default {
         ></RecordDetail>
       </div>
       <div class="drawer-footer p-16">
-        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+<!--        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
                    v-hasPermi="['sz:run:inspection:record:item:edit']"
         >编辑
         </el-button
-        >
+        >-->
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>
       </div>
     </el-drawer>