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

@@ -187,7 +187,7 @@
             <el-button
               type="text"
               size="small"
-              :disabled="!scope.row.status === '1'"
+              :disabled="scope.row.status !== '1'"
               @click="handleEditDetails(scope.row, true)"
             >编辑</el-button
             >

src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue

@@ -150,50 +150,42 @@
       </div>
       <el-table :height="tableHeight" :data="tableData" border>
         <el-table-column prop="id" align="center" label="单号" />
-        <el-table-column prop="name" align="center" label="巡查名称" />
+        <el-table-column prop="detail.name" align="center" label="巡查名称" />
-        <el-table-column prop="type" align="center" label="巡查类型">
+        <el-table-column align="center" label="巡查类型">
           <template slot-scope="scope">
             <span>{{
-              getDictLabelName(scope.row.type, "maintenanceType")
+              getDictLabelName(scope.row.detail.type, "maintenanceType")
             }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="category" align="center" label="巡查类别">
           <template slot-scope="scope">
             <span>{{
-              getDictLabelName(scope.row.category, "maintenanceCategory")
+              getDictLabelName(scope.row.detail.category || '', "maintenanceCategory")
             }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="status" align="center" label="巡查状态">
           <template slot-scope="scope">
             <span>{{
-              getDictLabelName(scope.row.status, "maintenanceStatus")
+              getDictLabelName(scope.row.detail.status || '', "maintenanceStatus")
             }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column prop="level" align="center" label="问题等级">
+        <el-table-column align="center" label="问题等级">
           <template slot-scope="scope">
             <span>{{
-              getDictLabelName(scope.row.level, "maintenanceLevel")
+              getDictLabelName(scope.row.detail.problemLevel || '', "maintenanceLevel")
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="dutyHolderName" align="center" label="责任人" />
+        <el-table-column prop="detail.dutyHolderName" align="center" label="责任人" />
         <el-table-column
-          prop="startDate"
+          prop="submitTime"
           align="center"
-          label="巡查开始时间/结束时间"
+          label="验收时间"
-        >
+        />
-          <template slot-scope="scope">
-            <span
-              >{{ scope.row.startDate || "-" }}/{{
-                scope.row.endDate || "-"
-              }}</span
-            >
-          </template>
-        </el-table-column>
 
         <el-table-column
           prop="opera"
@@ -212,6 +204,7 @@
             <el-button
               type="text"
               size="small"
+              :disabled="scope.row.detail.status === '5'"
               @click="handleCheckDetails(scope.row, 'edit')"
               >编辑</el-button
             >

src/views/dike/runManage/patrolMaintenance/componentsDetails/acceptanceDetails.vue

@@ -137,8 +137,8 @@
       </el-table>
       <div class="form-row-title">验收意见</div>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="right">
-        <el-row gutter="48">
+        <el-row :gutter="48">
-          <el-col span="8">
+          <el-col :span="8">
             <el-form-item label="复核人:" prop="operator">
               <el-input
                 disabled
@@ -147,7 +147,7 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col span="8">
+          <el-col :span="8">
             <el-form-item label="复核时间：" prop="approvalTime">
               <el-date-picker
                 size="small"
@@ -163,7 +163,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col span="16">
+          <el-col :span="16">
             <el-form-item label="复核意见：" prop="comment">
               <el-input
                 type="textarea"
@@ -281,7 +281,6 @@ export default {
       this.form.type = checking.data.type
       this.form.startDate = checking.data.startDate
       this.form.endDate = checking.data.endDate
-      console.log(checking)
       checking.data.problems.forEach(item => {
         if(item.id === this.$route.query.defectId) {
           this.form.content = item.content
@@ -310,11 +309,9 @@ export default {
       this.form.time = [...this.form.time]
       this.form.images = Yh.data.doc.images
       this.fileData = Yh.data.doc.docs
-      if (this.$route.query.id) {
+      const ApprovalComment = await getV2ApprovalComment(this.$route.query.formId)
-        const ApprovalComment = await getV2ApprovalComment(this.$route.query.id)
+      this.form.approvalTime = ApprovalComment.data[0].approvalTime
-        this.form.approvalTime = ApprovalComment.data.approvalTime
+      this.form.comment = ApprovalComment.data[0].comment
-        this.form.comment = ApprovalComment.data.comment
-      }
     },
 
     getDictLabelName(type, dictListName) {

src/views/dike/runManage/patrolMaintenance/componentsDetails/defectDetails.vue

@@ -131,8 +131,6 @@ export default {
   methods: {
     async initData() {
       const checking = await gettV2Record(this.$route.query.recordId)
-      console.log('checking',checking)
-      console.log('checking',this.userName)
       this.form.createName = checking.data.createName
       this.form.userName = this.userName
       this.form.userId = this.userId
@@ -148,7 +146,6 @@ export default {
       this.form.type = checking.data.type
       this.form.startDate = checking.data.startDate
       this.form.endDate = checking.data.endDate
-      console.log(checking)
       checking.data.problems.forEach(item => {
         if(item.id === this.$route.query.defectId) {
           this.form.content = item.content
@@ -192,13 +189,12 @@ export default {
         content: this.form.describe,
         dutyHolderId: this.form.userId,
         dutyHolderName: this.form.userName,
-        issueLevel: this.form.problemLevel,
+        problemLevel: this.form.problemLevel,
         problemId: this.$route.query.defectId,
         recordId: this.$route.query.recordId,
         startDate: this.form.time && this.form.time.length > 1 ? this.form.time[0] : '',
         endDate: this.form.time && this.form.time.length > 1 ? this.form.time[1] : '',
       }
-      console.log(data)
       if (this.$route.query.id) {
         data.id = this.$route.query.id
       }

src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue

@@ -424,7 +424,7 @@ export default {
         poistion: "",
         content: "",
         problemImages: [],
-        status: "4",
+        status: "0",
       });
     },
     getDictLabelName(type, dictListName) {
@@ -478,7 +478,6 @@ export default {
       if (this.$route.query.id) {
         data.id = this.$route.query.id;
       }
-      console.log(data);
       postV2Record(data, commit).then((res) => {
         this.$message.success("保存成功");
         this.$router.go(-1);

src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue

@@ -298,7 +298,6 @@ export default {
       })
       if (this.$route.query.id) {
         const ApprovalComment = await getV2Yh(this.$route.query.id)
-        console.log(ApprovalComment)
         this.form.time[0] = ApprovalComment.data.startDate
         this.form.time[1] = ApprovalComment.data.endDate
         this.form.describe = ApprovalComment.data.content
@@ -382,11 +381,17 @@ export default {
     handleSave(commit) {
       const data = {
         name: this.form.checkingName,
+        dikeCode: this.form.dikeCode,
+        dikeType: this.form.dikeType,
+        dikeName: this.form.dikeName,
+        status: this.form.status,
+        type: this.form.type,
+        category: this.form.category,
         checkingId: this.form.checkingId,
         content: this.form.describe,
         dutyHolderId: this.form.userId,
         dutyHolderName: this.form.userName,
-        issueLevel: this.form.problemLevel,
+        problemLevel: this.form.problemLevel,
         problemId: this.$route.query.defectId,
         recordId: this.$route.query.recordId,
         doc: {
@@ -396,7 +401,6 @@ export default {
         startDate: this.form.time && this.form.time.length > 1 ? this.form.time[0] : '',
         endDate: this.form.time && this.form.time.length > 1 ? this.form.time[1] : '',
       }
-      console.log(data)
       if (this.$route.query.id) {
         data.id = this.$route.query.id
       }

src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue

@@ -188,7 +188,7 @@
         <el-table-column
           prop="startDate"
           align="center"
-          label="巡查开始时间/结束时间"
+          label="养护时间"
         >
           <template slot-scope="scope">
             <span
@@ -216,6 +216,7 @@
             <el-button
               type="text"
               size="small"
+              :disabled="scope.row.status !== '4'"
               @click="handleCheckDetails(scope.row, 'edit')"
             >编辑</el-button
             >