Merge branch 'feature_20250722_门店建议订单' into uat(dev)

# Conflicts:
#	src/views/deviceWithin/addStoreVisit.vue

src/views/deviceWithin/addStoreVisit.vue

@@ -3054,7 +3054,7 @@ export default {
     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.photoIdentifyType = this.$route.query.photoIdentifyType;
     this.storeGroupId = this.$route.query.storeGroupId + '';
     if (this.$route.query.photoType != null) {
       this.indexselect = 0;
@@ -3091,7 +3091,7 @@ export default {
     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.photoIdentifyType = this.$route.query.photoIdentifyType;
     this.storeGroupId = this.$route.query.storeGroupId + '';
     if (this.$route.query.photoType != null) {
       this.indexselect = 0;
@@ -3570,7 +3570,8 @@ export default {
       console.log(params.id);
       getCollectionInfos(params).then((res) => {
         loading1.clear();
-        this.productTitles = res.data.productTitles || null; //产品类型表头数据
+        this.photoIdentifyType = res.data.photoIdentifyType || null;
+        this.productTitles = res.data.productTitles; //产品类型表头数据
         var checkUnManage = res.data;
         var collectionItemLists = res.data.collectionItemList;
         if (checkUnManage.checkUnManage != null && checkUnManage.checkUnManage != 'N') {