Merge branch 'dev' of https://git.yfzx.zjtys.com.cn/privateNetwork/inspection-pad-web into dev

pages/shaftInspection/model/customPopup.vue

@@ -66,7 +66,8 @@ export default {
   },
   methods: {
     // 打开弹窗
-    open() {
+    open(item) {
+      this.summary = item.conclusion;
       this.isOpen = true;
     },
     // 关闭弹窗

pages/shaftInspection/shaftInspectionNew.vue

@@ -88,10 +88,10 @@
             <text
               v-if="list[activeTab].conclusion"
               class="conclusion have"
-              @click="showPopup(index)"
+              @click="showPopup(list[activeTab])"
               >{{ list[activeTab].conclusion }}</text
             >
-            <text v-else class="conclusion" @click="showPopup(index)"
+            <text v-else class="conclusion" @click="showPopup(list[activeTab])"
               >请输入情况摘要</text
             >
           </view>
@@ -99,7 +99,8 @@
             <text class="form-label"
               ><text class="required">*</text>现场照片</text
             >
-            <CommonUpload v-model="list[activeTab].photos" :max-count="5"> </CommonUpload>
+            <CommonUpload v-model="list[activeTab].photos" :max-count="5">
+            </CommonUpload>
             <!-- <view class="photo-box">
               <view class="photo-container">
                 <view
@@ -173,7 +174,7 @@ import { sqlToData, dataToSql } from "./shared";
 export default {
   components: {
     customPopup,
-    CommonUpload
+    CommonUpload,
   },
   data() {
     return {
@@ -531,13 +532,13 @@ export default {
       const send = dataToSql(params);
       let api;
       if (this.uid) {
-        send.id = this.uid
-        api = inspectApi.update
+        send.id = this.uid;
+        api = inspectApi.update;
       } else {
-        api = inspectApi.save
+        api = inspectApi.save;
       }
       try {
-        let saveRes = await api(send)
+        let saveRes = await api(send);
         if (this.uid) {
           const index = this.all_data.findIndex(
             (element) => element.uid == this.uid
@@ -585,12 +586,13 @@ export default {
           icon: "success",
         });
         uni.navigateTo({
-          url: `/pages/shaftInspection/shaftInspectionList?uid=${ this.uid ? this.uid : saveRes.lastInsertId}&backValue=${this.backValue}`,
+          url: `/pages/shaftInspection/shaftInspectionList?uid=${
+            this.uid ? this.uid : saveRes.lastInsertId
+          }&backValue=${this.backValue}`,
         });
       } catch (err) {
-        console.log('err',err)
+        console.log("err", err);
       }
-      
     },
     // 检查所有Tab 的必填项是否填写完整
     isAllTabValid() {
@@ -610,8 +612,8 @@ export default {
           };
         }
         // 如果巡检结论为正常，则不对摘要和现场照片做必填校验
-        if(item.inspectionResult === 0) {
-          continue
+        if (item.inspectionResult === 0) {
+          continue;
         }
         // 2. 检查是否填写了情况摘要
         if (!item.conclusion || item.conclusion.trim() === "") {
@@ -665,9 +667,9 @@ export default {
       this.updateCurrentTabData();
     },
     // 显示弹窗
-    showPopup(index) {
-      this.currentIndex = index;
-      this.$refs.customPopup.open();
+    showPopup(item) {
+      console.log(item);
+      this.$refs.customPopup.open(item);
     },
     // 处理弹窗确认
     handlePopupConfirm(summary) {