diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue index b9372ac..f1b6484 100644 --- a/src/views/business/stockOrder.vue +++ b/src/views/business/stockOrder.vue @@ -27,21 +27,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - { this.subInvList = response.data || []; + this.getList(); + }) .catch(() => { }); @@ -898,7 +901,7 @@ export default { }, created() { // 加载表格数据 - this.getStorage(); + this.getSubInvList(); this.getBusType(); let end = new Date(); let start = new Date(); diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue index 80ae941..fab5b9e 100644 --- a/src/views/business/stockOrderDelSearch.vue +++ b/src/views/business/stockOrderDelSearch.vue @@ -27,21 +27,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - { this.subInvList = response.data || []; + this.getList(); }) .catch(() => { }); @@ -1035,7 +1038,7 @@ export default { } }, created() { - this.getStorage(); + this.getSubInvList(); this.getBusType(); let end = new Date(); let start = new Date(); diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue index 83625ed..edfba8d 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -26,21 +26,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - { this.subInvList = response.data || []; + this.getList(); }) .catch(() => { }); @@ -1025,7 +1027,7 @@ export default { } }, created() { - this.getStorage(); + this.getSubInvList(); this.getSysParm(); this.getBusType(); this.getList(); diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue index 50109a2..dccca10 100644 --- a/src/views/business/stockOrderNew.vue +++ b/src/views/business/stockOrderNew.vue @@ -1,463 +1,463 @@ @@ -1013,7 +1015,7 @@ export default { 解决el-input输入框 type=number时，输入中文光标上移问题 */ .el-input__inner { - line-height: 1px !important; + line-height: 1px !important; } diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue index 187db0a..3717f8a 100644 --- a/src/views/business/stockOrderSearch.vue +++ b/src/views/business/stockOrderSearch.vue @@ -27,21 +27,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - { this.subInvList = response.data || []; + this.getList(); }) .catch(() => { }); @@ -1120,7 +1122,7 @@ export default { created() { this.isReceAble = true; - this.getStorage(); + this.getSubInvList(); this.getBusType(); let end = new Date(); let start = new Date(); diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue index f093336..d9cee37 100644 --- a/src/views/business/stockOrderWaitCheck.vue +++ b/src/views/business/stockOrderWaitCheck.vue @@ -27,21 +27,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - { this.subInvList = response.data || []; + this.getList(); }) .catch(() => { }); @@ -884,7 +886,7 @@ export default { }, created() { // 加载表格数据 - this.getStorage(); + this.getSubInvList(); this.getBusType(); let end = new Date(); let start = new Date(); diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue index 17dd55c..e1fc87c 100644 --- a/src/views/inout/IOCheckErrorOrder.vue +++ b/src/views/inout/IOCheckErrorOrder.vue @@ -33,21 +33,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - { this.subInvList = response.data || []; + this.getList(); }) .catch(() => { }); @@ -1162,7 +1164,7 @@ export default { }, created() { - this.getStorage(); + this.getSubInvList(); this.getBusType(); let query = this.$route.query; this.query = Object.assign(this.query, query); diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue index dd464b4..960859f 100644 --- a/src/views/inout/IOCheckWaitOrder.vue +++ b/src/views/inout/IOCheckWaitOrder.vue @@ -33,21 +33,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - { this.subInvList = response.data || []; + this.getList(); }) .catch(() => { }); @@ -914,7 +916,7 @@ export default { }, created() { - this.getStorage(); + this.getSubInvList(); this.getBusType(); let query = this.$route.query; this.query = Object.assign(this.query, query); diff --git a/src/views/inout/IOFinishOrder.vue b/src/views/inout/IOFinishOrder.vue index a9865ea..3aace20 100644 --- a/src/views/inout/IOFinishOrder.vue +++ b/src/views/inout/IOFinishOrder.vue @@ -1,397 +1,397 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + + + + + + + + + + + + + + + + {{ errorDetail }} + 关 闭 - - + + @@ -979,10 +981,10 @@ export default { diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue index 2f48659..c09665e 100644 --- a/src/views/inout/IONewOrder.vue +++ b/src/views/inout/IONewOrder.vue @@ -28,21 +28,21 @@ + + + + + + + + + + + + + - - - {{ item.name }} - - - - - @@ -682,11 +682,13 @@ export default { getSubInvList() { let query = { - pcode: this.filterQuery.locStorageCode + // pcode: this.filterQuery.locStorageCode + filter: 3, }; filterSubByInv(query) .then((response) => { this.subInvList = response.data || []; + this.getList(); }) .catch(() => { }); @@ -720,7 +722,7 @@ export default { }; }, created() { - this.getStorage(); + this.getSubInvList(); this.getBusType(); let query = this.$route.query; this.filterQuery = Object.assign(this.filterQuery, query); diff --git a/src/views/inventory/addInvMAOrder.vue b/src/views/inventory/addInvMAOrder.vue index c9bb798..39ff688 100644 --- a/src/views/inventory/addInvMAOrder.vue +++ b/src/views/inventory/addInvMAOrder.vue @@ -177,7 +177,7 @@ show-overflow-tooltip> - + @@ -253,6 +267,7 @@ import {inserThrOrderWeb, delApplyDetail, listApplyDetail} from "@/api/purchase/ import {filterAllByUser} from "@/api/basic/invWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {getBusChange} from "@/api/basic/busTypeChange"; +import SelectApplyListDialog from "@/views/purchase/selectApplyListDialog"; export default { name: "idQuery", @@ -314,12 +329,13 @@ export default { storageList: [], subInvList: [], invQueryData: {}, - + selectApplyVisible: false }; }, components: { draggable, stockOrderNewSelectProduct, + SelectApplyListDialog }, methods: { saveOrder(status) { @@ -398,6 +414,7 @@ export default { }, closeDialogC2(rData) { this.selectProductVisible = false; + this.selectApplyVisible = false; this.thisData = {}; if (this.$isNotBlank(rData)) { this.codeArray = []; @@ -537,6 +554,9 @@ export default { .catch(() => { }); }, + selectApply() { + this.selectApplyVisible = true; + }, }, filters: {}, mounted() { diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue index d4afd11..00c411c 100644 --- a/src/views/purchase/pureApplyDetailDialog.vue +++ b/src/views/purchase/pureApplyDetailDialog.vue @@ -61,65 +61,24 @@ - - - - {{ item.name }} - - - - - {{ item.name }} - - - + + + {{ item.name }} + {{ + item.warehouseName + }} + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
申购说明： @@ -133,7 +92,6 @@ - @@ -180,12 +138,34 @@ - - + + +
+ 采购科室： +
+ + + + + + {{ item.name }} + {{ + item.warehouseName + }} + + + + + - @@ -243,7 +223,6 @@ - { @@ -590,7 +572,9 @@ export default { } this.getStorage(); this.findSubInvs(); - this.getTargetStorage(); + // this.getTargetStorage(); + + this.findTargetSubInvs(); this.codeArray = []; this.getBusType(); }, diff --git a/src/views/purchase/selectApplyListDialog.vue b/src/views/purchase/selectApplyListDialog.vue new file mode 100644 index 0000000..36e633e --- /dev/null +++ b/src/views/purchase/selectApplyListDialog.vue @@ -0,0 +1,375 @@ + + + + +