1.修改部分页面当前分库选择问题

src/views/home/index.vue

@@ -484,11 +484,9 @@ export default {
                 this.$message.error("当前仓库不能为空！");
                 return;
             }
-            if (this.userInfo.customerId == 110) {
+            if (this.$isBlank(this.userInfo.locSubInvCode)) {
-                if (this.$isBlank(this.userInfo.locSubInvCode)) {
+                this.$message.error("当前分库不能为空！");
-                    this.$message.error("当前分库不能为空！");
+                return;
-                    return;
-                }
             }
             updateInv(this.userInfo).then((res) => {
                 if (res.code == 20000) {
@@ -548,6 +546,12 @@ export default {
         },
         changeInv() {
             this.selInvVisible = true;
+            userInfo().then((res) => {
+                if (res.code === 20000) {
+                    this.userInfo = res.data;
+                }
+            }).catch((error) => {
+            });
         },
     },
     created() {

src/views/inventory/InvProducts.vue

@@ -169,6 +169,8 @@ import {getBussinessType} from "../../api/basic/bussinessType";
 import {filterUplLocInv} from "@/api/basic/invWarehouse";
 import {filterCustomers} from "@/api/auth/customer";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {userInfo} from "@/api/auth/login";
+import {isBlank} from "@/utils/strUtil";
 
 
 export default {
@@ -205,7 +207,6 @@ export default {
             formLoading: false,
             dialogVisible: false,
             deleteLoading: false,
-            busTypes: [],
             idQuery: null,
             showSup: false,
             fromOptions: [],
@@ -368,26 +369,6 @@ export default {
             this.idQuery.customerId = null;
             this.codeDetailVisible = true;
         },
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getBussinessType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    this.filterQuery.billAction = this.busTypes[0].action;
-                    // this.getList();
-                })
-                .catch(() => {
-                });
-        },
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].name;
-                }
-            }
-        },
     },
     filters: {
         statusFilterType(status) {
@@ -406,13 +387,23 @@ export default {
     },
     created() {
         this.getStorage();
-        this.getBusType();
         this.findMethod();
         let query = this.$route.query;
         this.filterQuery = Object.assign(this.filterQuery, query);
         this.filterQuery.limit = parseInt(this.filterQuery.limit);
         // 加载表格数据
-        this.getList();
+        //获取用户默认仓库信息
+        userInfo().then((res) => {
+            if (res.code === 20000) {
+                if (!isBlank(res.data.locInvCode)) {
+                    this.filterQuery.invStorageCode = res.data.locInvCode;
+                    this.invChange();
+                    this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
+                }
+                this.getList();
+            }
+        }).catch((error) => {
+        });
     },
 };
 </script>

src/views/warehouse/addOrder.vue

@@ -907,11 +907,11 @@ export default {
         this.formData.customerId = store.getters.customerId;
         this.getBusType();
         this.getStorage();
-        this.findSubInvByInv();
         if (this.$isNotBlank(this.idQuery.id)) {
             this.formData.actDate = new Date(this.idQuery.actDate);
             this.formData.corpOrderId = this.idQuery.corpOrderId;
             this.formData.billType = this.idQuery.billType;
+            this.findSubInvByInv(this.idQuery.locStorageCode);
             this.formData.locStorageCode = this.idQuery.locStorageCode;
             this.formData.invWarehouseCode = this.idQuery.invWarehouseCode;
             this.corpOrderIdDisabled = true;
@@ -921,6 +921,9 @@ export default {
             }
             this.getCodeList();
         } else {
+            this.formData.locStorageCode = this.$store.getters.locInvCode;
+            this.findSubInvByInv(this.$store.getters.locInvCode);
+            this.formData.invWarehouseCode = this.$store.getters.locSubInvCode;
             this.corpOrderIdDisabled = false;
             if (JSON.stringify(this.$route.query) === '{}') {
                 // this.formData.corpOrderId = new Date().getTime() + (Math.ceil(Math.random() * 10 + 10) + '');