手持-大件单复核-已复核、总数调整

src/views/outbound/check/components/CheckPacking.vue

@@ -52,7 +52,7 @@ const beforeClose = (action) =>
     }
     resolve(true)
   })
-const emit = defineEmits(['print','cancelOrder','resetPackingStatus'])
+const emit = defineEmits(['print','cancelOrder','resetPackingStatus','getOrderPacking'])
 const setPacking = () => {
   const groupDetailList = packingList.value.map(items => {
     return {
@@ -82,6 +82,7 @@ const setPacking = () => {
       const qty=groupDetailList.reduce((sum, item) => sum + Number(item.qty), 0)
       const packingItem={ orderNo:orderDetail.value.orderNo, traceId:res.data, qty }
       orderDetail.value.orderPacking.unshift(packingItem)
+      emit('getOrderPacking',orderDetail.value.orderNo)
       // 是否需要打印面单
       if (res.data.includes('#') ) {
         showNotify({ type: 'success', duration: 3000, message: res.data + '已设置不获取新面单'})

src/views/outbound/check/large/index.vue

@@ -36,13 +36,13 @@
             <div  style="text-decoration: underline;color: #0077ff">设置打印机<van-icon name="edit" color="#0077ff"/> </div>
           </div>
           <div class="picking-order-count ">
-            <div>产品数量：
-              <span>{{scanOrderBarcodeCount}}/{{ orderBarcodeCount }}</span>
+            <div>已复核/总复核:
+              <span>{{packingCount}}/{{ orderBarcodeCount+packingCount+scanOrderBarcodeCount }}</span>
             </div>
-            <div>耗材数量：
+            <div>耗材数:
               <span>{{ scanMaterialCount }}/{{ materialCount }}</span>
             </div>
-            <div>已装箱数：
+            <div>已装箱数:
               <span v-if="orderDetail.orderPacking && orderDetail.orderPacking.length>0" style="text-decoration: underline;color: #0077ff" @click="resetPacking" >{{ orderDetail.orderPacking.length }}<van-icon name="arrow-double-right" color="#0077ff" /></span>
               <span v-else>0</span>
             </div>
@@ -114,7 +114,7 @@
       </van-row>
     </van-dialog>
     <!--    装箱-->
-    <check-packing ref="checkPackingRef" @cancelOrder="cancelOrder"  @resetPackingStatus="resetPackingStatus"  @print="print"/>
+    <check-packing ref="checkPackingRef" @cancelOrder="cancelOrder"  @resetPackingStatus="resetPackingStatus" @getOrderPacking="_getOrderPacking"  @print="print"/>
     <!--    批量装箱-->
     <batch-packing ref="batchPackingRef"   @print="print" @loadData="loadData" />
     <!--    重置装箱-->
@@ -150,7 +150,7 @@ onMounted(() => {
   loadData()
 })
 const warehouse = store.warehouse
-const orderNo = ref('')
+const orderNo = ref('SOZ25080700001')
 // 错误提示
 const tips = ref('请扫描订单/快递单号')
 //强制返回
@@ -198,20 +198,27 @@ const orderList = computed(() => {
 const orderBarcodeCount = computed(() => {
   return dataList.value.reduce((sum, item) => {
     if (item.qtyOrdered != null) {
-      return sum + Number(item.oldQty)
+      return sum + Number(item.qty)
     }
     return sum
   }, 0)
 })
+//装箱总数
+const packingCount = computed(() => {
+  return packingList.value.reduce((sum, item) => sum + (+item.qty || 0), 0);
+})
+
+//
 //扫描订单产品总数
 const scanOrderBarcodeCount = computed(() => {
   return dataList.value.reduce((sum, item) => {
     if (item.qtyOrdered != null) {
-      return sum + Number(item.oldQuantity)
+      return sum + Number(item.quantity)
     }
     return sum
   }, 0)
 })
+
 //耗材总数
 const materialCount = computed(() => {
   return dataList.value.reduce((sum, item) => {
@@ -569,9 +576,11 @@ const _reversePicking = () => {
     closeLoading()
   })
 }
+const packingList=ref([])
 const _getOrderPacking=(orderNo,type)=>{
   showLoading()
-  getOrderPacking({ warehouse, orderNo }).then(res => {
+  getOrderPacking({ warehouse, code:orderNo }).then(res => {
+    packingList.value=res.data
     const mergedList = Object.values(
       res.data.reduce((acc, item) => {
         const { sku, traceId, qty } = item