Merge branch 'release'

src/components/deleteUploadImgTaskPhoto.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="deleteUploadImgTaskPhoto">
     <van-row gutter="10">
-      <van-col span="6" style="" v-if="insert == '1'">
+      <van-col span="6" style="" v-if="insert == 'true' && formData.processStatus != 1">
         <div class="addImg">
           <uploadVNormalTaskPhoto
             :imgArr="imgs"
@@ -23,7 +23,11 @@
       <van-col span="6" v-for="(urls, index) in imgs" :key="urls.id">
         <div class="imgview">
           <van-icon
-            v-if="(photoIdentifyType != 6 || photoIdentifyType != 7) && insert == '1'"
+            v-if="
+              (photoIdentifyType != 6 || photoIdentifyType != 7) &&
+              insert == 'true' &&
+              formData.processStatus != 1
+            "
             name="close"
             size="16"
             v-on:click="deleteImg(index, urls.fileIdSplicing)" />
@@ -60,6 +64,12 @@ export default {
   name: 'deleteUploadImgTaskPhoto',
   components: { uploadVNormalTaskPhoto },
   props: {
+    formData: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
     imgs: {
       type: Array,
       default() {
@@ -107,7 +117,7 @@ export default {
     },
     insert: {
       type: String,
-      default: '0',
+      default: 'false',
     },
   },
   watch: {

src/views/deviceOutside/suishenbangOutstoreVisit.vue

@@ -637,7 +637,7 @@ export default {
             taskIds: val.taskIds.join(','),
             storeGroupId: this.storeGroupId,
             photoType: val.photoType,
-            insert: 1,
+            insert: true,
             storeId: this.storeId,
           },
         });

src/views/deviceWithin/storeVisit.vue

@@ -253,6 +253,7 @@ export default {
     next();
   },
   activated() {
+    console.log(11111);
     // 是否请求任务列表接口
     let getRequestFlage = localStorage.getItem('getRequestFlage');
     if (getRequestFlage != 'true') return;
@@ -391,6 +392,7 @@ export default {
       return Math.round((arrtime2 - arrtime1) / 1000);
     },
     addVisits() {
+      console.log(222);
       var that = this;
       var insert = '';
       var postType = localStorage.getItem('postType');
@@ -472,6 +474,7 @@ export default {
             });
             that.list = [];
             getVisitTasks(params).then((res) => {
+              console.log(333);
               loading2.clear();
               if (res.code == 200) {
                 that.notes = res.data.notes;
@@ -529,6 +532,7 @@ export default {
               forbidClick: true,
             });
             that.list = [];
+            console.log(444);
             getVisitTasks(params).then((res) => {
               loading2.clear();
               if (res.code == 200) {
@@ -561,6 +565,7 @@ export default {
           }
         },
         function (err) {
+          console.log(555);
           if (that.$route.query.type == 'edit') {
             var params = {
               storeId: that.storeId,
@@ -798,7 +803,8 @@ export default {
               taskIds: val.taskIds.join(','),
               storeGroupId: this.storeGroupId,
               photoType: val.photoType,
-              insert: 1,
+              insert: this.insert,
+              storeId: this.storeId,
             },
           });
         } else {

src/views/deviceWithin/taskPhotoTaking.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="taskPhotoTaking">
     <van-nav-bar class="navBar" left-arrow title="生动化陈列" @click-left="onClickLeft">
-      <template #right>
+      <template #right v-if="formData">
         <span
-          v-if="isEdit && insert == '1'"
+          v-if="isEdit && insert == 'true' && formData.processStatus != 1"
           @click="onSubmit"
           style="
             color: white;
@@ -42,6 +42,7 @@
                 </template>
               </van-cell>
               <deleteUploadImg
+                :formData="formData"
                 :imgs="item.fileInfoList"
                 :storeGroupId="storeGroupId"
                 :taskIds="taskIds"
@@ -72,7 +73,7 @@
             </div>
             <div class="itemHtml" v-html="item.displayInstructions"></div>
           </div>
-          <div class="itemBottom" v-if="insert == '0'">
+          <div class="itemBottom" v-if="insert == 'false'">
             <img
               @click="openDialog(item)"
               :src="
@@ -205,7 +206,7 @@ export default {
       console.log(this.$route.query);
       getCollectionInfosBatch({
         storeCode: this.$route.query.storeCode,
-        insert: this.insert == '1' ? true : false,
+        insert: this.insert,
         id: this.visitsId,
         taskIds: this.taskIds.split(','),
       }).then((res) => {

src/views/historicalVisit/historicalDetails.vue

@@ -455,8 +455,9 @@ export default {
             visitsId: this.visitsId,
             taskIds: val.taskIds.join(','),
             storeGroupId: this.list.storeGroupId,
-            insert: 0,
+            insert: false,
             source: 'historicalDetails',
+            storeId: this.list.storeId,
           },
         });
       } else {

src/views/home/bottomBtn.vue

@@ -8,7 +8,7 @@
       </span>
     </div>
     <div class="lineGrey"></div>
-    <div v-if="approvalButton && !GZdata" class="contentborder">
+    <div v-if="approvalButton" class="contentborder">
       <van-cell class="homeTitle" title="汇报审批" to="/dailyApprovalList">
         <template #title>
           <span class="custom-title">汇报审批&nbsp;&nbsp;</span>