From 9f22e85e9e6cc126d49b45b02aeec74dbb90f0db Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sat, 25 Jun 2022 15:37:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A4=8D=E5=88=B6=EF=BC=8C?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=80=89=E6=8B=A9=E9=BB=98=E8=AE=A4=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue                      | 19 +++++++++++++++++--
 src/views/warehouse/DialogcChangeNewOrder.vue |  6 ++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index ce3d203..0566d87 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -234,7 +234,7 @@
                 </el-row>
 
                 <div style="margin-top: 8px ;  color: #F71616;">
-                    <span>提示：进入系统必须选择您当前所在仓库与分库&nbsp;</span>
+                    <span>提示：进入系统请选择您当前所在仓库与分库&nbsp;</span>
                 </div>
                 <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
                     <el-button type="primary" @click="submitInv">提交</el-button>
@@ -407,6 +407,10 @@ export default {
         },
 
         locCHange() {
+
+            if(this.$isNotBlank(this.userInfo.locSubInvCode)){
+                this.userInfo.locSubInvCode = "";
+            }
             this.findSubInvByInv();
         },
 
@@ -473,6 +477,17 @@ export default {
         },
 
         submitInv() {
+
+            if (this.$isBlank(this.userInfo.locInvCode)) {
+                this.$message.error("当前仓库不能为空！");
+                return;
+            }
+            if (this.userInfo.customerId == 110) {
+                if (this.$isBlank(this.userInfo.locSubInvCode)) {
+                    this.$message.error("当前分库不能为空！");
+                    return;
+                }
+            }
             updateInv(this.userInfo).then((res) => {
                 if (res.code == 20000) {
                     this.$message.success("设置成功!");
@@ -529,7 +544,7 @@ export default {
                 }
             });
         },
-        changeInv(){
+        changeInv() {
             this.selInvVisible = true;
         },
     },
diff --git a/src/views/warehouse/DialogcChangeNewOrder.vue b/src/views/warehouse/DialogcChangeNewOrder.vue
index 75adb82..0785326 100644
--- a/src/views/warehouse/DialogcChangeNewOrder.vue
+++ b/src/views/warehouse/DialogcChangeNewOrder.vue
@@ -251,6 +251,8 @@ export default {
                 actDate: new Date(),
                 action: null,
                 locStorageCode: null,
+                fromSubInvCode: null,
+                invWarehouseCode: null,
                 mainAction: null
             },
             fromStorageOptions: [],
@@ -328,6 +330,10 @@ export default {
 
 
         locCHange() {
+
+            if (this.$isNotBlank(this.formData.invWarehouseCode)) {
+                this.formData.invWarehouseCode = "";
+            }
             this.findStorageMethod();
             this.findSubInvByInv(this.formData.locStorageCode);
         },