Merge branch 'feature_20260413_陈列照片提交后修改' into feature_20260421_完美门店详情接口速度优化

# Conflicts:
#	src/api/index.js

src/api/index.js

@@ -1169,3 +1169,12 @@ export function getVisitsDetailPerfectStoreByTaskId(query) {
     params: query,
   });
 }
+
+// 查询用户距离拜访门店得距离
+export function selectUserDistanceTheStore(query) {
+  return request({
+    url: 'mobile/storeGroup/selectUserDistanceTheStore',
+    method: 'get',
+    params: query,
+  });
+}

src/components/deleteUploadImgTaskPhoto.vue

@@ -1,9 +1,13 @@
 <template>
   <div class="deleteUploadImgTaskPhoto">
     <van-row gutter="10">
-      <van-col span="6" style="" v-if="insert == 'true' && formData.processStatus != 1">
+      <van-col
+        span="6"
+        style=""
+        v-if="formData.processStatus != 1 || formData.displayRewardTaskEditable">
         <div class="addImg">
           <uploadVNormalTaskPhoto
+            :formData="formData"
             :shouws="true"
             :storeGroupId="storeGroupId"
             :taskList="taskIds.split(',')"
@@ -22,9 +26,9 @@
       <van-col span="6" v-for="(urls, index) in imgArr" :key="index">
         <div class="imgview">
           <van-icon
-            v-if="insert == 'true' && formData.processStatus != 1"
+            v-if="formData.processStatus != 1 || formData.displayRewardTaskEditable"
             name="close"
-            size="16"
+            size="20"
             v-on:click="deleteImg(index, urls)" />
           <img
             :src="urls.fileUrl || urls.mediaFileUrl"
@@ -297,8 +301,8 @@ export default {
   display: inline-block;
   i {
     position: absolute;
-    right: -2px;
-    top: -3px;
+    right: -7px;
+    top: -7px;
     color: white;
     background: red;
     overflow: hidden;

src/components/uploadVNormalTaskPhoto.vue

@@ -89,6 +89,12 @@ export default {
       type: [String, Number],
       default: '',
     },
+    formData: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
   },
   computed: {
     ...mapState({
@@ -207,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

@@ -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 == 'true' && formData.processStatus != 1"
+          v-if="formData.processStatus != 1 || formData.displayRewardTaskEditable"
           @click="onSubmit"
           style="
             color: white;
@@ -126,9 +126,15 @@
   </div>
 </template>
 <script>
-import { getCollectionInfosBatch, addCollectionAnswerBatch, getVisitsDetail } from '@/api/index';
+import {
+  getCollectionInfosBatch,
+  addCollectionAnswerBatch,
+  getVisitsDetail,
+  selectUserDistanceTheStore,
+} from '@/api/index';
 import taskTips from './taskTips';
 import deleteUploadImgTaskPhoto from '@/components/deleteUploadImgTaskPhoto';
+import { getPosition, getTicketFun } from '@/utils/TXApiFun';
 import { mapState } from 'vuex';
 export default {
   name: 'abnortaskPhotoTakingmalVisit',
@@ -140,7 +146,6 @@ export default {
   },
   data() {
     return {
-      isEdit: true,
       formData: null,
       dataList: null,
       taskIds: [],
@@ -153,6 +158,7 @@ export default {
       spanArr: [],
       pos: 0,
       mediaIds: [],
+      editFlag: true,
     };
   },
   activated() {
@@ -175,6 +181,39 @@ export default {
   },
   watch: {},
   methods: {
+    // 授权
+    getTicketFunfun() {
+      getTicketFun()
+        .then(() => {
+          getPosition()
+            .then((res) => {
+              let { TXisBD } = res;
+              // this.lat = TXisBD.lat;
+              // this.lon = TXisBD.lon;
+              this.selectUserDistanceTheStoreFun(TXisBD);
+            })
+            .catch((error) => {
+              this.$dialog.alert({
+                message: error,
+              });
+            });
+        })
+        .catch(() => {});
+    },
+    selectUserDistanceTheStoreFun(TXisBD) {
+      selectUserDistanceTheStore({
+        visitsId: this.visitsId, //	Long	拜访id
+        lon: TXisBD.lon, //	String	经度
+        lat: TXisBD.lat, //	String	纬度
+      }).then((res) => {
+        if (res.code == 200) {
+          this.editFlag = true;
+        } else {
+          this.editFlag = true;
+          this.$toast(res.msg);
+        }
+      });
+    },
     taskObjectSpanMethod({ row, column, rowIndex, columnIndex }) {
       const cellValue = row[column.property];
       if (cellValue && ['conditionIdentifyNum'].includes(column.property)) {
@@ -213,6 +252,7 @@ export default {
         if (res.data.sfaTaskList) {
           this.dataList = res.data.sfaTaskList.filter((val) => val.taskType == '5');
           this.formData = this.dataList[0];
+          this.isEditFun();
         } else {
           this.formData = null;
         }
@@ -229,11 +269,21 @@ export default {
         if (res.data && res.data.length) {
           this.dataList = res.data;
           this.formData = res.data[0];
+          this.isEditFun();
         } else {
           this.formData = null;
         }
       });
     },
+    isEditFun() {
+      // processStatus 是否有权限编辑，displayRewardTaskEditable 只能编辑一次，
+      if (
+        (this.insert == 'false' && this.formData.processStatus != 1) ||
+        this.formData.displayRewardTaskEditable
+      ) {
+        this.getTicketFunfun();
+      }
+    },
     openDialog(item) {
       this.vanPopup = true;
       console.log(item);
@@ -268,7 +318,7 @@ export default {
           storeGroupId: this.$route.query.storeGroupId,
           visitsId: this.visitsId,
           taskList: this.taskIds.split(',').map((val) => Number(val)),
-          insert: true,
+          insert: this.insert,
           collectionAnswers: [],
           checkUnManage: 'N',
           deviceCode: '',
@@ -323,6 +373,7 @@ export default {
     display: flex;
     flex-direction: column;
     padding-bottom: 46px;
+    // overflow-y: auto;
     .container {
       background: #fff;
       width: 100%;

src/views/historicalVisit/perfectStoreTask.vue

@@ -62,7 +62,7 @@
                 :insert="insert"
                 :objectType="objectType"
                 v-if="item.fileInfoList.length"></deleteUploadImg> -->
-              <span v-else>暂未识别到产品照片</span>
+              <span style="font-size: 16px" v-else>暂未识别到产品照片</span>
             </div>
           </div>
         </van-form>