Merge branch 'feature_20250527_门店拜访任务列表访问速度优化' into uat(dev)

src/views/deviceOutside/suishenbangOutstoreVisit.vue

@@ -584,6 +584,10 @@ export default {
           locationRemark: this.address,
           locationAccuracy: this.locationAccuracy,
           photoIdentifyType: val.photoIdentifyType,
+          deviceCode: val.deviceCode,
+          putInCode: val.putInCode,
+          equipmentCode: val.equipmentCode,
+          inspectionType: val.inspectionType,
         },
       });
     },

src/views/deviceWithin/addStoreVisit.vue

@@ -2762,6 +2762,7 @@ export default {
       pictureSource: '0',
       stillDistribute: false,
       productTitles: [],
+      inspectionType: '',
     };
   },
   beforeRouteLeave(to, from, next) {
@@ -2780,7 +2781,11 @@ export default {
     this.visitId = this.$route.query.visitId + '';
     this.taskId = this.$route.query.taskId + '';
     this.storeId = this.$route.query.storeId + '';
-    this.isMust == this.$route.query.isMust + '';
+    this.isMust = this.$route.query.isMust + '';
+    this.deviceCode = this.$route.query.deviceCode;
+    this.putInCode = this.$route.query.putInCode;
+    this.equipmentCode = this.$route.query.equipmentCode;
+    this.inspectionType = this.$route.query.inspectionType;
     this.photoIdentifyType = this.$route.query.photoIdentifyType;
     this.storeGroupId = this.$route.query.storeGroupId + '';
     if (this.$route.query.photoType != null) {
@@ -2810,7 +2815,11 @@ export default {
     this.visitId = this.$route.query.visitId + '';
     this.taskId = this.$route.query.taskId + '';
     this.storeId = this.$route.query.storeId + '';
-    this.isMust == this.$route.query.isMust + '';
+    this.isMust = this.$route.query.isMust + '';
+    this.deviceCode = this.$route.query.deviceCode;
+    this.putInCode = this.$route.query.putInCode;
+    this.equipmentCode = this.$route.query.equipmentCode;
+    this.inspectionType = this.$route.query.inspectionType;
     this.photoIdentifyType = this.$route.query.photoIdentifyType;
     this.storeGroupId = this.$route.query.storeGroupId + '';
     if (this.$route.query.photoType != null) {
@@ -2954,7 +2963,6 @@ export default {
         }
       }
       if (val.type == 'E') {
-        debugger;
         this.collectionItemList[val.index].collectionOptionList[val.index1].collectionItems[
           val.index2
         ].collectionOptionList[val.index3].collectionItems[val.index4].collectionOptionList[
@@ -3275,8 +3283,8 @@ export default {
       console.log(params.id);
       getCollectionInfos(params).then((res) => {
         loading1.clear();
-        this.deviceCode = '';
-        this.putInCode = '';
+        // this.deviceCode = '';
+        // this.putInCode = '';
         // this.equipmentCode = res.data.equipmentCode;
         var checkUnManage = res.data;
         var collectionItemLists = res.data.collectionItemList;
@@ -3286,15 +3294,14 @@ export default {
           this.checked = false;
         }
         this.unManage = res.data.unManage;
-        this.deviceCode = res.data.deviceCode || ''; // 设备编号
-        this.putInCode = res.data.putInCode || ''; // 投放编号
+        // this.deviceCode = res.data.deviceCode || ''; // 设备编号
+        // this.putInCode = res.data.putInCode || ''; // 投放编号
         // 调色机类型：buy-购买类调色机，place-放置类调色机 不显示设备编号和投放编号
-        let inspectionType = res.data.inspectionType;
-        if (inspectionType == 'buy') {
-          this.equipmentCode = res.data.putInCode || '';
+        if (this.inspectionType == 'buy') {
+          this.equipmentCode = this.putInCode || '';
           this.showCode = true;
-        } else if (inspectionType == 'place') {
-          this.equipmentCode = res.data.equipmentCode || '';
+        } else if (this.inspectionType == 'place') {
+          this.equipmentCode = this.equipmentCode || '';
           this.showCode = false;
         }
         if (

src/views/deviceWithin/storeVisit.vue

@@ -729,6 +729,10 @@ export default {
             locationAccuracy: this.locationAccuracy,
             insert: this.insert,
             photoIdentifyType: val.photoIdentifyType,
+            deviceCode: val.deviceCode,
+            putInCode: val.putInCode,
+            equipmentCode: val.equipmentCode,
+            inspectionType: val.inspectionType,
           },
         });
       }