feature_20260108_陈列奖励案任务合并

src/components/deleteUploadImgTaskPhoto.vue

@@ -3,7 +3,18 @@
     <van-row gutter="10">
       <van-col span="6" style="background: #f5f5f5">
         <div class="addImg">
-          <uploadVNormalTaskPhoto />
+          <uploadVNormalTaskPhoto
+            :imgArr="imgs"
+            :shouws="true"
+            :storeGroupId="storeGroupId"
+            :taskList="taskIds"
+            :collectionItemId="collectionItemId"
+            :visitModel="1 + ''"
+            :visitsId="visitsId"
+            :putInCode="putInCode"
+            :photoIdentifyType="photoIdentifyType"
+            @newimgarr="newimgarr"
+            ref="uploadVNormal" />
         </div>
       </van-col>
       <van-col span="6" v-for="(urls, index) in imgs" :key="urls.id">
@@ -40,7 +51,7 @@
 
 <script>
 import { ImagePreview } from 'vant';
-import { removePhoto } from '@/api/index';
+import { removePhotoBatch } from '@/api/index';
 import uploadVNormalTaskPhoto from '@/components/uploadVNormalTaskPhoto';
 export default {
   name: 'deleteUploadImgTaskPhoto',
@@ -61,6 +72,26 @@ export default {
       // edit 编辑
       type: String,
     },
+    storeGroupId: {
+      type: String,
+    },
+    taskIds: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    collectionItemId: {
+      type: [String, Number],
+    },
+    visitsId: {
+      type: String,
+      default: '',
+    },
+    putInCode: {
+      type: String,
+      default: '',
+    },
   },
   watch: {
     imgs: {
@@ -76,7 +107,7 @@ export default {
   },
   methods: {
     deleteImg(index, collectionItemId) {
-      removePhoto({ fileId: collectionItemId }).then((res) => {
+      removePhotoBatch({ fileId: collectionItemId }).then((res) => {
         if (res.code == 200) {
           this.$toast('删除成功！');
           this.imgs.splice(index, 1);
@@ -98,6 +129,9 @@ export default {
         },
       });
     },
+    newimgarr() {
+      this.$emit('upDataDetail');
+    },
   },
 };
 </script>

src/components/uploadVNormalTaskPhoto.vue

@@ -9,7 +9,6 @@
     <H5Camera
       @getImg="getImg"
       ref="H5Camera"
-      :objectType="objectType"
       :capture="pictureSource == '1' ? '' : 'camera'"
       v-else />
     <div id="allmap"></div>
@@ -34,7 +33,7 @@
 </template>
 
 <script>
-import { addstorePhoto, addVisitsPosition, addPhotoToDB } from '@/api/index';
+import { addPhotoBatch, addVisitsPosition, addPhotoToDB } from '@/api/index';
 import imageAIVerifyErr from './imageAIVerifyErr';
 import imageWhiteStore from './imageWhiteStore';
 import H5Camera from '@/components/H5Camera';
@@ -47,65 +46,21 @@ export default {
   name: 'uploadImg',
   components: { imageAIVerifyErr, H5Camera, imageWhiteStore },
   props: {
-    uploadid: {
-      type: String,
-      default: '',
-    },
     storeGroupId: {
       type: String,
       default: '',
     },
-    parentCollectionId: {
-      type: String,
-      default: '',
-    },
-    secondCollectionId: {
-      type: [String, Number],
-      default: '',
-    },
-    firstCollectionId: {
-      type: String,
-      default: '',
-    },
-    fourthCollectionId: {
-      type: String,
-      default: '',
-    },
-    thirdCollectionId: {
-      type: String,
-      default: '',
-    },
     visitsId: {
       type: String,
       default: '',
     },
-    taskId: {
-      type: String,
-      default: '',
-    },
-    collectionId: {
-      type: String,
-      default: '',
-    },
-    objectType: {
-      type: String,
-      default: '',
-    },
-    type: {
-      type: Number,
-      default: 1,
-    },
-    imgArr: {
+    taskList: {
       type: Array,
       default() {
         return [];
       },
     },
-    visitModel: {
-      type: String,
-      default: '1',
-    },
-    deviceCode: {
+    objectType: {
       type: String,
       default: '',
     },
@@ -113,31 +68,73 @@ export default {
       type: String,
       default: '',
     },
-    pictureSource: {
-      // 是否允许从相册选择图片 1:允许；0:不允许
-      type: String,
-      default: '0',
-    },
     photoIdentifyType: {
       // 图匠识别目的(1:店招内容识别(不能连拍和多选),3:调色机识别(不能连拍和多选),6:陈列SKU图片识别(不需要图匠实时识别))
       type: String,
       default: '',
     },
-    continuousShoot: {
-      // 是否允许连拍/相册多选 1:允许；0:不允许
-      type: String,
-      default: '0',
-    },
-    equipmentCode: {
-      // 当前任务对应的资产编号
-      type: String,
-      default: '',
-    },
-    inStore: {
-      // 调色机是否在店
-      type: String,
-      default: '否',
-    },
+    // uploadid: {
+    //   type: String,
+    //   default: '',
+    // },
+    // secondCollectionId: {
+    //   type: [String, Number],
+    //   default: '',
+    // },
+    // firstCollectionId: {
+    //   type: String,
+    //   default: '',
+    // },
+    // fourthCollectionId: {
+    //   type: String,
+    //   default: '',
+    // },
+    // thirdCollectionId: {
+    //   type: String,
+    //   default: '',
+    // },
+    // type: {
+    //   type: Number,
+    //   default: 1,
+    // },
+    // imgArr: {
+    //   type: Array,
+    //   default() {
+    //     return [];
+    //   },
+    // },
+    // visitModel: {
+    //   type: String,
+    //   default: '1',
+    // },
+    // deviceCode: {
+    //   type: String,
+    //   default: '',
+    // },
+    // putInCode: {
+    //   type: String,
+    //   default: '',
+    // },
+    // pictureSource: {
+    //   // 是否允许从相册选择图片 1:允许；0:不允许
+    //   type: String,
+    //   default: '0',
+    // },
+    // continuousShoot: {
+    //   // 是否允许连拍/相册多选 1:允许；0:不允许
+    //   type: String,
+    //   default: '0',
+    // },
+    // equipmentCode: {
+    //   // 当前任务对应的资产编号
+    //   type: String,
+    //   default: '',
+    // },
+    // inStore: {
+    //   // 调色机是否在店
+    //   type: String,
+    //   default: '否',
+    // },
   },
   computed: {
     ...mapState({
@@ -198,10 +195,6 @@ export default {
       });
       markers.setGeometries([]);
 
-      if (this.objectType == '' || this.objectType == null) {
-        this.$toast('请选择类型！');
-        return;
-      }
       let url = window.location.href;
       let that = this;
       let wx = this.wx;
@@ -315,46 +308,35 @@ export default {
     uploadImagev() {
       this.close();
       var that = this;
-      var parentCollectionId = null;
-      if (that.parentCollectionId != null && that.parentCollectionId != 'null') {
-        parentCollectionId = that.parentCollectionId;
-      }
-      var secondCollectionId = null;
-      if (that.secondCollectionId != null && that.secondCollectionId != 'null') {
-        secondCollectionId = that.secondCollectionId;
-      }
-      var firstCollectionId = null;
-      if (that.firstCollectionId != null && that.firstCollectionId != 'null') {
-        firstCollectionId = that.firstCollectionId;
-      }
-      var fourthCollectionId = null;
-      if (that.fourthCollectionId != null && that.fourthCollectionId != 'null') {
-        fourthCollectionId = that.fourthCollectionId;
-      }
-      var thirdCollectionId = null;
-      if (that.thirdCollectionId != null && that.thirdCollectionId != 'null') {
-        thirdCollectionId = that.thirdCollectionId;
-      }
       var form = {
-        mediaIds: [],
-        fileUrl: '',
-        collectionItemId: that.collectionId,
-        objectType: that.objectType,
-        storeGroupId: that.storeGroupId,
-        taskId: that.taskId,
-        visitsId: localStorage.getItem('visitId'),
-        visitModel: that.visitModel,
-        visitSource: '1',
-        locationRemark: that.addressesRemark,
-        parentCollectionId: parentCollectionId,
-        secondCollectionId: secondCollectionId,
-        firstCollectionId: firstCollectionId,
-        fourthCollectionId: fourthCollectionId,
-        thirdCollectionId: thirdCollectionId,
-        deviceCode: that.deviceCode, //设备编号
+        // mediaIds: [],
+        // fileUrl: '',
+        // objectType: that.objectType,
+        // storeGroupId: that.storeGroupId,
+        // taskList: that.taskList,
+        // visitsId: that.visitsId,
+        // visitSource: '1',
+        // locationRemark: that.addressesRemark,
+        // deviceCode: that.deviceCode, //设备编号
+        // putInCode: that.putInCode, //投放编号
+        // equipmentCode: that.equipmentCode,
+        // inStore: that.inStore,
+
+        mediaIds: [], //	是	List<String>	图片素材id集合
+        visitSource: '1', //	是	Long	拜访模式
+        storeGroupId: that.storeGroupId, //	是	string	门店任务组，多个用逗号隔开
+        visitsId: that.visitsId, //	是	string	拜访id
+        taskList: that.taskList, //	是	List	任务id数组
+        collectionItemId: '', //	是	string	采集项id
+        objectType: that.objectType, //	是	string	照片类型，取任务上的照片类型，如果没有则取手动选择的照片类型
+        locationRemark: that.addressesRemark, //	是	String	当前地址信息
+        firstCollectionId: '', //	否	Long	第一级采集项id，取当前采集项的字段就行
+        secondCollectionId: '', //	否	Long	第二级采集项id，取当前采集项的字段就行
         putInCode: that.putInCode, //投放编号
-        equipmentCode: that.equipmentCode,
-        inStore: that.inStore,
+        deviceCode: '', //	否	String	当前任务对应的设备编号
+        photoIdentifyType: '', //	否	String	图片识别类型：字典-photo_identify_type
+        equipmentCode: '', //	否	String	当前任务对应的资产编号
+        inStore: '否', //	否	String	机器是否在店：传选项中文内容，是、否
       };
       // 0=企业微信，1=H5相机
       if (this.userInfo.photoMethod == '0') {
@@ -373,7 +355,7 @@ export default {
       } else {
         this.toastLoading(0, '上传中...', true);
       }
-      addstorePhoto(form, this.controller ? this.controller.signal : null)
+      addPhotoBatch(form, this.controller ? this.controller.signal : null)
         .then((res) => {
           this.requestThen(res);
         })
@@ -443,24 +425,38 @@ export default {
         (this.photoIdentifyType != '6' || this.photoIdentifyType != '7')
       ) {
         var form = {
-          mediaIds: [],
-          fileUrl: '',
-          visitSource: '1', //	Long	拜访模式
-          storeGroupId: this.storeGroupId, //	string	门店任务组，多个用逗号隔开
-          visitsId: localStorage.getItem('visitId'), //	string	拜访id
-          taskId: this.taskId, //	string	任务id
-          objectType: this.objectType, //	string	照片类型，取任务上的照片类型，如果没有则取手动选择的照片类型
-          locationRemark: this.addressesRemark, //	String	当前地址信息
-          firstCollectionId: this.firstCollectionId, //	Long	第一级采集项id，取当前采集项的字段就行
-          secondCollectionId: this.secondCollectionId, //	Long	第二级采集项id，取当前采集项的字段就行
-          putInCode: this.putInCode, //	String	当前任务对应的投放编号
-          deviceCode: this.deviceCode, //	String	当前任务对应的设备编号
-          collectionItemId: this.collectionId,
-          url: res.data.url, //	String	当前拍摄图片的url
-          businessId: res.data.businessId, // 当前拍摄图片id
-          feedbackMessage: res.feedbackMessage,
-          equipmentCode: this.equipmentCode,
-          inStore: this.inStore,
+          // mediaIds: [],
+          // fileUrl: '',
+          // objectType: that.objectType,
+          // visitSource: '1', //	Long	拜访模式
+          // storeGroupId: this.storeGroupId, //	string	门店任务组，多个用逗号隔开
+          // visitsId: that.visitsId,
+          // taskList: this.taskList, //	string	任务id
+          // locationRemark: this.addressesRemark, //	String	当前地址信息
+          // // firstCollectionId: this.firstCollectionId, //	Long	第一级采集项id，取当前采集项的字段就行
+          // // secondCollectionId: this.secondCollectionId, //	Long	第二级采集项id，取当前采集项的字段就行
+          // // putInCode: this.putInCode, //	String	当前任务对应的投放编号
+          // // deviceCode: this.deviceCode, //	String	当前任务对应的设备编号
+          // url: res.data.url, //	String	当前拍摄图片的url
+          // businessId: res.data.businessId, // 当前拍摄图片id
+          // feedbackMessage: res.feedbackMessage,
+          // equipmentCode: this.equipmentCode,
+          // inStore: this.inStore,
+          mediaIds: [], //	是	List<String>	图片素材id集合
+          visitSource: '1', //	是	Long	拜访模式
+          storeGroupId: this.storeGroupId, //	是	string	门店任务组，多个用逗号隔开
+          visitsId: that.visitsId, //	是	string	拜访id
+          taskList: this.taskList, //	是	List	任务id数组
+          collectionItemId: '', //	是	string	采集项id
+          objectType: that.objectType, //	是	string	照片类型，取任务上的照片类型，如果没有则取手动选择的照片类型
+          locationRemark: this.addressesRemark, //	是	String	当前地址信息
+          firstCollectionId: '', //	否	Long	第一级采集项id，取当前采集项的字段就行
+          secondCollectionId: '', //	否	Long	第二级采集项id，取当前采集项的字段就行
+          putInCode: that.putInCode, //投放编号
+          deviceCode: '', //	否	String	当前任务对应的设备编号
+          photoIdentifyType: '', //	否	String	图片识别类型：字典-photo_identify_type
+          equipmentCode: '', //	否	String	当前任务对应的资产编号
+          inStore: '否', //	否	String	机器是否在店：传选项中文内容，是、否
         };
         // 0=企业微信，1=H5相机
         if (this.userInfo.photoMethod == '0') {

src/views/deviceOutside/suishenbangOutstoreVisit.vue

@@ -630,7 +630,7 @@ export default {
           path: '/taskPhotoTaking',
           query: {
             storeCode: this.urlParameter.storeCode,
-            id: this.visitId,
+            visitsId: this.visitId,
             taskIds: val.taskIds.join(','),
           },
         });

src/views/deviceWithin/taskPhotoTaking.vue

@@ -21,71 +21,35 @@
         class="container"
         style="width: 94%; margin: 0 auto; border-radius: 6px; padding: 10px 10px 10px 0">
         <van-form ref="tabstoreVal">
-          <div class="formLabel z-cell">
-            <van-cell>
-              <template #title>
-                <span v-if="formData.isMust == 0" class="van-f-red">*</span>
-                <span>1.</span>
-                {{ formData.collectionName }}
-                <!-- 操作说明图片和电话 -->
-                <taskTips
-                  v-if="formData.contactPhone || formData.examplePhoto"
-                  :contactPhone="formData.contactPhone"
-                  :examplePhoto="formData.examplePhoto">
-                </taskTips>
-              </template>
-            </van-cell>
-            <delete-upload-img :imgs="formData.fileInfoList"></delete-upload-img>
+          <div v-for="(item, index) in formData.collectionItemList" :key="index">
+            <div v-if="item.answerType == 'zp'" class="formLabel z-cell">
+              <van-cell>
+                <template #title>
+                  <span v-if="item.isMust == 0" class="van-f-red">*</span>
+                  <span>1.</span>
+                  {{ item.collectionName }}
+                  <!-- 操作说明图片和电话 -->
+                  <taskTips
+                    v-if="item.contactPhone || item.examplePhoto"
+                    :contactPhone="item.contactPhone"
+                    :examplePhoto="item.examplePhoto">
+                  </taskTips>
+                </template>
+              </van-cell>
+              <delete-upload-img
+                :imgs="item.fileInfoList"
+                :storeGroupId="formData.storeGroupId"
+                :taskList="taskIds"
+                :visitsId="visitsId"
+                :collectionItemId="collectionId"
+                :putInCode="formData.putInCode"
+                :photoIdentifyType="formData.photoIdentifyType"
+                @upDataDetail="getDetaile"></delete-upload-img>
+            </div>
           </div>
         </van-form>
       </div>
     </div>
-    <!-- <van-dialog v-model="show" :show-confirm-button="false" show-cancel-button title="上传图片">
-      <van-field
-        v-if="indexselect == '1'"
-        :value="PhotoTypeText"
-        clickable
-        name="picker"
-        placeholder="选择图片类型"
-        readonly
-        @click="showPicker = true">
-        <template #label> <span class="van-f-red">*</span>图片类型 </template>
-      </van-field>
-      <van-cell>
-        <template #title> <span class="van-f-red">*</span>图片上传 </template>
-        <template #right-icon>
-          <upload-img
-            :collectionId="collectionId"
-            :parentCollectionId="parentCollectionId"
-            :secondCollectionId="secondCollectionId"
-            :firstCollectionId="firstCollectionId"
-            :fourthCollectionId="fourthCollectionId"
-            :thirdCollectionId="thirdCollectionId"
-            :imgArr="imgs"
-            :objectType="PhotoType"
-            :shouws="true"
-            :storeGroupId="storeGroupId"
-            :taskId="taskId"
-            :uploadid="uploadid2"
-            :visitModel="1 + ''"
-            :visitsId="visitId"
-            :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>
-      <div v-if="continuousShoot == '1'" class="uploadImgNum" style="color: red; padding: 0px 16px">
-        注:拍照功能支持每次最多5张连拍,可多次连拍。
-      </div>
-    </van-dialog> -->
   </div>
 </template>
 <script>
@@ -99,363 +63,14 @@ export default {
     return {
       isEdit: true,
       formData: null,
-      taskIds: null,
+      taskIds: [],
+      visitsId: null,
+      collectionId: '',
     };
   },
   activated() {
-    this.taskIds = this.$route.query.taskIds;
-    // this.formData = {
-    //   searchValue: null,
-    //   createBy: null,
-    //   createTime: null,
-    //   updateBy: null,
-    //   updateTime: null,
-    //   remark: null,
-    //   params: {},
-    //   pageSize: null,
-    //   pageNum: null,
-    //   parentCollectionId: null,
-    //   firstCollectionId: null,
-    //   secondCollectionId: null,
-    //   thirdCollectionId: null,
-    //   fourthCollectionId: null,
-    //   collectionId: 252,
-    //   collectionCode: 'cj100102',
-    //   collectionName: '整体陈列',
-    //   collectionType: 'sdhcl',
-    //   isMust: '0',
-    //   isValid: '0',
-    //   isPicture: '0',
-    //   pictureSource: '1',
-    //   isMustPicture: '0',
-    //   answerType: 'zp',
-    //   delFlag: '0',
-    //   useType: 1,
-    //   showHistory: '0',
-    //   taskCollectionId: 3310,
-    //   taskId: null,
-    //   examplePhoto:
-    //     'https://cdn-svs-test.nipponpaint.com.cn/176033302782908c7122f-027d-4dc8-8d73-859625472b5c%281%29.jpg?Expires=2075865827&OSSAccessKeyId=LTAI5tG1DTJFA16BHkzHVxjz&Signature=JnndklXdShGjFaD%2FqrjnMMj2dGQ%3D',
-    //   contactPhone: null,
-    //   itemList: null,
-    //   useFrequency: 19,
-    //   collectionRelatedId: null,
-    //   collectionOptionId: null,
-    //   levelDeep: null,
-    //   seqence: null,
-    //   inventoryNum: null,
-    //   signDictype: null,
-    //   relevancyItemId: null,
-    //   relevancyItemName: null,
-    //   relevancyItem: false,
-    //   collectionOptionList: null,
-    //   fileInfoList: [
-    //     {
-    //       searchValue: null,
-    //       createBy: 'YueALong',
-    //       createTime: '2026-01-12 17:37:20',
-    //       updateBy: '',
-    //       updateTime: '2026-01-12 17:37:19',
-    //       remark: null,
-    //       params: {},
-    //       pageSize: null,
-    //       pageNum: null,
-    //       id: 9639242,
-    //       userId: null,
-    //       objectId: null,
-    //       storeId: null,
-    //       visitsId: 28326220,
-    //       fileSize: 91,
-    //       fileName: '岳阿龙-生动化陈列-吴中区郭巷金钥匙五金经营部-202601120537154.jpg',
-    //       fileType: 'jpg',
-    //       fileUrl:
-    //         'https://cdn-svs-test.nipponpaint.com.cn/%E5%B2%B3%E9%98%BF%E9%BE%99-%E7%94%9F%E5%8A%A8%E5%8C%96%E9%99%88%E5%88%97-%E5%90%B4%E4%B8%AD%E5%8C%BA%E9%83%AD%E5%B7%B7%E9%87%91%E9%92%A5%E5%8C%99%E4%BA%94%E9%87%91%E7%BB%8F%E8%90%A5%E9%83%A8-202601120537154.jpg?Expires=2083743439&OSSAccessKeyId=LTAI5tG1DTJFA16BHkzHVxjz&Signature=27%2FqhgrHZqHspKKTAO7u4j4gdmw%3D',
-    //       fileUrlOld:
-    //         'https://qyapi.weixin.qq.com/cgi-bin/media/get?access_token=4Pym0-8rvczkuQCcJtlHZd1RPnZL_mqEDX_8eel1QiFvZ_kIFtyMzuIA6Wz7Jhi39Ok_mekbFv8nPzf6VVhoy5MMBTu94kbaaJnWcH-Ak8-zo2EMDj73xCYBPLFuQqLagiblBAVO7zngWPfE8i9TpLGNslP0emn5ygHEjJFCi_DjCbxtYJk1JAeoEB-OR2Tde8go903t29NetHOcU9nhzg&media_id=3RNbG_xTtOWoJs5P_ec-F6oEynpsGdb4Cg8PMVV77gdQlOJff76DTp8t6lJjY5WLQKeKDV82HlQHwn876hleshA',
-    //       frameUrl: null,
-    //       objectType: 'rw-sdhcl',
-    //       storeGroupId: '1153,1152,1131,1123,1122,1114,1100,1000,862,839,804,795,770',
-    //       taskId: 1040,
-    //       instanceId: null,
-    //       taskName: null,
-    //       taskType: null,
-    //       inspectionType: null,
-    //       unManage: null,
-    //       firstCollectionId: null,
-    //       secondCollectionId: null,
-    //       thirdCollectionId: null,
-    //       fourthCollectionId: null,
-    //       deviceCode: null,
-    //       putInCode: null,
-    //       equipmentCode: null,
-    //       collectionItemId: 252,
-    //       photoIdentifyId: null,
-    //       writeAgain: '0',
-    //       delFlag: null,
-    //       base64Url: null,
-    //       frequencyReset: '0',
-    //       taskIdList: null,
-    //       ids: null,
-    //       visitsIds: null,
-    //       startTime: null,
-    //       stopTime: null,
-    //     },
-    //     {
-    //       searchValue: null,
-    //       createBy: 'YueALong',
-    //       createTime: '2026-01-12 17:37:20',
-    //       updateBy: '',
-    //       updateTime: '2026-01-12 17:37:19',
-    //       remark: null,
-    //       params: {},
-    //       pageSize: null,
-    //       pageNum: null,
-    //       id: 9639241,
-    //       userId: null,
-    //       objectId: null,
-    //       storeId: null,
-    //       visitsId: 28326220,
-    //       fileSize: 98,
-    //       fileName: '岳阿龙-生动化陈列-吴中区郭巷金钥匙五金经营部-202601120537153.jpg',
-    //       fileType: 'jpg',
-    //       fileUrl:
-    //         'https://cdn-svs-test.nipponpaint.com.cn/%E5%B2%B3%E9%98%BF%E9%BE%99-%E7%94%9F%E5%8A%A8%E5%8C%96%E9%99%88%E5%88%97-%E5%90%B4%E4%B8%AD%E5%8C%BA%E9%83%AD%E5%B7%B7%E9%87%91%E9%92%A5%E5%8C%99%E4%BA%94%E9%87%91%E7%BB%8F%E8%90%A5%E9%83%A8-202601120537153.jpg?Expires=2083743439&OSSAccessKeyId=LTAI5tG1DTJFA16BHkzHVxjz&Signature=KLVDY2ONFVEyUlc06GEWUXUc1YQ%3D',
-    //       fileUrlOld:
-    //         'https://qyapi.weixin.qq.com/cgi-bin/media/get?access_token=4Pym0-8rvczkuQCcJtlHZd1RPnZL_mqEDX_8eel1QiFvZ_kIFtyMzuIA6Wz7Jhi39Ok_mekbFv8nPzf6VVhoy5MMBTu94kbaaJnWcH-Ak8-zo2EMDj73xCYBPLFuQqLagiblBAVO7zngWPfE8i9TpLGNslP0emn5ygHEjJFCi_DjCbxtYJk1JAeoEB-OR2Tde8go903t29NetHOcU9nhzg&media_id=3sRGyhLeDlvgqkCKc6JDCzBfna7-46iCQvN8SpHYhsbN7mS-UWq5gPKA92o_jK6TtetkYGWLW-mbUyBBT-k_52g',
-    //       frameUrl: null,
-    //       objectType: 'rw-sdhcl',
-    //       storeGroupId: '1153,1152,1131,1123,1122,1114,1100,1000,862,839,804,795,770',
-    //       taskId: 1040,
-    //       instanceId: null,
-    //       taskName: null,
-    //       taskType: null,
-    //       inspectionType: null,
-    //       unManage: null,
-    //       firstCollectionId: null,
-    //       secondCollectionId: null,
-    //       thirdCollectionId: null,
-    //       fourthCollectionId: null,
-    //       deviceCode: null,
-    //       putInCode: null,
-    //       equipmentCode: null,
-    //       collectionItemId: 252,
-    //       photoIdentifyId: null,
-    //       writeAgain: '0',
-    //       delFlag: null,
-    //       base64Url: null,
-    //       frequencyReset: '0',
-    //       taskIdList: null,
-    //       ids: null,
-    //       visitsIds: null,
-    //       startTime: null,
-    //       stopTime: null,
-    //     },
-    //     {
-    //       searchValue: null,
-    //       createBy: 'YueALong',
-    //       createTime: '2026-01-12 17:37:20',
-    //       updateBy: '',
-    //       updateTime: '2026-01-12 17:37:19',
-    //       remark: null,
-    //       params: {},
-    //       pageSize: null,
-    //       pageNum: null,
-    //       id: 9639240,
-    //       userId: null,
-    //       objectId: null,
-    //       storeId: null,
-    //       visitsId: 28326220,
-    //       fileSize: 97,
-    //       fileName: '岳阿龙-生动化陈列-吴中区郭巷金钥匙五金经营部-202601120537152.jpg',
-    //       fileType: 'jpg',
-    //       fileUrl:
-    //         'https://cdn-svs-test.nipponpaint.com.cn/%E5%B2%B3%E9%98%BF%E9%BE%99-%E7%94%9F%E5%8A%A8%E5%8C%96%E9%99%88%E5%88%97-%E5%90%B4%E4%B8%AD%E5%8C%BA%E9%83%AD%E5%B7%B7%E9%87%91%E9%92%A5%E5%8C%99%E4%BA%94%E9%87%91%E7%BB%8F%E8%90%A5%E9%83%A8-202601120537152.jpg?Expires=2083743438&OSSAccessKeyId=LTAI5tG1DTJFA16BHkzHVxjz&Signature=RWF40truLsmFRP2eWCC8vLXkhVQ%3D',
-    //       fileUrlOld:
-    //         'https://qyapi.weixin.qq.com/cgi-bin/media/get?access_token=4Pym0-8rvczkuQCcJtlHZd1RPnZL_mqEDX_8eel1QiFvZ_kIFtyMzuIA6Wz7Jhi39Ok_mekbFv8nPzf6VVhoy5MMBTu94kbaaJnWcH-Ak8-zo2EMDj73xCYBPLFuQqLagiblBAVO7zngWPfE8i9TpLGNslP0emn5ygHEjJFCi_DjCbxtYJk1JAeoEB-OR2Tde8go903t29NetHOcU9nhzg&media_id=3Syoq301LGwty8v23_TIOveXrBoi8LoUUhM9XeYcGYJbjKQ1QJWhs2DUgerO_35S_ja-lOp-4CkpgXr3_Fsh24A',
-    //       frameUrl: null,
-    //       objectType: 'rw-sdhcl',
-    //       storeGroupId: '1153,1152,1131,1123,1122,1114,1100,1000,862,839,804,795,770',
-    //       taskId: 1040,
-    //       instanceId: null,
-    //       taskName: null,
-    //       taskType: null,
-    //       inspectionType: null,
-    //       unManage: null,
-    //       firstCollectionId: null,
-    //       secondCollectionId: null,
-    //       thirdCollectionId: null,
-    //       fourthCollectionId: null,
-    //       deviceCode: null,
-    //       putInCode: null,
-    //       equipmentCode: null,
-    //       collectionItemId: 252,
-    //       photoIdentifyId: null,
-    //       writeAgain: '0',
-    //       delFlag: null,
-    //       base64Url: null,
-    //       frequencyReset: '0',
-    //       taskIdList: null,
-    //       ids: null,
-    //       visitsIds: null,
-    //       startTime: null,
-    //       stopTime: null,
-    //     },
-    //     {
-    //       searchValue: null,
-    //       createBy: 'YueALong',
-    //       createTime: '2026-01-12 17:37:20',
-    //       updateBy: '',
-    //       updateTime: '2026-01-12 17:37:19',
-    //       remark: null,
-    //       params: {},
-    //       pageSize: null,
-    //       pageNum: null,
-    //       id: 9639239,
-    //       userId: null,
-    //       objectId: null,
-    //       storeId: null,
-    //       visitsId: 28326220,
-    //       fileSize: 93,
-    //       fileName: '岳阿龙-生动化陈列-吴中区郭巷金钥匙五金经营部-202601120537151.jpg',
-    //       fileType: 'jpg',
-    //       fileUrl:
-    //         'https://cdn-svs-test.nipponpaint.com.cn/%E5%B2%B3%E9%98%BF%E9%BE%99-%E7%94%9F%E5%8A%A8%E5%8C%96%E9%99%88%E5%88%97-%E5%90%B4%E4%B8%AD%E5%8C%BA%E9%83%AD%E5%B7%B7%E9%87%91%E9%92%A5%E5%8C%99%E4%BA%94%E9%87%91%E7%BB%8F%E8%90%A5%E9%83%A8-202601120537151.jpg?Expires=2083743438&OSSAccessKeyId=LTAI5tG1DTJFA16BHkzHVxjz&Signature=bX3y0xc35Uei4sIudxV7dHktTj4%3D',
-    //       fileUrlOld:
-    //         'https://qyapi.weixin.qq.com/cgi-bin/media/get?access_token=4Pym0-8rvczkuQCcJtlHZd1RPnZL_mqEDX_8eel1QiFvZ_kIFtyMzuIA6Wz7Jhi39Ok_mekbFv8nPzf6VVhoy5MMBTu94kbaaJnWcH-Ak8-zo2EMDj73xCYBPLFuQqLagiblBAVO7zngWPfE8i9TpLGNslP0emn5ygHEjJFCi_DjCbxtYJk1JAeoEB-OR2Tde8go903t29NetHOcU9nhzg&media_id=3zB7QrnT0_QXdMEJaO17YunX6-NwpKVo4_CPyKBSHngBDN_-Oin7_a1rc8PGplhPhcR13eQYE4d7A_9m6S8hZRQ',
-    //       frameUrl: null,
-    //       objectType: 'rw-sdhcl',
-    //       storeGroupId: '1153,1152,1131,1123,1122,1114,1100,1000,862,839,804,795,770',
-    //       taskId: 1040,
-    //       instanceId: null,
-    //       taskName: null,
-    //       taskType: null,
-    //       inspectionType: null,
-    //       unManage: null,
-    //       firstCollectionId: null,
-    //       secondCollectionId: null,
-    //       thirdCollectionId: null,
-    //       fourthCollectionId: null,
-    //       deviceCode: null,
-    //       putInCode: null,
-    //       equipmentCode: null,
-    //       collectionItemId: 252,
-    //       photoIdentifyId: null,
-    //       writeAgain: '0',
-    //       delFlag: null,
-    //       base64Url: null,
-    //       frequencyReset: '0',
-    //       taskIdList: null,
-    //       ids: null,
-    //       visitsIds: null,
-    //       startTime: null,
-    //       stopTime: null,
-    //     },
-    //     {
-    //       searchValue: null,
-    //       createBy: 'YueALong',
-    //       createTime: '2026-01-12 17:37:20',
-    //       updateBy: '',
-    //       updateTime: '2026-01-12 17:37:19',
-    //       remark: null,
-    //       params: {},
-    //       pageSize: null,
-    //       pageNum: null,
-    //       id: 9639238,
-    //       userId: null,
-    //       objectId: null,
-    //       storeId: null,
-    //       visitsId: 28326220,
-    //       fileSize: 105,
-    //       fileName: '岳阿龙-生动化陈列-吴中区郭巷金钥匙五金经营部-202601120537150.jpg',
-    //       fileType: 'jpg',
-    //       fileUrl:
-    //         'https://cdn-svs-test.nipponpaint.com.cn/%E5%B2%B3%E9%98%BF%E9%BE%99-%E7%94%9F%E5%8A%A8%E5%8C%96%E9%99%88%E5%88%97-%E5%90%B4%E4%B8%AD%E5%8C%BA%E9%83%AD%E5%B7%B7%E9%87%91%E9%92%A5%E5%8C%99%E4%BA%94%E9%87%91%E7%BB%8F%E8%90%A5%E9%83%A8-202601120537150.jpg?Expires=2083743438&OSSAccessKeyId=LTAI5tG1DTJFA16BHkzHVxjz&Signature=f75hQUp%2FuSHChTdP4c0Ra1IWlVw%3D',
-    //       fileUrlOld:
-    //         'https://qyapi.weixin.qq.com/cgi-bin/media/get?access_token=4Pym0-8rvczkuQCcJtlHZd1RPnZL_mqEDX_8eel1QiFvZ_kIFtyMzuIA6Wz7Jhi39Ok_mekbFv8nPzf6VVhoy5MMBTu94kbaaJnWcH-Ak8-zo2EMDj73xCYBPLFuQqLagiblBAVO7zngWPfE8i9TpLGNslP0emn5ygHEjJFCi_DjCbxtYJk1JAeoEB-OR2Tde8go903t29NetHOcU9nhzg&media_id=3NwXHIxwFM69b9O6z7iI1hRvgbtAgYW8e2ZTV14DfOoGwDxvBbOQq6FR1HsaLrFKaQ0XkVpSZK8Mu2OcpDvGYoQ',
-    //       frameUrl: null,
-    //       objectType: 'rw-sdhcl',
-    //       storeGroupId: '1153,1152,1131,1123,1122,1114,1100,1000,862,839,804,795,770',
-    //       taskId: 1040,
-    //       instanceId: null,
-    //       taskName: null,
-    //       taskType: null,
-    //       inspectionType: null,
-    //       unManage: null,
-    //       firstCollectionId: null,
-    //       secondCollectionId: null,
-    //       thirdCollectionId: null,
-    //       fourthCollectionId: null,
-    //       deviceCode: null,
-    //       putInCode: null,
-    //       equipmentCode: null,
-    //       collectionItemId: 252,
-    //       photoIdentifyId: null,
-    //       writeAgain: '0',
-    //       delFlag: null,
-    //       base64Url: null,
-    //       frequencyReset: '0',
-    //       taskIdList: null,
-    //       ids: null,
-    //       visitsIds: null,
-    //       startTime: null,
-    //       stopTime: null,
-    //     },
-    //     {
-    //       searchValue: null,
-    //       createBy: 'YueALong',
-    //       createTime: '2026-01-12 15:48:37',
-    //       updateBy: '',
-    //       updateTime: '2026-01-12 15:48:36',
-    //       remark: null,
-    //       params: {},
-    //       pageSize: null,
-    //       pageNum: null,
-    //       id: 9639237,
-    //       userId: null,
-    //       objectId: null,
-    //       storeId: null,
-    //       visitsId: 28326220,
-    //       fileSize: 181,
-    //       fileName: '岳阿龙-生动化陈列-吴中区郭巷金钥匙五金经营部-202601120348360.jpg',
-    //       fileType: 'jpg',
-    //       fileUrl:
-    //         'https://cdn-svs-test.nipponpaint.com.cn/%E5%B2%B3%E9%98%BF%E9%BE%99-%E7%94%9F%E5%8A%A8%E5%8C%96%E9%99%88%E5%88%97-%E5%90%B4%E4%B8%AD%E5%8C%BA%E9%83%AD%E5%B7%B7%E9%87%91%E9%92%A5%E5%8C%99%E4%BA%94%E9%87%91%E7%BB%8F%E8%90%A5%E9%83%A8-202601120348360.jpg?Expires=2083736916&OSSAccessKeyId=LTAI5tG1DTJFA16BHkzHVxjz&Signature=LePiUZJjWySpRUE1iCz6RAKjO18%3D',
-    //       fileUrlOld:
-    //         'https://qyapi.weixin.qq.com/cgi-bin/media/get?access_token=NoReDRUW-JAALmnKltMD0KYuxAVjwrCNg38BediE4G0v8r_mjOhqemXSUXXtpdOxPqJTTP0TsV04FPQ_UCQlj6aWA1jp0--w7VKp6u5WhZkFaQKxbX0r_32JXLjLNfOxhkezk7RstwdV_nPYQJpuYhk9JjWCc7yewc-Ij4ScLVZv7nn89FB-QV97lG2hOPWv4qouAPuUSqdKltrgXIavKg&media_id=3AntPxvbkldjBn8sffnQJ-FG6xRz0fQPSmCrLYMJLUh6Eb7gwwzPXi_Ew8epoj3acGaelWXuSGPJkCwBMCryoZQ',
-    //       frameUrl: null,
-    //       objectType: 'rw-sdhcl',
-    //       storeGroupId: '1153,1152,1131,1123,1122,1114,1100,1000,862,839,804,795,770',
-    //       taskId: 1040,
-    //       instanceId: null,
-    //       taskName: null,
-    //       taskType: null,
-    //       inspectionType: null,
-    //       unManage: null,
-    //       firstCollectionId: null,
-    //       secondCollectionId: null,
-    //       thirdCollectionId: null,
-    //       fourthCollectionId: null,
-    //       deviceCode: null,
-    //       putInCode: null,
-    //       equipmentCode: null,
-    //       collectionItemId: 252,
-    //       photoIdentifyId: null,
-    //       writeAgain: '0',
-    //       delFlag: null,
-    //       base64Url: null,
-    //       frequencyReset: '0',
-    //       taskIdList: null,
-    //       ids: null,
-    //       visitsIds: null,
-    //       startTime: null,
-    //       stopTime: null,
-    //     },
-    //   ],
-    //   maxValue: null,
-    //   materialFrequency: null,
-    //   continuousShoot: '1',
-    //   status: null,
-    // };
+    this.taskIds = this.$route.query.taskIds || [];
+    this.visitsId = this.$route.query.visitsId || '';
     this.getDetaile();
   },
   methods: {
@@ -464,11 +79,12 @@ export default {
       getCollectionInfosBatch({
         storeCode: this.$route.query.storeCode,
         insert: true,
-        id: this.$route.query.storeCode,
+        id: this.visitsId,
         taskIds: this.taskIds.split(','),
       }).then((res) => {
-        if (res.data && res.data.legnth) {
+        if (res.data && res.data.length) {
           this.formData = res.data[0];
+          this.collectionId = this.formData.collectionItemList[0].collectionId;
         } else {
           this.formData = null;
         }