Merge branch 'dev' into 'master'

feat: 超级播种墙配齐订单显示已配齐

See merge request !128

src/views/order/podCN/SuperPodMakeOrder.vue

@@ -103,8 +103,8 @@
                     ? row.previewImgs
                     ? row.previewImgs
                     : [{ url: row.variantImage }]"
                     : [{ url: row.variantImage }]"
                   :key="img"
                   :key="img"
-                  @click.stop="handleCurrentChange(img.url)"
                   style="cursor: pointer; margin-right: 5px; flex: 1"
                   style="cursor: pointer; margin-right: 5px; flex: 1"
+                  @click.stop="handleCurrentChange(img.url)"
                 >
                 >
                   <img v-if="img.url" :src="img.url" alt="" />
                   <img v-if="img.url" :src="img.url" alt="" />
                 </div>
                 </div>
@@ -128,12 +128,30 @@
             </span>
             </span>
             <span class="box-top-item-box-index-text">号箱</span>
             <span class="box-top-item-box-index-text">号箱</span>
 
 
-            <span style="font-size: 30px">放入第</span>
-            <div class="box-top-item-box-index-number">
-              {{ podOrderDetailsData?.pickingNumber }}
-            </div>
-            <span style="font-size: 30px">件商品</span>
+            <template v-if="pickFlag">
+              <strong
+                style="
+                  font-size: 60px;
+                  color: #00ff00;
+                  display: inline-block;
+                  text-align: center;
+                  width: 90px;
+                "
+              >
+                {{ podOrderDetailsData?.pickingNumber }}
+              </strong>
+              <span style="font-size: 30px">{{ '件已配齐' }}</span>
+            </template>
+
+            <template v-else>
+              <span style="font-size: 30px">放入第</span>
+              <div class="box-top-item-box-index-number">
+                {{ podOrderDetailsData?.pickingNumber }}
+              </div>
+              <span style="font-size: 30px">件商品</span>
+            </template>
           </div>
           </div>
+
           <div class="box-top-item-status">
           <div class="box-top-item-status">
             <span
             <span
               v-if="
               v-if="
@@ -146,7 +164,7 @@
               <span v-if="podOrderDetailsData?.printResult">
               <span v-if="podOrderDetailsData?.printResult">
                 面单{{ renderPrintResult(podOrderDetailsData?.printResult) }}
                 面单{{ renderPrintResult(podOrderDetailsData?.printResult) }}
               </span>
               </span>
-              <span v-else>面单打印中。。。</span>
+              <span v-else>The receipt is being printed。。。</span>
             </span>
             </span>
             <span v-else>验货中。。。</span>
             <span v-else>验货中。。。</span>
           </div>
           </div>
@@ -401,6 +419,19 @@ watch(
 
 
 const podBoxIndex = computed(() => orderStore.podBoxIndex)
 const podBoxIndex = computed(() => orderStore.podBoxIndex)
 
 
+// 判断订单是否已配齐
+const pickFlag = computed(() => {
+  if (
+    podOrderDetailsData.value?.productList &&
+    podOrderDetailsData.value.productList.length > 0
+  ) {
+    return podOrderDetailsData.value.productList.every((item) => {
+      return item.power
+    })
+  }
+  return false
+})
+
 let renderLock = false
 let renderLock = false
 
 
 const renderItemBox = (bool: boolean) => {
 const renderItemBox = (bool: boolean) => {
@@ -1078,8 +1109,6 @@ const handleCurrentChange = (url: string) => {
   position: relative;
   position: relative;
   overflow-y: auto;
   overflow-y: auto;
   overflow-x: hidden;
   overflow-x: hidden;
-  flex: 1;
-  min-height: 0;
 }
 }
 .box-list-item {
 .box-list-item {
   position: relative;
   position: relative;