From e26390563edb91f9f1af687812924086c70a109c Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 25 Sep 2024 15:19:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/drug/drugAdd.vue      |  6 +++---
 src/views/basic/product/drug/drugMaintain.vue |  2 +-
 src/views/collect/IoCreateOrder.vue           | 12 ++++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 70d5d4a4..0d79d960 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -705,17 +705,17 @@ export default {
         if (response.code == 20000) {
           this.ybDrugDetail = response.data
           //对照关系
-          this.newProductData.prepnSpec  = this.ybDrugDetail.realityMedicinemodel
+          this.newProductData.prepnSpec  = this.ybDrugDetail.realityOutlook
           this.newProductData.zczbhhzbapzbh  = this.ybDrugDetail.approvalCode
           this.newProductData.cpmctymc  = this.ybDrugDetail.registeredProductName
           this.newProductData.spmc  = this.ybDrugDetail.goodsName
-          this.newProductData.bzgg  = this.ybDrugDetail.registeredOutlook
+          this.newProductData.bzgg  = this.ybDrugDetail.factor + this.ybDrugDetail.minUnit + "/" + this.ybDrugDetail.unit
           this.newProductData.matrial  = this.ybDrugDetail.materialName
           this.newProductData.packMatrial  = this.ybDrugDetail.materialName
           this.newProductData.packUnit  = this.ybDrugDetail.unit
           this.newProductData.bhxjsl  = this.ybDrugDetail.factor
           this.newProductData.manufactory  = this.ybDrugDetail.companyNameSc
-          this.newProductData.prepnUnit  = this.ybDrugDetail.minUnit
+          this.newProductData.prepnUnit  = this.ybDrugDetail.realityMedicinemodel
 
           if (this.ybDrugDetail.productInsuranceType != "" && this.ybDrugDetail.productInsuranceType != null){
             if ("甲" == this.ybDrugDetail.productInsuranceType) {
diff --git a/src/views/basic/product/drug/drugMaintain.vue b/src/views/basic/product/drug/drugMaintain.vue
index cdbe7162..69d3ac34 100644
--- a/src/views/basic/product/drug/drugMaintain.vue
+++ b/src/views/basic/product/drug/drugMaintain.vue
@@ -86,7 +86,7 @@
           <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
           <!--<el-button type="primary" icon="el-icon-plus" @click="chooseDrug">选入药品信息</el-button>-->
           <el-button type="primary" icon="el-icon-plus" @click="chooseHouseDrug">添加院内药品</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="addDrug">新增药品信息</el-button>
+<!--          <el-button type="primary" icon="el-icon-plus" @click="addDrug">新增药品信息</el-button>-->
         </el-button-group>
       </div>
 
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index aba06ddd..01c1dea0 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -1314,6 +1314,12 @@ export default {
     },
 
     refreshCodesPanel() {
+      this.warnResult = "";
+      this.errResult = "";
+      this.result = "";
+      this.warnVisible = false;
+      this.errVisible = false;
+
       this.isCodeAlive = false;
       this.isBizDetailAlive = false;
       this.isCodeDetailAlive = false;
@@ -1633,6 +1639,12 @@ export default {
       }
     },
     enterKey(event) {
+      this.warnResult = "";
+      this.errResult = "";
+      this.result = "";
+      this.warnVisible = false;
+      this.errVisible = false;
+
       this.checkSuccess = true;
       if (this.getDMHotskeyValue(this.scanCode))
         return