From 1bee98985a5e17e766b3ecfa6ea7f310a728acbb Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 20 Jul 2022 10:47:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=89=AB=E7=A0=81=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E6=B7=BB=E5=8A=A0=E4=BA=A7=E5=93=81=E5=90=8E=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E5=92=8C=E5=88=86=E5=BA=93=E4=BF=A1=E6=81=AF=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E5=A4=8D=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=EF=BC=8C=E6=9C=AA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=88=86=E5=BA=93=E7=9A=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=AF=E4=BB=A5=E5=BD=95=E5=85=A5=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=88=86=E5=BA=93=E5=90=8E=E7=BB=AD=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=80=89=E6=8B=A9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/warehouse/addOrder.vue          | 15 +++++----------
 src/views/warehouse/stockHospOrderNew.vue |  6 ++++--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index d9e627f..c4ead24 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -90,11 +90,7 @@
                         </div>
                     </el-col>
 
-                    <el-col :span="8" v-if="corpOrderIdDisabled">
-                        <el-input disabled v-model="formData.invName"></el-input>
-                    </el-col>
-
-                    <el-col :span="8"  v-if="!corpOrderIdDisabled">
+                    <el-col :span="8">
                         <el-form-item prop="locStorageCode">
                             <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
                                        @change="locCHange"
@@ -117,11 +113,7 @@
                         </div>
                     </el-col>
 
-                    <el-col :span="8" v-if="corpOrderIdDisabled">
-                        <el-input disabled v-model="formData.subInvName"></el-input>
-                    </el-col>
-
-                    <el-col :span="8" v-if="!corpOrderIdDisabled">
+                    <el-col :span="8">
                         <el-form-item prop="locStorageCode">
                             <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" clearable
                                        :disabled="corpOrderIdDisabled">
@@ -582,6 +574,9 @@ export default {
             });
         },
         addCode(event) {
+            debugger
+            console.log(this.formData)
+            console.log(this.storageList)
             if (event == null) {
             } else event.target.select();
             this.sictomText = "";
diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index c257710..91a0020 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -769,6 +769,10 @@ export default {
                     this.$message.error("往来信息和单据类型不能为空！")
                     return;
                 }
+                if (this.$isBlank(this.formData.locStorageCode) || this.$isBlank(this.formData.invWarehouseCode)) {
+                    this.$message.error("当前仓库和当前分库不能为空！");
+                    return;
+                }
                 this.code = "";
                 this.$refs.multipleTable.setCurrentRow();
                 this.currentRow = {};
@@ -797,8 +801,6 @@ export default {
                 } else {
                     this.selectProductVisible = true;
                 }
-
-
                 return;
             }
             this.code = this.code.trim();