diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue
index d0f9c83..e5100a9 100644
--- a/src/views/basic/BasicEntrutsReceModify.vue
+++ b/src/views/basic/BasicEntrutsReceModify.vue
@@ -17,7 +17,9 @@
                                 :label="item.name"
                                 :value="item.code">
                                 <span style="float: left">{{ item.name }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{
+                                        item.warehouseName
+                                    }}</span>
                             </el-option>
 
                         </el-select>
@@ -59,7 +61,7 @@
                             <span>接受委托仓库:&nbsp;</span>
                         </div>
                         <el-select v-model="inputQuery.entrustSubInv" placeholder="接受委托仓库"
-                                   @change="entrustSubInvChange"
+                                   @change="subInvChangeMeg"
                                    filterable
                                    clearable>
                             <el-option
@@ -68,7 +70,9 @@
                                 :label="item.name"
                                 :value="item.code">
                                 <span style="float: left">{{ item.name }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{
+                                        item.warehouseName
+                                    }}</span>
                             </el-option>
 
                         </el-select>
@@ -134,7 +138,7 @@ import {
 import {filterAll, filterNext, warehouseBussinessTypeList, warehouseUserList} from "@/api/basic/invWarehouse";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {filterNoUseBusType} from "@/api/basic/EntrustRece";
-import {filterSubByInv,filterSub} from "@/api/basic/invSubWarehouse";
+import {filterSubByInv, filterSub} from "@/api/basic/invSubWarehouse";
 
 
 export default {
@@ -204,7 +208,7 @@ export default {
         findSubInvByInv() {
             this.subInvList = [];
             let query = {
-                filter:3
+                filter: 3
             };
             filterSubByInv(query)
                 .then((response) => {
@@ -311,6 +315,38 @@ export default {
             });
         },
 
+        subInvChangeMeg() {
+            this.$set(this.inputQuery, "entrustAction", "");
+            this.$set(this.inputQuery, "entrustUser", "");
+            // 赋值接收委托仓库
+            this.entrustSubInvList.forEach(item => {
+                if (item.code === this.inputQuery.entrustSubInv) {
+                    this.inputQuery.entrustInv = item.parentId;
+                }
+            })
+
+            let query = {
+                code: this.inputQuery.entrustSubInv,
+            }
+
+            //加载用户数据
+            warehouseUserList(query).then((res) => {
+                this.entrustUserArray = [];
+                this.entrustUserArray = res.data.list;
+            }).catch((error) => {
+                this.$message.error("用户数据加载失败")
+            });
+
+            //加载单据类型数据
+            warehouseBussinessTypeList(query).then((res) => {
+                this.entrustBusArray = res.data.list;
+
+            }).catch((error) => {
+                this.$message.error("单据类型数据加载失败")
+            });
+        },
+
+
     },
     computed: {
         corpType() {
diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue
index 9c9a13b..2dd39f9 100644
--- a/src/views/inout/IONewOrder.vue
+++ b/src/views/inout/IONewOrder.vue
@@ -422,7 +422,9 @@ export default {
             }
         },
         getBusType() {
-            this.filterQuery.locStorageCode= this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
+            if(this.subInvList.length>0){
+                this.filterQuery.locStorageCode= this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
+            }
             let query = {
                 code: this.filterQuery.invWarehouseCode,
                 enabled: true,