From dc5be9eddfd07a275d902bfc164e133cce5508fc Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 31 May 2022 09:56:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basic/invWarehouse.js | 9 + src/api/warehouse/order.js | 15 +- src/router/index.js | 10 +- src/views/warehouse/codeReplace.vue | 323 ++++++++++++ src/views/warehouse/stockOrderDelete.vue | 620 +++++++++++++++++++++++ 5 files changed, 975 insertions(+), 2 deletions(-) create mode 100644 src/views/warehouse/codeReplace.vue create mode 100644 src/views/warehouse/stockOrderDelete.vue diff --git a/src/api/basic/invWarehouse.js b/src/api/basic/invWarehouse.js index a9d0f1a..7185f01 100644 --- a/src/api/basic/invWarehouse.js +++ b/src/api/basic/invWarehouse.js @@ -180,3 +180,12 @@ export function getThrsysDetail(params) { params: params }); } + +//替换单据条码 +export function replaceCodes(data) { + return axios({ + url: "/warehouse/inout/replaceCodes", + method: "post", + data: data + }) +} diff --git a/src/api/warehouse/order.js b/src/api/warehouse/order.js index b81c4a0..dd49f9a 100644 --- a/src/api/warehouse/order.js +++ b/src/api/warehouse/order.js @@ -315,8 +315,21 @@ export function expireTimeCheck(query) { ) } +export function filterOrderForDelete(params) { + return axios({ + url: "/udiwms/inout/order/filterOrderForDelete", + method: "get", + params: params + }); +} - +export function updateOrderInfo(data) { + return axios({ + url: "/udiwms/inout/order/updateOrderInfo", + method: "post", + data: data + }) +} diff --git a/src/router/index.js b/src/router/index.js index 3bfd312..ffda5b8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -49,6 +49,7 @@ import waitOrder from "../views/warehouse/IOWaitOrder.vue"; import stockOrder from "../views/warehouse/stockOrder"; import stockOrderInCode from "../views/warehouse/stockOrderInCode"; import stockOrderDelSearch from "../views/warehouse/stockOrderDelSearch"; +import stockOrderDelete from "../views/warehouse/stockOrderDelete"; import stockOrderEditor from "../views/warehouse/stockOrderEditor"; import stockOrderSearch from "../views/warehouse/stockOrderSearch"; import stockOrderNew from "../views/warehouse/stockOrderNew"; @@ -1017,7 +1018,14 @@ export const asyncRouterMap = [ authRule: ["stock/stockOrderDelSearch"] } }, - + { + path: "stockOrderEdit", + component: stockOrderDelete, + name: "单据编辑", + meta: { + authRule: ["stock/stockOrderDelete"] + } + }, ] }, diff --git a/src/views/warehouse/codeReplace.vue b/src/views/warehouse/codeReplace.vue new file mode 100644 index 0000000..820eb6f --- /dev/null +++ b/src/views/warehouse/codeReplace.vue @@ -0,0 +1,323 @@ + + + + + + + + + diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue new file mode 100644 index 0000000..f84c179 --- /dev/null +++ b/src/views/warehouse/stockOrderDelete.vue @@ -0,0 +1,620 @@ + + + + + + From d11937e422d0d0ab6831e18f415d2edceb0becf2 Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 31 May 2022 10:13:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E9=AB=98=E4=BA=AE?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/warehouse/stockOrderDelete.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue index f84c179..d4e281e 100644 --- a/src/views/warehouse/stockOrderDelete.vue +++ b/src/views/warehouse/stockOrderDelete.vue @@ -612,7 +612,7 @@ } - .el-table .highlight-row { + .el-table /deep/ .highlight-row { background: #cae3f9; }