From edaaac3c81782918076829e7d9489b839c84fc3b Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Wed, 25 Sep 2024 15:00:53 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 4c5af532..aba06ddd 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -24,18 +24,17 @@
             >选入单据
             </el-button>
             <el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
-                       v-show="isLinkDisabled"
-                       v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
+                       v-show="isLinkDisabled" style="margin-right: 8px;border-radius: 5%;"
             >保存
             </el-button>
             <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
                        v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
             >上货完成
             </el-button>
-            <el-button size="mini" type="primary" @click.native="" :loading="submitLoading" v-show="isLinkDisabled"
+            <!-- <el-button size="mini" type="primary" @click.native="" :loading="submitLoading" v-show="isLinkDisabled"
                        v-if="splitType=='return'" style="margin-right: 8px;border-radius: 5%;"
             >保存
-            </el-button>
+            </el-button> -->
             <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
                        v-if="splitType=='return'" style="margin-right: 8px;border-radius: 5%;"
             >退货完成

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 2/4] =?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

From 95ea5308f521e199eb68f89150191bd6560c1871 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Wed, 25 Sep 2024 16:27:41 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/drug/drugAdd.vue | 31 ++++++++++++------------
 src/views/basic/product/productEdit.vue  |  1 +
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 0d79d960..08459ada 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -399,6 +399,7 @@
                 <el-select v-model="newProductData.useLevelDi" size="small" style="width: 90%"
                            @change="useLevelDiChange"
                            clearable
+                           disabled
                            placeholder="请选择流通计量层级标识"
                 >
                   <el-option
@@ -705,19 +706,19 @@ export default {
         if (response.code == 20000) {
           this.ybDrugDetail = response.data
           //对照关系
-          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.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.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.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.realityMedicinemodel
 
-          if (this.ybDrugDetail.productInsuranceType != "" && this.ybDrugDetail.productInsuranceType != null){
+          if (this.ybDrugDetail.productInsuranceType != "" && this.ybDrugDetail.productInsuranceType != null) {
             if ("甲" == this.ybDrugDetail.productInsuranceType) {
               this.newProductData.medicareType = 1
             } else if ("乙" == this.ybDrugDetail.productInsuranceType) {
@@ -727,7 +728,7 @@ export default {
             } else {
               this.newProductData.medicareType = null
             }
-            console.log( this.newProductData.medicareType)
+            console.log(this.newProductData.medicareType)
 
           }
 
@@ -924,8 +925,8 @@ export default {
         let query = {
           uuid: this.newProductData.uuid,
           id: this.newProductData.id,
-          nameCode:this.newProductData.nameCode,
-          productType:this.newProductData.productsType,
+          nameCode: this.newProductData.nameCode,
+          productType: this.newProductData.productsType,
         }
         this.loading = true
         filterByUuid(query)
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index dac94c47..1de7d5e4 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -808,6 +808,7 @@
                   <el-select v-model="editQuery.useLevelDi" size="small" style="width: 90%"
                              @change="useLevelDiChange"
                              clearable
+                             disabled
                              placeholder="请选择流通计量层级标识">
                     <el-option
                       v-for="item in detailList"

From d7c5048e9830c44f1103ab46bb97d7d36f589bbf Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Wed, 25 Sep 2024 16:43:44 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8A=E8=B4=A7=E9=80=80=E8=B4=A7=20?=
 =?UTF-8?q?=E9=80=89=E5=85=A5=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 01c1dea0..6cea02fe 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -20,7 +20,7 @@
             >选入已完成单据
             </el-button>
             <el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
-                       v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
+                       style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
             >选入单据
             </el-button>
             <el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
@@ -1588,6 +1588,7 @@ export default {
       }
       this.rowData.workPlaceCode = this.orderFormData.workPlaceCode
       this.rowData.fifoSplit = this.orderFormData.fifoSplit
+      this.$router.push({query: {...this.$route.query, splitType: this.splitType}, path: this.$route.path})
       this.chooseDraftOrderVisible = true
     },
     closeChooseDialog() {