Merge branch 'release' into uat(dev)

# Conflicts:
#	src/components/deleteUploadImgTaskPhoto.vue
#	src/views/deviceWithin/taskPhotoTaking.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 == '1'">
+      <van-col span="6" style="" v-if="insert == '1' && formData.processStatus != 1">
         <div class="addImg">
           <uploadVNormalTaskPhoto
             :shouws="true"
@@ -21,11 +21,9 @@
       </van-col>
       <van-col span="6" v-for="(urls, index) in imgArr" :key="index">
         <div class="imgview">
-          <van-icon
-            v-if="insert == '1'"
-            name="close"
-            size="16"
-            v-on:click="deleteImg(index, urls)" />
+          <van-icon <<<<<<< HEAD v-if="insert == '1'" ======= v-if=" (photoIdentifyType != 6 ||
+          photoIdentifyType != 7) && insert == '1' && formData.processStatus != 1 " >>>>>>> release
+          name="close" size="16" v-on:click="deleteImg(index, urls)" />
           <img :src="urls.fileUrl" width="100px" height="100px" @click="previewsImg(index)" />
           <!-- <img
             v-else

src/views/deviceWithin/storeVisit.vue

@@ -798,7 +798,7 @@ export default {
               taskIds: val.taskIds.join(','),
               storeGroupId: this.storeGroupId,
               photoType: val.photoType,
-              insert: 1,
+              insert: this.insert,
             },
           });
         } 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 == '1' && formData.processStatus != 1"
           @click="onSubmit"
           style="
             color: white;