From 405dfd2d764fca43f598597125bb7057d676b3bb Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 6 Jan 2025 18:42:13 +0800
Subject: [PATCH] =?UTF-8?q?1/6=20=E6=89=AB=E7=A0=81=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue         | 11 +++++++++++
 src/views/collect/PanelCreateCodeDetail.vue |  8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 01bb6c3b..c7164141 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -9,12 +9,17 @@
     >
       <el-card>
         <el-row style="margin-bottom: 8px">
+          <div v-if="scanReCount > 0">
+            <span style="font-size: 18px;font-weight: bold;color: red" >扫码总数量:</span>
+            <span style="font-size: 18px;font-weight: bold;color: red">{{ scanReCount }}</span>
+          </div>
           <span style="font-size: 18px;font-weight: bold;color: red"
                 v-if="redMesg && this.splitType == 'out'">请先扫取货槽编码</span>
           <span style="font-size: 18px;font-weight: bold">{{ curQueueName }}</span>
           <el-button-group
             style="display: flex; margin-top: 5px; float: right"
           >
+
             <el-button size="mini" type="primary" @click.native="deleteCode" :loading="submitLoading"
                        v-if="splitType=='out' && labelName == 1" style="margin-right: 8px;border-radius: 5%;"
                        v-show="isLinkDisabled" :disabled="orderFormData.billNo == null"
@@ -227,6 +232,7 @@
           v-if="isCodeDetailAlive"
           @clearBillNo="clearBillNo"
           @getOrderData="getOrderData"
+          @getCount="getCount"
         ></codeDetailPanel>
       </el-tab-pane>
       <el-tab-pane label="扫码明细" v-if="viewCodeDetailVisible">
@@ -604,6 +610,7 @@ export default {
       scanStatus: null, // 1:扫码剔除
       codeArray: [],
       curQueueName: "",
+      scanReCount: 0,
       curQueue: null,
       redMesg: false,
       redMesgOld: false,
@@ -683,6 +690,7 @@ export default {
       this.curQueueName = '';
       this.redMesg = this.redMesgOld
       this.orderStatus = false
+      this.scanReCount = 0
       this.refreshCodesPanel()
     },
     //获取用户仓库列表
@@ -1293,6 +1301,9 @@ export default {
       this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")"
       this.orderStatus = true
     },
+    getCount(count){
+      this.scanReCount = count
+    },
 
     refreshOrder(orderQuery) {
       this.orderFormData = orderQuery
diff --git a/src/views/collect/PanelCreateCodeDetail.vue b/src/views/collect/PanelCreateCodeDetail.vue
index 78f3cf6c..7cba7856 100644
--- a/src/views/collect/PanelCreateCodeDetail.vue
+++ b/src/views/collect/PanelCreateCodeDetail.vue
@@ -103,6 +103,7 @@ export default {
       this.query.orderId = this.idQuery.billNo;
       getDetailCodes(this.query) //查找该单号下的所有条码
         .then((response) => {
+
           this.detailList = response.data.list || [];
           this.total = response.data.total || 0;
           this.loading = false;
@@ -111,6 +112,13 @@ export default {
             this.$emit('getOrderData',  this.orderDetail)
           }
           this.$emit('clearBillNo', this.detailList.length > 0? false : true);
+          let count = 0;
+          if (this.detailList && this.detailList.length > 0) {
+            this.detailList.forEach(item => {
+              count += item.reCount;
+            });
+            this.$emit('getCount', count);
+          }
         })
         .catch(() => {
           this.loading = false;