Merge branch 'release' into uat(dev)

# Conflicts:
#	src/components/deleteUploadImgTaskPhoto.vue

src/components/deleteUploadImgTaskPhoto.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="deleteUploadImgTaskPhoto">
     <van-row gutter="10">
-      <van-col span="6" style="" v-if="insert && formData.processStatus != 1">
+      <van-col span="6" style="" v-if="insert == 'true' && formData.processStatus != 1">
         <div class="addImg">
           <uploadVNormalTaskPhoto
             :shouws="true"
@@ -22,7 +22,7 @@
       <van-col span="6" v-for="(urls, index) in imgArr" :key="index">
         <div class="imgview">
           <van-icon
-            v-if="insert && formData.processStatus != 1"
+            v-if="insert == 'true' && formData.processStatus != 1"
             name="close"
             size="16"
             v-on:click="deleteImg(index, urls)" />
@@ -100,8 +100,8 @@ export default {
       default: '',
     },
     insert: {
-      type: Boolean,
-      default: false,
+      type: String,
+      default: 'false',
     },
     fileInfoList: {
       type: Array,

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/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="isEdit && insert && formData.processStatus != 1"
+          v-if="isEdit && insert == 'true' && formData.processStatus != 1"
           @click="onSubmit"
           style="
             color: white;
@@ -74,7 +74,7 @@
             </div>
             <div class="itemHtml" v-html="item.displayInstructions"></div>
           </div>
-          <div class="itemBottom" v-if="!insert">
+          <div class="itemBottom" v-if="insert == 'false'">
             <img
               v-if="item.taskPhotoConditionPassed == 1"
               @click="openDialog(item)"

src/views/historicalVisit/historicalDetails.vue

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