Browse Source

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

# Conflicts:
#	src/views/week/dailyHistoricalDetails.vue
zhujindu 5 months ago
parent
commit
e6545782da
1 changed files with 0 additions and 2 deletions
  1. 0 2
      src/views/week/dailyHistoricalDetails.vue

+ 0 - 2
src/views/week/dailyHistoricalDetails.vue

@@ -446,7 +446,6 @@
             <div style="padding: 10px 0">
             <div style="padding: 10px 0">
               <van-field readonly v-model="tucReportingSuccessNum" type="digit" />
               <van-field readonly v-model="tucReportingSuccessNum" type="digit" />
             </div>
             </div>
-            <<<<<<< HEAD =======
             <!-- 生动化陈列 sku -->
             <!-- 生动化陈列 sku -->
             <template v-if="item.photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
             <template v-if="item.photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
               <el-table
               <el-table
@@ -462,7 +461,6 @@
                 <el-table-column label="数量" prop="count" width="80px" align="center" />
                 <el-table-column label="数量" prop="count" width="80px" align="center" />
               </el-table>
               </el-table>
             </template>
             </template>
-            >>>>>>> feature_20250704_陈列SKU图片识别
           </div>
           </div>
           <!-- 今日未拜访原因 如果不为空则展示,为空则不展示 -->
           <!-- 今日未拜访原因 如果不为空则展示,为空则不展示 -->
           <div v-if="reportTarget.notVisitReason && reportTarget.notVisitReason != ''">
           <div v-if="reportTarget.notVisitReason && reportTarget.notVisitReason != ''">