fix:提交

pages/inspectionContent/components/dialog.vue

@@ -10,7 +10,7 @@
           >{{ item }}</view
         >
       </view><view class="row-item bottom-row">
-        <view v-if="!startDialogData.isList" class="button btn" @click="clearSignature">返回巡检列表</view>
+        <view v-if="!startDialogData.isList" class="button btn" @click="backList">返回巡检列表</view>
         <view class="button" @click="confirmSignature">我已到达</view>
       </view>
 
@@ -39,6 +39,9 @@ export default {
 
   mounted() {},
   methods: {
+    backList() {
+      this.$emit("backList", "");
+    },
     confirmSignature() {
       this.$emit("confirm", "");
     },

pages/inspectionContent/inspectionContentList.vue

@@ -40,7 +40,7 @@
         </view>
       </view>
     </view>
-    <view class="box">
+    <view class="box" v-if="!isSign" >
       <view class="bar">
         <view class="title"> 巡检进度 </view>
         <view class="dai">

pages/inspectionContent/inspectionContentNew.vue

@@ -140,6 +140,7 @@
       ref="startDialog"
       :startDialogData="startDialogData"
       @confirm="handleStartDialog"
+      @backList="back"
     ></startDialog>
   </view>
 </template>
@@ -215,6 +216,7 @@ export default {
       name: "",
       jfType: "0",
       value: "1",
+      paramsObjFirst: {},
     };
   },
   computed: {
@@ -240,12 +242,13 @@ export default {
     this.inspectionCode = options.inspectionCode;
     this.backValue = options.backValue || "";
     this.tabs =
-      this.jfType === "2" || this.jfType === "3" ? tabsInfo2 : tabsInfo1;
+      this.jfType === "2" || this.jfType === "3" ? this.deepClone(tabsInfo2) : this.deepClone(tabsInfo1);
     console.log("机房查看options", options);
     if (options.uid) {
       this.getDetails(options.uid);
     } else {
       this.init();
+      this.paramsObjFirst = this.getAllChildFormData();
     }
   },
   watch: {},
@@ -255,6 +258,7 @@ export default {
   methods: {
     // 初始化
     init() {
+      console.log("查看tabs", this.tabs);
       return new Promise((resolve, reject) => {
         // 判断是否有回显数据
         // 基础数据
@@ -285,8 +289,16 @@ export default {
       getInspectionDetails(uid)
         .then((res) => {
           const detailsInfo = res;
+          console.log("查看tabs", this.tabs);
           this.list = detailsInfo.originData[this.value - 1].details;
           console.log("查看list", this.list);
+          this.tabs.forEach((item) => {
+            if (this.list[item.value] && this.list[item.value].status !== undefined) {
+              item.status = this.list[item.value].status;
+            }
+          });
+          console.log("查看tabs2", this.tabs);
+
           // this.inspectionResult = list[0].inspectionResult;
           this.detailsInfo = detailsInfo;
           console.log("detailsInfo", detailsInfo);
@@ -316,7 +328,6 @@ export default {
     getParams(isSubmit) {
       if (this.uid) {
         let posItem = this.detailsInfo.originData[this.value - 1];
-        this.listData = this.detailsInfo.originData;
         let paramsObj = this.getAllChildFormData(); //获取所有数据
         console.log("获取数据", paramsObj);
         posItem.details = paramsObj;
@@ -342,6 +353,7 @@ export default {
         // this.detailsInfo.isException = equalTwoCount; //异常数量
         this.detailsInfo.submitTime = moment().format("yyyy-MM-DD"); // 记录提交时间
         this.detailsInfo.submitMonth = moment().format("yyyy-MM"); // 记录提交月份
+        this.listData = this.detailsInfo.originData;
         return this.detailsInfo;
       } else {
         let baseInfo = this.baseInfo;
@@ -352,14 +364,13 @@ export default {
             value: item.dictValue,
             jfType: item.jfType,
             isVaild: false, // 校验通过
-            details: paramsObj,
+            details: this.paramsObjFirst,
             status: item.status,
             refName: `TabContentItem_${index}`,
             statusLable: item.statusLable,
           };
         });
         let tabList = this.deepClone(dataObj);
-        this.listData = this.deepClone(tabList);
         let posItem = tabList[this.value - 1];
         posItem.details = paramsObj;
         posItem.isSubmit = isSubmit;
@@ -382,6 +393,7 @@ export default {
           originData: tabList, //所有大楼和楼层的数据
         };
         console.log("getParams,data", data);
+        this.listData = data.originData;
         return data;
       }
     },
@@ -520,22 +532,19 @@ export default {
           title: "暂存成功",
           icon: "none",
         });
-      //   uni.navigateTo({
-      //   url: `/pages/inspectionContent/inspectionContentList?uid=${params.uid}&backValue=${this.backValue}`,
-      // });
       }
-      uni.navigateTo({
-        url: `/pages/inspectionContent/inspectionContentList?uid=${params.uid}&backValue=${this.backValue}`,
-      });
     },
     startDialog() {
+      let allIsSubmitOne = this.listData.every((item) => item.isSubmit === 1);
+      console.log("是否全部完成", allIsSubmitOne);
+      console.log("this.listData", this.listData);
       let item = this.findTargetObject(this.listData);
       console.log("即将操作的机房", item);
 
       this.name = item && item.name ? item.name : "";
       this.jfType = item && item.name ? item.jfType : "";
       this.value = item && item.name ? item.value : "";
-      if (item && item.name) {
+      if (!allIsSubmitOne) {
         this.startDialogData.text = [
           `当前机房已巡检完毕，`,
           `请到“${this.name}”`,
@@ -550,7 +559,7 @@ export default {
     },
     // 处理弹窗确认
     handleStartDialog() {
-      console.log("跳转前",this.uid)
+      console.log("跳转前", this.uid);
       uni.navigateTo({
         url: `/pages/inspectionContent/inspectionContentNew?value=${this.value}&inspectionCode=${this.inspectionCode}&jfType=${this.jfType}&location=${this.name}&uid=${this.uid}&backValue=${this.backValue}`,
       });
@@ -670,7 +679,7 @@ export default {
       }
     }, // 设置巡检结论
     setInspectionResult(value) {
-      console.log("设置巡检结论",value)
+      console.log("设置巡检结论", value);
       this.inspectionResult = value;
       this.list[this.activeTab].inspectionResult = value; // 更新当前 Tab 的数据
     },