Merge branch 'feature_20250704_陈列SKU图片识别' into uat(dev)

# Conflicts:
#	src/views/week/dailyDetails.vue

src/views/week/dailyDetails.vue

@@ -428,15 +428,19 @@
                   <van-icon size="28" :name="item.visitIMG1Flag ? 'arrow-up' : 'arrow-down'" />
                 </div>
                 <!-- 生动化陈列 sku -->
-                <template v-if="photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
-                  <!-- <div class="skuNum">SKU识别：{{ item.num }}个</div> -->
+                <template
+                  v-if="item.photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
                   <el-table
-                    :data="item.productDetail"
+                    :data="item.photoSkuImgSummaryeList"
                     border
                     class="table-headermd table-headermdhome"
                     style="width: 100%">
-                    <el-table-column label="SKU名称" prop="name" align="center" />
-                    <el-table-column label="数量" prop="cont" width="80px" align="center" />
+                    <el-table-column label="门店名称（编号）" prop="name" align="center">
+                      <template slot-scope="scope">
+                        {{ scope.row.name }}({{ scope.row.code }})
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="数量" prop="count" width="80px" align="center" />
                   </el-table>
                 </template>
               </div>

src/views/week/dailyHistoricalDetails.vue

@@ -449,7 +449,6 @@
             <<<<<<< HEAD =======
             <!-- 生动化陈列 sku -->
             <template v-if="item.photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
-              <!-- <div class="skuNum">SKU识别：{{ item.num }}个</div> -->
               <el-table
                 :data="item.photoSkuImgSummaryeList"
                 border