Merge branch 'master-20260422' into uat(dev)

src/components/uploadVNormalTaskPhoto.vue

@@ -213,7 +213,7 @@ export default {
               let count = 1;
               // 1:店招内容识别(不能连拍和多选),3:调色机识别(不能连拍和多选) 需要实时识别的不支持连拍和多选
               if (that.photoIdentifyType != 1 && that.photoIdentifyType != 3) {
-                count = that.continuousShoot == '1' ? 5 : 1; //是否允许连拍/相册多选 最多5张
+                count = that.continuousShoot == '1' ? 20 : 1; //是否允许连拍/相册多选 最多5张
               }
               wx.chooseImage({
                 count: count,

src/views/deviceWithin/taskPhotoTaking.vue

@@ -164,6 +164,9 @@ export default {
     };
   },
   activated() {
+    if (this.formData && this.formData.collectionItemList && this.formData.collectionItemList[0]) {
+      this.formData.collectionItemList[0].fileInfoList = [];
+    }
     this.taskIds = this.$route.query.taskIds || [];
     this.visitsId = this.$route.query.visitsId || '';
     this.storeGroupId = this.$route.query.storeGroupId || '';
@@ -171,6 +174,7 @@ export default {
     this.insert = this.$route.query.insert;
     // 授权
     // getTicketFun(['uploadImage']).then(() => {});
+    this.toastLoading(0, '加载中...', true);
     if (this.$route.query.source == 'historicalDetails') {
       this.getVisitsDetailFun();
     } else {
@@ -250,7 +254,6 @@ export default {
       }
     },
     getVisitsDetailFun() {
-      this.toastLoading(0, '加载中...', true);
       getVisitsDetail({ visitsId: this.visitsId }).then((res) => {
         this.toastLoading().clear();
         if (res.data.sfaTaskList) {
@@ -270,6 +273,7 @@ export default {
         id: this.visitsId,
         taskIds: this.taskIds.split(','),
       }).then((res) => {
+        this.toastLoading().clear();
         if (res.data && res.data.length) {
           this.dataList = res.data;
           this.formData = res.data[0];
@@ -280,7 +284,7 @@ export default {
       });
     },
     isEditFun() {
-      this.getTicketFunfun();
+      // this.getTicketFunfun();
     },
     openDialog(item) {
       this.vanPopup = true;