From fc04c2547d854d28fa4cea776aebaef5298ce095 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 11 Nov 2024 20:24:31 +0800
Subject: [PATCH] =?UTF-8?q?11/11=20=20=E5=8F=96=E8=B4=A7=E6=93=8D=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=8D=AF=E5=93=81=E5=90=8D=E7=A7=B0=20=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B1=E5=99=A8=E6=A2=B02=E8=8D=AF=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue         | 8 +++++++-
 src/views/inoutDrug/DialogSelectProduct.vue | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index d266d347..e2d22897 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -2040,7 +2040,13 @@ export default {
           this.loading = false;
           if (response.code == 20000) {
             this.curQueue = response.data;
-            this.curQueueName = "当前取货槽:"  + this.curQueue.code
+            this.productName = this.curQueue.cpmctymc
+            if (isBlank(this.productName)){
+              this.curQueueName = "当前取货槽:"  + this.curQueue.code
+            }else {
+              this.curQueueName = "当前取货槽:"  + this.productName + "(" + this.curQueue.code + ")"
+            }
+
             this.redMesg = false
             this.orderFormData.workPlaceQueueCode = this.curQueue.code
             this.scanCode = '';
diff --git a/src/views/inoutDrug/DialogSelectProduct.vue b/src/views/inoutDrug/DialogSelectProduct.vue
index 3c897a1f..f2cf3109 100644
--- a/src/views/inoutDrug/DialogSelectProduct.vue
+++ b/src/views/inoutDrug/DialogSelectProduct.vue
@@ -321,6 +321,7 @@ export default {
         supId: this.currentRow.customerId,
         zczbhhzbapzbh: this.currentRow.zczbhhzbapzbh,
         orderEntity: this.data,
+        productType:2
       }
       this.loading = true;
       addBizProduct(data)