Merge remote-tracking branch 'origin/dev' into dev

src/views/order/podCN/PodMakeOrder.vue

@@ -143,12 +143,27 @@
               {{ boxIndex }}
               {{ boxIndex }}
             </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?.purchaseNumber }}
+              </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
@@ -410,7 +425,12 @@ watch(
 )
 )
 
 
 const podBoxIndex = computed(() => orderStore.podBoxIndex)
 const podBoxIndex = computed(() => orderStore.podBoxIndex)
-
+const pickFlag = computed(() => {
+  if (podOrderDetailsData.value?.productList) {
+    return podOrderDetailsData.value?.productList.every((item) => item.power)
+  }
+  return false
+})
 let renderLock = false
 let renderLock = false
 
 
 const renderItemBox = (bool: boolean) => {
 const renderItemBox = (bool: boolean) => {