From 06c55ffca2580476634e08f2c60bde7bb627189e Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 28 Jun 2022 15:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=A1=A5=E5=8D=95=E9=BB=98=E8=AE=A4=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E4=B8=8E=E5=88=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BussinessType.vue       |  4 +++-
 src/views/basic/BussinessTypeModify.vue | 27 +++++++++++++++++++++----
 src/views/home/index.vue                | 10 ++++-----
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue
index 4f4243e..ed29533 100644
--- a/src/views/basic/BussinessType.vue
+++ b/src/views/basic/BussinessType.vue
@@ -211,6 +211,7 @@ export default {
                 scanPreIn: null,
                 vailInv: null,
                 codeFillCheck: null,
+                defaultInv:null,
                 defaultSubInv: null,
             },
             enableMap: {
@@ -357,7 +358,8 @@ export default {
                 vailInv: row.vailInv,
                 codeFillCheck: row.codeFillCheck,
                 changeEnable: row.changeEnable,
-                defaultSubInv: row.defaultSubInv
+                defaultSubInv: row.defaultSubInv,
+                defaultInv:row.defaultInv,
 
             };
             this.modifyDialogVisible = true;
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index 1c92c85..091b395 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -153,9 +153,22 @@
             <el-col :span="10" class="el-col">
                 <div class="text item">
                     <div class="itemTag">
-                        <span>补单默认分库:&nbsp;</span>
+                        <span>补单默认仓库:&nbsp;</span>
                     </div>
-                    <el-select v-model="inputQuery.defaultSubInv" placeholder="请选择默认分库" clearable="true"
+                    <el-select v-model="inputQuery.defaultInv" placeholder="默认仓库" clearable="true"
+                               @change="invChange"
+                               style="width: 30%"
+                               size="small">
+                        <el-option
+                            v-for="item in storageList"
+                            :key="item.name"
+                            :label="item.name"
+                            :value="item.code">
+                            <span style="float: left">{{ item.name }}</span>
+                        </el-option>
+                    </el-select>
+                    <el-select v-model="inputQuery.defaultSubInv" placeholder="默认分库" clearable="true"
+                               style="width: 30%"
                                size="small">
                         <el-option
                             v-for="item in subInvList"
@@ -419,10 +432,17 @@ export default {
             filterAll()
                 .then((response) => {
                     this.storageList = response.data || [];
+                    this.findDefaultSubInv();
                 })
                 .catch(() => {
                 });
         },
+
+        invChange() {
+            if (this.$isNotBlank(this.inputQuery.defaultSubInv))
+                this.inputQuery.defaultSubInv = null;
+            this.findDefaultSubInv();
+        },
         findSpecialMethod() {
             let query = {
                 corpType: 4,
@@ -473,7 +493,7 @@ export default {
         findDefaultSubInv() {
             this.subInvList = [];
             let query = {
-                pcode: "1000"
+                pcode: this.inputQuery.defaultInv
             };
             filterSubByInv(query)
                 .then((response) => {
@@ -507,7 +527,6 @@ export default {
         this.getList();
         this.getStorage();
         this.findSpecialMethod();
-        this.findDefaultSubInv();
 
     },
 };
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index d8f81c9..57c9a20 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -408,7 +408,7 @@ export default {
 
         locCHange() {
 
-            if(this.$isNotBlank(this.userInfo.locSubInvCode)){
+            if (this.$isNotBlank(this.userInfo.locSubInvCode)) {
                 this.userInfo.locSubInvCode = "";
             }
             this.findSubInvByInv();
@@ -484,11 +484,9 @@ export default {
                 this.$message.error("当前仓库不能为空！");
                 return;
             }
-            if (this.userInfo.customerId == 110) {
-                if (this.$isBlank(this.userInfo.locSubInvCode)) {
-                    this.$message.error("当前分库不能为空！");
-                    return;
-                }
+            if (this.$isBlank(this.userInfo.locSubInvCode)) {
+                this.$message.error("当前分库不能为空！");
+                return;
             }
             updateInv(this.userInfo).then((res) => {
                 if (res.code == 20000) {