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

src/views/historicalVisit/historicalDetails.vue

@@ -93,24 +93,28 @@
           <p style="text-align: right">点评时间:{{ managerRemarkContents[0].createTime }}</p>
         </van-collapse-item>
       </van-collapse>
-      <div style="padding: 10px 16px; font-size: 16px; font-weight: bold">SKU图像识别结果</div>
-      <div class="card" v-if="list.isSku == '是'">
-        <div class="info" @click="toSkuRecognize">
-          <p
-            style="
-              width: 94%;
-              margin: 0;
-              line-height: 24px;
-              padding: 10px 0;
-              display: inline-block;
-            ">
-            拍摄的所有产品陈列照识别结果
-          </p>
-          <p class="arrowdetils1">
-            <van-icon name="arrow" />
-          </p>
+      <template v-if="list.isSku == '是'">
+        <div style="padding: 10px 16px; font-size: 16px; font-weight: bold">SKU图像识别结果</div>
+        <div class="card">
+          <div class="info" @click="toSkuRecognize">
+            <p
+              style="
+                width: 94%;
+                margin: 0;
+                line-height: 24px;
+                padding: 10px 0;
+                display: inline-block;
+              ">
+              拍摄的所有产品陈列照识别结果<span v-if="list.skuTotal" style="color: red"
+                >({{ list.skuTotal }})</span
+              >
+            </p>
+            <p class="arrowdetils1">
+              <van-icon name="arrow" />
+            </p>
+          </div>
         </div>
-      </div>
+      </template>
       <div style="padding: 10px 16px; font-size: 16px; font-weight: bold">任务</div>
       <div class="card" v-if="list.visitSource != 2">
         <div

src/views/historicalVisit/skuRecognize.vue

@@ -30,14 +30,18 @@
           style="width: 100%; border-radius: 10px"
           border
           class="table-headermd">
-          <el-table-column label="序号" type="index" align="center" width="50"> </el-table-column>
-          <el-table-column label="品类" prop="skuProductType" align="center"></el-table-column>
+          <el-table-column label="序号" type="index" align="center" width="40"> </el-table-column>
+          <el-table-column
+            label="品类"
+            prop="skuProductType"
+            align="center"
+            width="60"></el-table-column>
           <el-table-column label="SKU名称" prop="name" align="center">
             <template slot-scope="scope">
               <span class="tipTitle">{{ scope.row.name }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="排面数" prop="count" align="center" width="70"></el-table-column>
+          <el-table-column label="排面数" prop="count" align="center" width="50"></el-table-column>
         </el-table>
       </div>
       <!-- 返回历史 -->
@@ -277,6 +281,9 @@ export default {
     }
     .el-table__cell {
       padding: 6px 0 !important;
+      .cell {
+        padding: 0;
+      }
     }
   }
   .table-headermd th.el-table__cell {

src/views/week/dailyApproval.vue

@@ -411,16 +411,20 @@
             v-if="
               reportTarget.photoSkuImgSummaryeList && reportTarget.photoSkuImgSummaryeList.length
             ">
+            <p style="padding: 10px 0; font-size: 14px; color: #1e5398; font-weight: 500">
+              SKU陈列照识别结果
+            </p>
             <!-- <div class="skuNum">SKU识别：{{ reportTarget.num }}个</div> -->
             <el-table
               :data="reportTarget.photoSkuImgSummaryeList"
               border
               class="table-headermd"
               style="width: 100%">
+              <el-table-column label="序号" type="index" width="50px" />
               <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-column label="SKU数量" prop="count" width="80px" align="center" />
             </el-table>
           </template>
         </van-collapse-item>

src/views/week/dailyDetails.vue

@@ -431,11 +431,15 @@
               v-if="
                 reportTarget.photoSkuImgSummaryeList && reportTarget.photoSkuImgSummaryeList.length
               ">
+              <p style="padding: 10px 0; font-size: 14px; color: #1e5398; font-weight: 500">
+                SKU陈列照识别结果
+              </p>
               <el-table
                 :data="reportTarget.photoSkuImgSummaryeList"
                 border
                 class="table-headermd table-headermdhome"
                 style="width: 100%">
+                <el-table-column label="序号" type="index" width="50px" />
                 <el-table-column label="门店名称（编号）" prop="name" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.name }}({{ scope.row.code }})

src/views/week/dailyHistoricalDetails.vue

@@ -444,11 +444,15 @@
               v-if="
                 reportTarget.photoSkuImgSummaryeList && reportTarget.photoSkuImgSummaryeList.length
               ">
+              <p style="padding: 10px 0; font-size: 14px; color: #1e5398; font-weight: 500">
+                SKU陈列照识别结果
+              </p>
               <el-table
                 :data="reportTarget.photoSkuImgSummaryeList"
                 border
                 class="table-headermd"
                 style="width: 100%">
+                <el-table-column label="序号" type="index" width="50px" />
                 <el-table-column label="门店名称（编号）" prop="name" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.name }}({{ scope.row.code }})