Merge branch 'release' into dev

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

@@ -27,8 +27,8 @@
           <div class="terminal-info">
 
             <p>终端编码：{{ form.storeCode }}</p>
-            <p>经销商：{{ form.dealerName }}</p>
-            <p>地址：{{ form.address }}</p>
+            <p>经销商：{{ form.dealersName }}</p>
+            <p>地址：{{ form.storeAddr }}</p>
           </div>
         </div>
 
@@ -201,8 +201,8 @@ const form = reactive({ // 当前页信息总对象
   storePicture: route.query.storePicture, // 门店照片（原始门店照片,来自于上一页的接口）
   storeName: route.query.storeName, // 门店名称
   storeCode: route.query.storeCode, // 门店编码
-  dealersName: '', // 经销商名称
-  storeAddr: '', // 门店地址
+  dealersName: route.query.dealersName, // 经销商名称
+  storeAddr: route.query.storeAddr, // 门店地址
   lhldArr: [], // 其他-礼盒礼袋是否在售
   skuNum: '', // 我品 SKU 总数
   remark: '', // 备注
@@ -221,7 +221,7 @@ const getInspectionTaskDetailFn = async () => {
   })
   if (res.data) {
     Object.assign(form, res.data)
-    const { storeName, lhldArr, longTimePictureArr, storePicture, storeType, skuNum, cgclRiskRArr, dqclRiskRArr } = res.data
+    const { storeName, lhldArr, longTimePictureArr, storePicture, storeType, skuNum, cgclRiskRArr, dqclRiskRArr, dealerName, storeAddr } = res.data
     // 终端门店照片一直应该是路由上的照片参数，如果路由上没有门头照证明上一个页面列表里这个门店就本身没有照片，那就用门头照拍摄的
     if (route.query.storePicture) form.storePicture = route.query.storePicture
     // 详情接口有门头照照片，需要设置到特有的属性commitStorePicture
@@ -230,6 +230,10 @@ const getInspectionTaskDetailFn = async () => {
     }]
     // 详情接口门店名称如果是空的就用路由传递的
     if (!storeName) form.storeName = route.query.storeName
+    // 详情接口经销商名称和门店地址是空的就用路由传递的
+    if (!dealerName) form.dealersName = route.query.dealersName
+    else form.dealersName = dealerName
+    if (!storeAddr) form.storeAddr = route.query.storeAddr
     if (!lhldArr) form.lhldArr = []
 
     if (!longTimePictureArr) form.longTimePictureArr = []

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

@@ -130,7 +130,9 @@ const handleClickStore = (item) => {
       query: {
         storeName: item.storeName,
         storeCode: item.storeCode,
-        storePicture: item.storePictures?.split(",")[0]
+        storePicture: item.storePictures?.split(",")[0],
+        dealersName: item.dealersName,
+        storeAddr: item.storeAddr,
       }
     })
   })