diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue index 2a97213..41062ea 100644 --- a/src/views/inventory/InvProducts.vue +++ b/src/views/inventory/InvProducts.vue @@ -176,6 +176,7 @@ export default { data() { return { filterQuery: { + invWarehouseCode: null, invStorageCode: null, productsName: null, nameCode: null, @@ -343,6 +344,8 @@ export default { invChange() { + // this.$set(this.filterQuery, "entrustUser", ""); + this.filterQuery.invWarehouseCode = ""; this.subInvList = []; let query = { pcode: this.filterQuery.invStorageCode @@ -357,7 +360,6 @@ export default { intentDetail(row) { this.idQuery = row; - // this.idQuery.supId = null; this.idQuery.customerId = null; this.codeDetailVisible = true; }, diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue index 8b1ad0d..8595105 100644 --- a/src/views/inventory/InvStatistics.vue +++ b/src/views/inventory/InvStatistics.vue @@ -1,129 +1,141 @@ diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue index 602605c..c493fbf 100644 --- a/src/views/warehouse/AdditionalOrder.vue +++ b/src/views/warehouse/AdditionalOrder.vue @@ -283,6 +283,8 @@ export default { data() { return { filterQuery: { + locStorageCode:null, + invWarehouseCode:null, id: "", mainAction: null, action: null, diff --git a/src/views/warehouse/DialogcChangeNewOrder.vue b/src/views/warehouse/DialogcChangeNewOrder.vue index 4e9b2be..75adb82 100644 --- a/src/views/warehouse/DialogcChangeNewOrder.vue +++ b/src/views/warehouse/DialogcChangeNewOrder.vue @@ -72,9 +72,6 @@ - - - {{ item.code }} + + + + {{ item.name }} + {{ item.code }} + + + @@ -152,6 +162,28 @@ > + + + +
+ 当前分库： +
+ + + + + + + {{ item.name }} + + + + @@ -193,6 +225,7 @@ import {parseTime} from "@/filtres"; import {getLocalJoinByUser} from "@/api/basic/busLocalType"; import {submitOrderWeb} from "@/api/warehouse/order"; import {stockOrderChange, stockOrderDetail} from "@/api/warehouse/stockOrder"; +import {filterSubByInv} from "@/api/basic/invSubWarehouse"; export default { name: "DialogcChangeNewOrder", @@ -221,14 +254,19 @@ export default { mainAction: null }, fromStorageOptions: [], + fromSubStorageOptions: [], curAction: { corpType: 0, genUnit: false, }, busTypes: [], fromOptions: [], - loading:false, - detailList: [] + loading: false, + detailList: [], + storageList: [], + detailLoading: false, + subInvList: [], + } }, methods: { @@ -271,6 +309,9 @@ export default { mainAction: this.formData.mainAction, fromCorp: this.formData.fromCorp, fromCorpId: this.formData.fromCorpId, + invWarehouseCode: this.formData.invWarehouseCode, + fromSubInvCode: this.formData.fromSubInvCode, + products: products }; stockOrderChange(tQuery) @@ -288,6 +329,21 @@ export default { locCHange() { this.findStorageMethod(); + this.findSubInvByInv(this.formData.locStorageCode); + }, + + + findSubInvByInv(invCode) { + this.subInvList = []; + let query = { + pcode: invCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); }, findStorageMethod(query) { @@ -304,7 +360,18 @@ export default { .catch(() => { }); }, - + findSubStorageMethod() { + let cQuery = { + pcode: this.formData.fromCorpId, + filter: 2, + }; + filterSubByInv(cQuery) + .then((response) => { + this.fromSubStorageOptions = response.data || []; + }) + .catch(() => { + }); + }, findMethod(query) { this.fromOptions = []; let cQuery = { @@ -345,6 +412,7 @@ export default { storageChange(row) { this.formData.fromCorpId = row.code; this.formData.fromCorp = row.name; + this.findSubStorageMethod(); }, unitChange(row) { diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index a62e2d1..b660f05 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -782,7 +782,6 @@ export default { this.curRow = row; }, storageChange(row) { - console.log(row); this.formData.fromCorpId = row.code; this.formData.fromCorp = row.name; this.findSubStorageMethod(); diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue index 54c9e1d..d1b6cfc 100644 --- a/src/views/warehouse/stockHospOrderNew.vue +++ b/src/views/warehouse/stockHospOrderNew.vue @@ -178,8 +178,8 @@ - - + - diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue index d7e5604..47602eb 100644 --- a/src/views/warehouse/stockOrderEditDistribution.vue +++ b/src/views/warehouse/stockOrderEditDistribution.vue @@ -78,7 +78,7 @@ :key="item.name" :label="item.name" :value="item.localAction"> - {{ item.localName }} + {{ item.localName }} @@ -94,10 +94,9 @@ - - - - + + + + +
+ 当前分库： +
+ + + + + + + {{ item.name }} + + + + + @@ -124,44 +147,44 @@ > - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -421,6 +444,7 @@ import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/bas import {getBussinessType} from "../../api/basic/bussinessType"; import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; +import {filterSubByInv} from "@/api/basic/invSubWarehouse"; export default { name: "idQuery", @@ -501,6 +525,7 @@ export default { selectInvProductVisible: false, thisData: {}, storageList: [], + subInvList: [], }; }, components: { @@ -1075,6 +1100,19 @@ export default { .catch(() => { }); }, + invChange() { + // this.formData.invWarehouseCode = ""; + this.subInvList = []; + let query = { + pcode: this.formData.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, getActionName(action) { for (let i = 0; i < this.busTypes.length; i++) { if (this.busTypes[i].action === action) { @@ -1123,6 +1161,9 @@ export default { this.orderEditor = true; this.sValue = this.formData.corpName; this.getStockOrderDetailList(); + + + this.invChange(); } else { this.formData = { billdate: "", @@ -1137,6 +1178,8 @@ export default { this.orderEditor = false; this.generateBillNo(); } + + }, }; diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue index 61d8838..30eff36 100644 --- a/src/views/warehouse/stockOrderEditor.vue +++ b/src/views/warehouse/stockOrderEditor.vue @@ -697,7 +697,7 @@ export default { }, distributionForm(index, row) { this.idQuery.id = ''; - console.log("row = " + row.id); + console.log("row = " + row.invWarehouseCode); if (this.$isNotBlank(row.id)) { this.idQuery.id = row.id; this.idQuery.formData = row;