11/11 取货操增加药品名称 业务单增加单据类型1器械2药品

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 = '';

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)