Merge branch 'release' into dev

src/store/modules/user.js

@@ -109,7 +109,7 @@ export default defineStore(
     },
     getters: {
       /**
-       * 获取促销系统身份 （0 null 为职能角色，1 为城市经理）
+       * 获取促销系统身份 （null 2 为职能角色，1 为城市经理）
        * @param {*} state 
        * @returns （true 城市经理）（false 职能角色）
        */

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/inspectionTask/index.vue

@@ -49,7 +49,7 @@
               capture="camera"
               :model-value="form.commitStorePicture"
               :after-read="commitStorePhotosRead"
-              preview-size="78"
+              preview-size="2.13333rem"
               @delete="deleteCommitStorePhotos">
             </van-uploader>
           </template>
@@ -151,7 +151,7 @@
                 capture="camera"
                 :model-value="form.longTimePictureArr"
                 :after-read="longTimePictureArrRead"
-                preview-size="78"
+                preview-size="2.13333rem"
                 @delete="deleteLongTimePictureArr">
               </van-uploader>
             </template>

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/inspectionTask/tabs/categoryInformation.vue

@@ -311,12 +311,13 @@ const selectedTypeObj = ref(typeOptions.value[0])
 
 // 价格改变
 const handlePriceChange = async () => {
+  const prop = typeMap[selectedTypeObj.value.label].priceKey
   const res = await createInspectionTaskDetailAPI({
     taskDetail: {
       rstId: props.form.rstId,
       rstdId: nowRstdId.value,
       detailName: '品类信息',
-      priceHp210: selectedTypeObj.value.price * 1
+      [prop]: selectedTypeObj.value.price * 1
     }
   })
 
@@ -344,15 +345,18 @@ const init = () => {
     if (props.form.detailMap['品类信息']) {
       // 回显
       nowRstdId.value = props.form.detailMap['品类信息'][0].rstdId // 详情ID
-      const priceProp = typeMap[selectedTypeObj.value.label].priceKey // 设置价格
-      selectedTypeObj.value.price = props.form.detailMap['品类信息'][0][priceProp]
-      const tasteProp = typeMap[selectedTypeObj.value.label].tasteDateKey // 设置口味日期
+      // 循环设置
+      typeOptions.value.forEach(item => {
+        const priceProp = typeMap[item.label].priceKey // 设置价格
+        item.price = props.form.detailMap['品类信息'][0][priceProp]
+        const tasteProp = typeMap[item.label].tasteDateKey // 设置口味日期
         const targetTasteObj = props.form.detailMap['品类信息'][0][tasteProp]
         if (targetTasteObj) {
-        selectedTypeObj.value.taste.forEach(item => {
+          item.taste.forEach(item => {
             item.value = targetTasteObj[item.name] // 取出日期 
           })
         }
+      })
       return
     }
   }

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/inspectionTask/tabs/conventionalDisplay.vue

@@ -35,7 +35,7 @@
               :model-value="obj.photoArr"
               :name="index"
               :after-read="displayPhotosRead"
-              preview-size="78"
+              preview-size="2.13333rem"
               @delete="deletedisplayPhotos">
             </van-uploader>
           </template>
@@ -59,7 +59,7 @@
     <!-- 新增按钮 -->
     <van-button class="add-item"
       type="primary"
-      @click="createTask">新增一组陈列</van-button>
+      @click="createTask">新增一组</van-button>
     <!-- 总体判定 -->
     <div class="overall">
       <p class="title">常规陈列总体判定结果：</p>

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/inspectionTask/tabs/scheduleAdjustment.vue

@@ -34,7 +34,7 @@
               :model-value="obj.photoArr"
               :name="index"
               :after-read="displayPhotosRead"
-              preview-size="78"
+              preview-size="2.13333rem"
               @delete="deletedisplayPhotos">
             </van-uploader>
           </template>
@@ -58,7 +58,7 @@
     <!-- 新增按钮 -->
     <van-button class="add-item"
       type="primary"
-      @click="createTask">新增一组陈列</van-button>
+      @click="createTask">新增一组</van-button>
     <!-- 总体判定 -->
     <!-- <div class="overall">
       <p class="title">档期陈列总体判定结果：</p>

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/inspectionTask/tabs/scheduleDisplay.vue

@@ -34,7 +34,7 @@
               :model-value="obj.photoArr"
               :name="index"
               :after-read="displayPhotosRead"
-              preview-size="78"
+              preview-size="2.13333rem"
               @delete="deletedisplayPhotos">
             </van-uploader>
           </template>
@@ -58,7 +58,7 @@
     <!-- 新增按钮 -->
     <van-button class="add-item"
       type="primary"
-      @click="createTask">新增一组陈列</van-button>
+      @click="createTask">新增一组</van-button>
     <!-- 总体判定 -->
     <div class="overall">
       <p class="title">档期陈列总体判定结果：</p>

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/newTerminal.vue

@@ -25,7 +25,7 @@
                   capture="camera"
                   :model-value="form.storePicture"
                   :after-read="posPhotosRead"
-                  preview-size="78"
+                  preview-size="2.13333rem"
                   @delete="deletePosPhotos">
                 </van-uploader>
               </template>