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

src/views/historicalVisit/skuRecognize.vue

@@ -30,14 +30,14 @@
           style="width: 100%; border-radius: 10px"
           border
           class="table-headermd">
-          <el-table-column label="序号" type="index" align="center"> </el-table-column>
+          <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="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="60"></el-table-column>
+          <el-table-column label="排面数" prop="count" align="center" width="70"></el-table-column>
         </el-table>
       </div>
       <!-- 返回历史 -->
@@ -172,6 +172,7 @@ export default {
     .title {
       font-size: 16px;
       padding-bottom: 10px;
+      font-weight: bold;
     }
     .tipsTitle {
       font-size: 12px;
@@ -182,6 +183,7 @@ export default {
       font-size: 16px;
       font-weight: bold;
       background: #f5f5f5;
+      margin: 15px 0;
     }
     .skuDeatil {
     }
@@ -239,13 +241,18 @@ export default {
     .feedbackContent {
       flex: 1;
       overflow-y: auto;
+      .van-field__control {
+        color: #666 !important;
+      }
     }
     .btnBox {
+      margin-bottom: 10px;
       height: 44px;
       display: flex;
       justify-content: space-between;
       button {
         width: 45%;
+        border-radius: 10px;
       }
     }
   }
@@ -254,20 +261,31 @@ export default {
 <style lang="scss">
 .skuDeatil {
   .table-headermd {
-    font-size: 12px;
+    font-size: 14px;
     text-align: center;
     position: initial;
     width: 98% !important;
     margin: 0 auto;
     border-right: 0;
-    border-radius: 10px;
+    border-radius: 8px;
+    font-weight: bold;
+    thead {
+      color: #000;
+    }
     .el-table__cell {
       padding: 6px 0 !important;
     }
   }
   .table-headermd th.el-table__cell {
-    background-color: #1989fa;
-    color: #fff;
+    background-color: #f5f5f5;
+  }
+}
+.feedbackMsgBox {
+  .van-cell {
+    border: 1px solid #ccc;
+  }
+  .van-field__control {
+    color: #666;
   }
 }
 </style>

src/views/week/dailyApproval.vue

@@ -405,23 +405,24 @@
                 <van-icon size="14" :name="require('@/assets/Icon/arrow-down.png')" />
               </template>
             </div>
-            <!-- 生动化陈列 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="门店名称（编号）" 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>
+          <!-- 生动化陈列 sku -->
+          <template
+            v-if="
+              reportTarget.photoSkuImgSummaryeList && reportTarget.photoSkuImgSummaryeList.length
+            ">
+            <!-- <div class="skuNum">SKU识别：{{ reportTarget.num }}个</div> -->
+            <el-table
+              :data="reportTarget.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>
         </van-collapse-item>
       </van-collapse>
       <div class="contentContainer">

src/views/week/dailyDetails.vue

@@ -425,22 +425,25 @@
                   <van-icon size="14" :name="require('@/assets/Icon/arrow-down.png')" />
                 </template>
               </div>
-              <!-- 生动化陈列 sku -->
-              <template v-if="item.photoSkuImgSummaryeList && item.photoSkuImgSummaryeList.length">
-                <el-table
-                  :data="item.photoSkuImgSummaryeList"
-                  border
-                  class="table-headermd table-headermdhome"
-                  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>
+            <!-- 生动化陈列 sku -->
+            <template
+              v-if="
+                reportTarget.photoSkuImgSummaryeList && reportTarget.photoSkuImgSummaryeList.length
+              ">
+              <el-table
+                :data="reportTarget.photoSkuImgSummaryeList"
+                border
+                class="table-headermd table-headermdhome"
+                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>
           </van-collapse-item>
         </van-collapse>
         <div class="contentContainer">

src/views/week/dailyHistoricalDetails.vue

@@ -438,22 +438,25 @@
                   <van-icon size="14" :name="require('@/assets/Icon/arrow-down.png')" />
                 </template>
               </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>
+            <!-- 生动化陈列 sku   -->
+            <template
+              v-if="
+                reportTarget.photoSkuImgSummaryeList && reportTarget.photoSkuImgSummaryeList.length
+              ">
+              <el-table
+                :data="reportTarget.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>
           </van-collapse-item>
         </van-collapse>
         <div class="contentContainer">