Merge branch 'feature_20250904_调色机识别结果提示' into uat(dev)

src/components/uploadVNormal.vue

@@ -137,6 +137,16 @@ export default {
       type: String,
       default: '0',
     },
+    equipmentCode: {
+      // 当前任务对应的资产编号
+      type: String,
+      default: '',
+    },
+    inStore: {
+      // 调色机是否在店
+      type: String,
+      default: '否',
+    },
   },
   computed: {
     ...mapState({
@@ -357,6 +367,8 @@ export default {
         thirdCollectionId: thirdCollectionId,
         deviceCode: that.deviceCode, //设备编号
         putInCode: that.putInCode, //投放编号
+        equipmentCode: that.equipmentCode,
+        inStore: that.inStore,
       };
       // 0=企业微信，1=H5相机
       if (this.userInfo.photoMethod == '0') {
@@ -482,6 +494,8 @@ export default {
           url: res.data.url, //	String	当前拍摄图片的url
           businessId: res.data.businessId, // 当前拍摄图片id
           feedbackMessage: res.feedbackMessage,
+          equipmentCode: this.equipmentCode,
+          inStore: this.inStore,
         };
         // 0=企业微信，1=H5相机
         if (this.userInfo.photoMethod == '0') {

src/views/deviceWithin/addStoreVisit.vue

@@ -2901,11 +2901,13 @@
             :childIndex="childIndex"
             :deviceCode="deviceCode"
             :putInCode="putInCode"
+            :equipmentCode="equipmentCode"
             @newimgarr="newimgarr1"
             @typeshow="typeshow"
             :photoIdentifyType="photoIdentifyType"
             :pictureSource="pictureSource"
             :continuousShoot="continuousShoot"
+            :inStore="machineInTheStore"
             ref="uploadVNormal"></upload-img>
         </template>
       </van-cell>
@@ -3129,6 +3131,7 @@ export default {
       maxDate: new Date(),
       currentDate: new Date(1945, 0, 1),
       continuousShoot: '0',
+      machineInTheStore: '否',
     };
   },
   beforeRouteLeave(to, from, next) {
@@ -4273,8 +4276,30 @@ export default {
       this.childIndex6 = childIndex6;
       this.childIndex7 = childIndex7;
       this.pType = type;
+      this.collectionItemList;
+      debugger;
+      this.filterInStore(this.collectionItemList[index]);
       this.show = true;
     },
+    filterInStore(item) {
+      let optionList = item.collectionOptionList || [];
+      if (item.collectionName == '机器是否在店') {
+        if (optionList.length) {
+          for (let i = 0; i < optionList.length; i++) {
+            if (optionList[i].isCheck == 1) {
+              this.machineInTheStore = optionList[i].collectionOption;
+              return false;
+            }
+          }
+        }
+      } else {
+        if (optionList.length) {
+          for (let i = 0; i < optionList.length; i++) {
+            this.filterInStore(optionList[i]);
+          }
+        }
+      }
+    },
     newimgarr1(val) {
       //  店招识别只允许上传一张
       let photoIdentifyType = val.photoIdentifyType;