From f85fe11718c3c4e79ac1518b3efb729e3c34390c Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 30 Jun 2022 09:15:38 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/thrsys/SysUdimsConfig.vue                |  4 +++-
 src/views/warehouse/DialogSelectRl.vue             | 14 +++++++-------
 src/views/warehouse/stockHospOrderNew.vue          | 12 +++++++++++-
 src/views/warehouse/stockOrderEditDistribution.vue |  2 +-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue
index 2916115..dfcf7bd 100644
--- a/src/views/thrsys/SysUdimsConfig.vue
+++ b/src/views/thrsys/SysUdimsConfig.vue
@@ -165,7 +165,9 @@
             <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
 
                 <div style="float: right;margin-bottom: 10px;margin-right: 25px">
-                    <el-button type="primary" size="small" @click="addBusTypeDialog()">添加扫码单据类型</el-button>
+                    <el-button type="primary" size="small" @click="addBusTypeDialog()"
+                               :disabled="configQuery.downstreamEnable">添加扫码单据类型
+                    </el-button>
                 </div>
                 <el-table
                     :data="checkedBusTypes"
diff --git a/src/views/warehouse/DialogSelectRl.vue b/src/views/warehouse/DialogSelectRl.vue
index 8cbcec1..25c2a41 100644
--- a/src/views/warehouse/DialogSelectRl.vue
+++ b/src/views/warehouse/DialogSelectRl.vue
@@ -453,22 +453,22 @@
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="24" class="el-col">
                         <div style="margin-top: 18px;margin-bottom: 18px">
-                            <el-checkbox v-model="checked"
+                            <el-checkbox v-model="checked" disabled
                             >以使用单元数量入库
                             </el-checkbox>
-                            <el-checkbox v-model="editQuery.isDisable"
+                            <el-checkbox v-model="editQuery.isDisable" disabled
                             >是否禁用
                             </el-checkbox>
-                            <el-checkbox v-model="editQuery.isAdavence"
+                            <el-checkbox v-model="editQuery.isAdavence" disabled
                             >是否寄售
                             </el-checkbox>
-                            <el-checkbox v-model="editQuery.allowNoBatch"
+                            <el-checkbox v-model="editQuery.allowNoBatch" disabled
                             >允许无批次号
                             </el-checkbox>
-                            <el-checkbox v-model="editQuery.allowNoExpire"
+                            <el-checkbox v-model="editQuery.allowNoExpire" disabled
                             >允许无失效日期
                             </el-checkbox>
-                            <el-checkbox v-model="editQuery.allowNoProduct"
+                            <el-checkbox v-model="editQuery.allowNoProduct" disabled
                             >允许无生产日期
                             </el-checkbox>
                         </div>
@@ -572,7 +572,7 @@ export default {
             selectErpDialogVisible: false,  //选入ERP产品
             selectLocalVisible: false,      //关联UDI
             isUseDyCheck: false,
-            loading:false,
+            loading: false,
         };
     },
 
diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index 21b8fc8..40ff373 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -1163,9 +1163,19 @@ export default {
             }
         },
         actionChange(item) {
+            // console.log("item = " + item);
+            // if (item == '') {
+            //     this.formData.locStorageCode == null;
+            // } else {
             this.curAction = this.getActionItem(item);
-            this.formData.locStorageCode = this.curAction.storageCode;
+
+
+            if (this.curAction.storageCode != null)
+                this.formData.locStorageCode = this.curAction.storageCode;
+
             this.findMethod();
+            // }
+
         },
         locInChange(item) {
             console.log(item);
diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue
index 05de172..925e0de 100644
--- a/src/views/warehouse/stockOrderEditDistribution.vue
+++ b/src/views/warehouse/stockOrderEditDistribution.vue
@@ -569,7 +569,7 @@ export default {
                             if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
                                 return this.$message.error('生产日期与失效日期不能全部为空');
                             }
-                            if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount === '0') {
+                            if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount <1) {
                                 return this.$message.error('配货数量不能小于0');
                             }
                             if (this.detailCountMax) {