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

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

src/views/week/dailyApproval.vue

@@ -392,15 +392,15 @@
               <van-icon size="28" :name="item.visitIMG1Flag ? 'arrow-up' : 'arrow-down'" />
             </div>
             <!-- 生动化陈列 sku -->
-            <template v-if="photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
+            <template v-if="item.photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
               <!-- <div class="skuNum">SKU识别：{{ item.num }}个</div> -->
               <el-table
-                :data="item.productDetail"
+                :data="item.photoSkuImgSummaryeList"
                 border
-                class="table-headermd table-headermdhome"
+                class="table-headermd"
                 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="count" width="80px" align="center" />
               </el-table>
             </template>
           </div>
@@ -884,4 +884,9 @@ export default {
   height: 75px;
   border-radius: 6px;
 }
+
+.table-headermd th.el-table__cell {
+  background-color: #1989fa;
+  color: #fff;
+}
 </style>

src/views/week/dailyDetails.vue

@@ -1053,4 +1053,9 @@ export default {
 .notifyIndex {
   z-index: 999999 !important;
 }
+
+.table-headermd th.el-table__cell {
+  background-color: #1989fa;
+  color: #fff;
+}
 </style>

src/views/week/dailyHistoricalDetails.vue

@@ -446,6 +446,20 @@
             <div style="padding: 10px 0">
               <van-field readonly v-model="tucReportingSuccessNum" type="digit" />
             </div>
+            <<<<<<< HEAD =======
+            <!-- 生动化陈列 sku -->
+            <template v-if="item.photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
+              <!-- <div class="skuNum">SKU识别：{{ item.num }}个</div> -->
+              <el-table
+                :data="item.photoSkuImgSummaryeList"
+                border
+                class="table-headermd"
+                style="width: 100%">
+                <el-table-column label="SKU名称" prop="name" align="center" />
+                <el-table-column label="数量" prop="count" width="80px" align="center" />
+              </el-table>
+            </template>
+            >>>>>>> feature_20250704_陈列SKU图片识别
           </div>
           <!-- 今日未拜访原因 如果不为空则展示，为空则不展示 -->
           <div v-if="reportTarget.notVisitReason && reportTarget.notVisitReason != ''">
@@ -1234,4 +1248,8 @@ export default {
 .notifyIndex {
   z-index: 999999 !important;
 }
+.table-headermd th.el-table__cell {
+  background-color: #1989fa;
+  color: #fff;
+}
 </style>