Browse Source

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

# Conflicts:
#	src/views/week/dailyHistoricalDetails.vue
zhujindu 5 months ago
parent
commit
58fe17fcc1
1 changed files with 9 additions and 21 deletions
  1. 9 21
      src/views/week/dailyHistoricalDetails.vue

+ 9 - 21
src/views/week/dailyHistoricalDetails.vue

@@ -422,15 +422,18 @@
                 <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"
+                  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="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>
@@ -446,21 +449,6 @@
             <div style="padding: 10px 0">
               <van-field readonly v-model="tucReportingSuccessNum" type="digit" />
             </div>
-            <!-- 生动化陈列 sku -->
-            <template v-if="item.photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
-              <el-table
-                :data="item.photoSkuImgSummaryeList"
-                border
-                class="table-headermd"
-                style="width: 100%">
-                <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>
           <!-- 今日未拜访原因 如果不为空则展示,为空则不展示 -->
           <div v-if="reportTarget.notVisitReason && reportTarget.notVisitReason != ''">