Merge branch 'ww'

src/views/system/dept/invRelUsers.vue

@@ -200,10 +200,11 @@ export default {
     //用户相关
     onUserReset() {
       this.userQuery = {
-        code: null,
+        code: this.inputQuery.code,
         page: 1,
         limit: 10
       };
+      this.loadUserList();
     },
     loadUserList() {   //获取仓库用户列表
       // if (val != null) {

src/views/system/dept/invWarehouse.vue

@@ -135,6 +135,7 @@
                             :disabled="isShow"
                             style="width: 80%"
                             placeholder="选择上级仓库"/>
+
               </el-form-item>
             </el-col>
           </el-row>
@@ -335,7 +336,12 @@ import {findConfig} from "@/api/thrsys/spsSyncStatus";
 import {selectSysParamByKey} from "@/api/system/param/systemParamConfig";
 import invSpaceManage from "@/views/inventory/InvSpaceManage";
 import {
-  addWarehouseUser, deleteWarehouseBussinessType, deleteWarehouseUser, filterList, filterThridSubByInv,
+  addWarehouseUser,
+  deleteWarehouseBussinessType,
+  deleteWarehouseUser,
+  filterInvWarehouse,
+  filterList,
+  filterThridSubByInv,
   warehouseBussinessTypeList,
   warehouseUserList
 } from "@/api/system/invWarehouse";
@@ -453,7 +459,7 @@ export default {
       this.getSubThrsysDetailData();
       filterSubAll(this.query)
         .then((response) => {
-          let invList = response.data.list || [];
+          let invList = response.data || [];
           this.invOptions = this.handleTree(invList, "code", "parentCode");
         })
         .catch(() => {
@@ -508,6 +514,7 @@ export default {
           this.loading = false;
           this.fromDeptOptions = [];
         });
+
     },
     normalizer(node) {
       if (node.children && !node.children.length) {
@@ -745,6 +752,7 @@ export default {
     this.getList();
     this.getSyncConfig();
     this.findDeptMethod();
+
   }
 };
 </script>