From b8d8fb05ec033602057f3bfd6100aad7e1cc4325 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 21 Dec 2022 14:15:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=A2=86=E7=94=A8=E7=AD=89?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E5=8F=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BasicEntrutsReceModify.vue | 17 ++++++++++++++++-
 src/views/thrsys/thrOrderNew.vue           |  7 ++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue
index ce90411..d0f9c83 100644
--- a/src/views/basic/BasicEntrutsReceModify.vue
+++ b/src/views/basic/BasicEntrutsReceModify.vue
@@ -58,7 +58,7 @@
                         <div class="itemTag">
                             <span>接受委托仓库:&nbsp;</span>
                         </div>
-                        <el-select v-model="inputQuery.entrustSubInv" placeholder="接受委托分库"
+                        <el-select v-model="inputQuery.entrustSubInv" placeholder="接受委托仓库"
                                    @change="entrustSubInvChange"
                                    filterable
                                    clearable>
@@ -267,7 +267,15 @@ export default {
         },
 
         entrustInvChange() {
+            this.subInvList.forEach(item => {
+                if (item.code === this.inputQuery.invWarehouseCode) {
+                    this.inputQuery.curInv = item.parentId;
+                }
+            })
+
+            // 置空接受委托仓库和分库参数
             this.inputQuery.entrustSubInv = null;
+            this.inputQuery.entrustInv = null;
             this.findEntrustSubInvByInv();
             this.getOrderType();
             this.$forceUpdate();
@@ -275,6 +283,13 @@ export default {
         },
 
         entrustSubInvChange() {
+            // 赋值接收委托仓库
+            this.entrustSubInvList.forEach(item => {
+                if (item.code === this.inputQuery.entrustSubInv) {
+                    this.inputQuery.entrustInv = item.parentId;
+                }
+            })
+
             let query = {
                 code: this.inputQuery.entrustSubInv,
             }
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 51057cd..237dbb6 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -303,6 +303,7 @@ import {getBusChange} from "@/api/basic/busTypeChange";
 import {inserThrOrderWeb, updateReceive} from "@/api/thrsys/thrOrderReceive";
 import {getThrOrderDetails, delThrOrders, delOrderDetail} from "@/api/thrsys/thrOrder";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
     name: "idQuery",
@@ -479,6 +480,7 @@ export default {
             this.findSubStorageMethod();
         },
         subStorageChange(item) {
+            // this.formData.fromSubInvCode = null;
             this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
             this.formData.corpId=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).code
             this.formData.corpName=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).warehouseName
@@ -597,6 +599,7 @@ export default {
 
                 this.invQueryData = {
                     locStorageCode: this.formData.locStorageCode,
+                    invWarehouseCode: this.formData.invWarehouseCode
                 };
                 this.selectInvProductVisible = true;
                 return;
@@ -916,7 +919,9 @@ export default {
 
         this.getBusType();
         this.findSubInvs();
-        this.findSubStorageMethod();
+        if (!isBlank(this.formData.invWarehouseCode)) {
+            this.findSubStorageMethod();
+        }
         // this.findSubInvByInv();
         this.codeArray = [];
         this.closeConfirmFunction(false);