Browse Source

Merge branch 'feature_20260421_完美门店详情接口速度优化' into uat(dev)

# Conflicts:
#	src/api/index.js
zhujindu 12 hours ago
parent
commit
655cb887d3

+ 1 - 1
src/views/deviceWithin/storeVisit.vue

@@ -798,7 +798,7 @@ export default {
               taskIds: val.taskIds.join(','),
               storeGroupId: this.storeGroupId,
               photoType: val.photoType,
-              insert: this.insert,
+              insert: this.$route.query.type == 'edit' ? true : false,
               storeId: this.storeId,
             },
           });

+ 2 - 8
src/views/deviceWithin/taskPhotoTaking.vue

@@ -3,7 +3,7 @@
     <van-nav-bar class="navBar" left-arrow title="生动化陈列" @click-left="onClickLeft">
       <template #right v-if="formData">
         <span
-          v-if="formData.processStatus != 1 || formData.displayRewardTaskEditable"
+          v-if="formData.processStatus != 1"
           @click="onSubmit"
           style="
             color: white;
@@ -279,13 +279,7 @@ export default {
       });
     },
     isEditFun() {
-      // processStatus 是否有权限编辑,displayRewardTaskEditable 只能编辑一次,
-      if (
-        (this.insert == 'false' && this.formData.processStatus != 1) ||
-        this.formData.displayRewardTaskEditable
-      ) {
-        this.getTicketFunfun();
-      }
+      this.getTicketFunfun();
     },
     openDialog(item) {
       this.vanPopup = true;