Merge remote-tracking branch 'origin/fengcang' into fengcang

src/views/basic/BasicEntrutsReceModify.vue

@@ -318,7 +318,7 @@ export default {
         },
 
         entrustInvChange() {
-
+            this.inputQuery.entrustSubInv = null;
             this.findEntrustSubInvByInv();
             this.$forceUpdate();
 

src/views/inventory/InvProducts.vue

@@ -63,6 +63,7 @@
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                                   :disabled="invWarehouseDisabled"
                                    size="mini">
                             <el-option
                                 v-for="item in subInvList"
@@ -160,7 +161,6 @@
 <script>
 import {
     filterProducts,
-    filterDetailProducts,
     deleteProducts,
 } from "../../api/inventory/InvProducts";
 import draggable from "vuedraggable";
@@ -168,7 +168,7 @@ import codeDetail from "./InvProductsDetail";
 import store from "../../store";
 import {getBussinessType} from "../../api/basic/bussinessType";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
-import {filterAllByUser, filterUplLocInv} from "@/api/basic/invWarehouse";
+import {filterUplLocInv} from "@/api/basic/invWarehouse";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 
@@ -201,6 +201,7 @@ export default {
             loading: true,
             index: null,
             dialogTableVisible: false,
+            invWarehouseDisabled: true,
             formLoading: false,
             dialogVisible: false,
             deleteLoading: false,
@@ -227,9 +228,12 @@ export default {
                 customerId: null,
                 unitFk: null,
                 supId: null,
+                invWarehouseCode: null,
+                invStorageCode: null,
                 page: 1,
                 limit: 20,
             };
+            this.invChange();
             this.getList();
         },
         onSubmit() {
@@ -260,7 +264,6 @@ export default {
             this.filterQuery.customerId = store.getters.customerId;
             filterProducts(this.filterQuery)
                 .then((response) => {
-                    console.log(response)
                     this.showSup = response.data.showSup;
                     this.loading = false;
                     this.list = response.data.list || [];
@@ -308,7 +311,6 @@ export default {
                 });
         },
         findMethod(query) {
-            console.log(query);
             this.fromOptions = [];
             let cQuery = {
                 key: query,