Merge branch 'feature_20260513_新建专业五金店' into uat(dev)

src/views/signApproval/newStoreApprovalDetail.vue

@@ -688,6 +688,8 @@ export default {
       getDisplayPhotoIdentify({ storeCode: storeCode }).then((res) => {
         if (res.code == 200) {
           this.photoIdentify = res.data.skuList || [];
+        } else {
+          this.photoIdentify = [];
         }
       });
     },

src/views/storeManagement/storeDetail.vue

@@ -310,11 +310,23 @@
                 :type="1"></upload-img>
             </van-col>
           </van-row> -->
-          <van-collapse
-            v-model="activeNames"
-            class="orderList"
-            v-if="list.approvalStatus == 0 && cityABStore && orderList.length">
-            <van-collapse-item title="门店下单记录" name="1">
+          <van-collapse v-model="activeNames" class="orderList">
+            <van-collapse-item title="门店陈列照识别结果" name="0" v-if="photoIdentify.length">
+              <div class="orderItem">
+                <el-table
+                  :data="photoIdentify"
+                  border
+                  class="table-headermd table-headermdhome"
+                  style="width: 100%">
+                  <el-table-column label="产品名称" prop="name" />
+                  <el-table-column label="排面数" prop="count" width="80px" />
+                </el-table>
+              </div>
+            </van-collapse-item>
+            <van-collapse-item
+              title="门店下单记录"
+              name="1"
+              v-if="list.approvalStatus == 0 && cityABStore && orderList.length">
               <div class="orderItem" v-for="(item, index) in orderList" :key="index">
                 <div class="orderTitle">
                   {{ item.ORDERID }} | {{ item.ORDERDATE }} | {{ item.STATUS_DESCR }}
@@ -600,6 +612,7 @@ import {
   submitApproval,
   storeApprovaHistory,
   buryingPoint,
+  getDisplayPhotoIdentify,
 } from '@/api/index';
 import mapmarker from '@/components/mapMarker';
 import viewUploadImg from '@/components/viewUploadImg';
@@ -698,6 +711,7 @@ export default {
       progressFlag: false,
       percentage: 0,
       timeFlag: null,
+      photoIdentify: [],
     };
   },
   watch: {
@@ -1512,6 +1526,7 @@ export default {
               this.getStoreOrderList(this.list.storeCode);
               // 获取审批历史
               this.storeApprovaHistoryFun();
+              this.getDisplayPhotoIdentifyFun(this.list.storeCode);
             }
           } else {
             this.$toast.fail(res.msg);
@@ -1561,6 +1576,15 @@ export default {
         }
       });
     },
+    getDisplayPhotoIdentifyFun(storeCode) {
+      getDisplayPhotoIdentify({ storeCode: storeCode }).then((res) => {
+        if (res.code == 200) {
+          this.photoIdentify = res.data.skuList || [];
+        } else {
+          this.photoIdentify = [];
+        }
+      });
+    },
     getSummaries(param) {
       const { columns, data } = param;
       const sums = [];