From 7527400e6de6514032e6ba8941364faf7e47ce47 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 8 Nov 2022 15:33:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8D=95=E6=8D=AE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inout/erpOrder.js | 9 + src/api/inout/receiveOrder.js | 13 + src/api/thrsys/thrOrderReceive.js | 9 + src/views/inventory/DialogInvProduct.vue | 5 + src/views/thrsys/ThrOrdedrReceiveAdd.vue | 20 +- src/views/thrsys/ThrOrdedrReceiveSearch.vue | 758 +++---- src/views/thrsys/thrOrderNew.vue | 1908 ++++++++--------- .../warehouse/selectReceiveOrderDialog.vue | 393 ++++ ...tThrOrder.vue => selectThrOrderDialog.vue} | 35 +- src/views/warehouse/stockOrderEditor.vue | 36 +- 10 files changed, 1818 insertions(+), 1368 deletions(-) create mode 100644 src/api/inout/receiveOrder.js create mode 100644 src/views/warehouse/selectReceiveOrderDialog.vue rename src/views/warehouse/{selectThrOrder.vue => selectThrOrderDialog.vue} (92%) diff --git a/src/api/inout/erpOrder.js b/src/api/inout/erpOrder.js index 5a49a63..65773b3 100644 --- a/src/api/inout/erpOrder.js +++ b/src/api/inout/erpOrder.js @@ -25,6 +25,15 @@ export function addStockOrder(query) { }); } +export function addReceiveOrder(query) { + return axios({ + url: "/udiwms/receive/addStockOrder", + method: "get", + params: query + }); +} + + export function getErpMainOrderStatus(query) { return axios({ diff --git a/src/api/inout/receiveOrder.js b/src/api/inout/receiveOrder.js new file mode 100644 index 0000000..c4460a8 --- /dev/null +++ b/src/api/inout/receiveOrder.js @@ -0,0 +1,13 @@ +import axios from "../../utils/axios"; + +//--------------获取领用单据------------------- +export function getReceiveOrder(query) { + return axios({ + url: "/udiwms/receive/order/filter", + method: "get", + params: query + }); +} + + + diff --git a/src/api/thrsys/thrOrderReceive.js b/src/api/thrsys/thrOrderReceive.js index ac7680f..df455c7 100644 --- a/src/api/thrsys/thrOrderReceive.js +++ b/src/api/thrsys/thrOrderReceive.js @@ -7,3 +7,12 @@ export function inserThrOrderWeb(query) { data: query }); } + +export function updateReceive(query) { + return axios({ + url: "/udiwms/receive/order/update", + method: "post", + data: query + }); +} + diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue index 4de8e30..fc16deb 100644 --- a/src/views/inventory/DialogInvProduct.vue +++ b/src/views/inventory/DialogInvProduct.vue @@ -104,6 +104,10 @@ export default { invQueryData: { type: Object, required: true, + }, + type: { + type: Object, + required: true, } }, data() { @@ -299,6 +303,7 @@ export default { let tQuery = { datas: ids, stockOrderLists: this.data.stockOrderLists, + type: this.type, }; getStockOrderDetailInstrumentById(tQuery).then((response) => { this.loading = false; diff --git a/src/views/thrsys/ThrOrdedrReceiveAdd.vue b/src/views/thrsys/ThrOrdedrReceiveAdd.vue index 44fa3b8..3526d4b 100644 --- a/src/views/thrsys/ThrOrdedrReceiveAdd.vue +++ b/src/views/thrsys/ThrOrdedrReceiveAdd.vue @@ -1,12 +1,9 @@