From bde47d1399fc94aa006251405a6092221ac38608 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 18 Nov 2022 16:51:10 +0800 Subject: [PATCH 1/7] =?UTF-8?q?1.=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/IOFinishOrder.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/inout/IOFinishOrder.vue b/src/views/inout/IOFinishOrder.vue index 77f73ac..a9865ea 100644 --- a/src/views/inout/IOFinishOrder.vue +++ b/src/views/inout/IOFinishOrder.vue @@ -448,7 +448,8 @@ export default { "6": "缺量补录单据", "7": "UDI供应商平台", "8": "平衡补录单据", - "10": "手动补单" + "10": "手动补单", + "11": "仓库盘点" }, //往来单位 unitquery: {key: "", page: 1, limit: 20}, From 209e6be48db2a37f66ebf7836e3c5fae5dfb1f69 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 18 Nov 2022 16:55:07 +0800 Subject: [PATCH 2/7] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=A1=B5=E9=9D=A2=E5=8D=95=E6=8D=AE=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E6=95=B0=E5=80=BC=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E7=9B=98=E7=82=B9=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/IOCheckErrorOrder.vue | 3 ++- src/views/inout/IOCheckWaitOrder.vue | 3 ++- src/views/inout/IONewOrder.vue | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue index 2f62256..3512578 100644 --- a/src/views/inout/IOCheckErrorOrder.vue +++ b/src/views/inout/IOCheckErrorOrder.vue @@ -531,7 +531,8 @@ export default { "6": "缺量补录单据", "7": "UDI供应商平台", "8": "平衡补录单据", - "10":"手动补单" + "10":"手动补单", + "11": "仓库盘点" }, busTypes: [], enableDept: false, diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue index f18579f..ea8c2c9 100644 --- a/src/views/inout/IOCheckWaitOrder.vue +++ b/src/views/inout/IOCheckWaitOrder.vue @@ -436,7 +436,8 @@ export default { "6": "缺量补录单据", "7": "UDI供应商平台", "8": "平衡补录单据", - "10":"手动补单" + "10":"手动补单", + "11": "仓库盘点" }, exportQuery: { orderId: "", diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue index ba54979..2443be4 100644 --- a/src/views/inout/IONewOrder.vue +++ b/src/views/inout/IONewOrder.vue @@ -351,7 +351,8 @@ export default { "6": "缺量补录单据", "7": "UDI供应商平台", "8": "平衡补录单据", - "10": "手动补单" + "10": "手动补单", + "11": "仓库盘点" }, deleteData: { id: "", From 2affcf8587bfe733b409132475d26e65a95b4e4b Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 18 Nov 2022 17:59:06 +0800 Subject: [PATCH 3/7] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=85=BB=E6=8A=A4=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/router/index.js b/src/router/index.js index 6f85b23..03dbe26 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1048,6 +1048,55 @@ export const asyncRouterMap = [ authRule: ["invManage/invGoodsPlacement"] } }, + { + path: "/invMaintenance", + component: Empty, + name: "库存养护", + icon: "", + meta: { + authRule: ["invMaintenance/manage"] + }, + children: [ + { + path: "/maintenanceOrder", + component: Empty, + name: "养护记录", + icon: "", + meta: { + authRule: ["invMaintenance/order"] + }, + children: [ + { + path: "maintenanceOrderNew", + component: invGoodsPlacement, + name: "新增养护记录", + icon: "", + meta: { + authRule: ["invMaintenance/orderNew"] + }, + }, + { + path: "maintenanceOrderAudit", + component: invGoodsPlacement, + name: "审核养护记录", + icon: "", + meta: { + authRule: ["invMaintenance/orderAudit"] + }, + } + ] + }, + { + path: "maintenanceOrderCompleted", + component: invGoodsPlacement, + name: "养护记录查询", + icon: "", + meta: { + authRule: ["invMaintenance/orderCompleted"] + } + } + ] + }, ] }, { From 9f488dab8c3f262603f81a445fa88246b92f3927 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 21 Nov 2022 11:22:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=A0=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/countOrderCodes.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/inventory/countOrderCodes.vue b/src/views/inventory/countOrderCodes.vue index 658f453..0a0d762 100644 --- a/src/views/inventory/countOrderCodes.vue +++ b/src/views/inventory/countOrderCodes.vue @@ -22,6 +22,12 @@ width="500" show-overflow-tooltip > + Date: Tue, 22 Nov 2022 10:15:36 +0800 Subject: [PATCH 5/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=A1=B5=E9=9D=A2=E6=9D=A5=E6=BA=90=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=97=A0=E5=86=85=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/IOErrorOrder.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/inout/IOErrorOrder.vue b/src/views/inout/IOErrorOrder.vue index b326920..def5054 100644 --- a/src/views/inout/IOErrorOrder.vue +++ b/src/views/inout/IOErrorOrder.vue @@ -333,7 +333,8 @@ export default { "6": "缺量补录单据", "7": "UDI供应商平台", "8": "平衡补录单据", - "10": "手动补单" + "10": "手动补单", + "11": "仓库盘点" }, storageList: [], subInvList: [], From b1931b4a3078e1d35c2ff7339c32ccf3af412812 Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 22 Nov 2022 18:02:27 +0800 Subject: [PATCH 6/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=A0=81=E6=98=8E=E7=BB=86=E6=9C=AA=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=89=B9=E6=AC=A1=E5=8F=B7=E6=9D=A1=E4=BB=B6=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/invCountOrderAudit.vue | 1 + src/views/inventory/invCountOrderCompleted.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/inventory/invCountOrderAudit.vue b/src/views/inventory/invCountOrderAudit.vue index 3dc7c6b..9d3e89a 100644 --- a/src/views/inventory/invCountOrderAudit.vue +++ b/src/views/inventory/invCountOrderAudit.vue @@ -400,6 +400,7 @@ export default { this.codeQuery = { orderIdFk: row.orderIdFk, productId: row.productId, + batchNo: row.batchNo, edit: false }; this.codesVisible = true; diff --git a/src/views/inventory/invCountOrderCompleted.vue b/src/views/inventory/invCountOrderCompleted.vue index f841253..d34d89e 100644 --- a/src/views/inventory/invCountOrderCompleted.vue +++ b/src/views/inventory/invCountOrderCompleted.vue @@ -371,6 +371,7 @@ export default { this.codeQuery = { orderIdFk: row.orderIdFk, productId: row.productId, + batchNo: row.batchNo, edit: false }; this.codesVisible = true; From 167920855dda8aa8484199a5c61365ce890ff043 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 23 Nov 2022 09:59:00 +0800 Subject: [PATCH 7/7] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/invCountOrderAudit.vue | 11 +---------- src/views/inventory/invCountOrderCompleted.vue | 3 +-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/views/inventory/invCountOrderAudit.vue b/src/views/inventory/invCountOrderAudit.vue index 9d3e89a..7745aad 100644 --- a/src/views/inventory/invCountOrderAudit.vue +++ b/src/views/inventory/invCountOrderAudit.vue @@ -116,8 +116,7 @@ - - + @@ -142,14 +141,6 @@ >详情 - - 删除 - diff --git a/src/views/inventory/invCountOrderCompleted.vue b/src/views/inventory/invCountOrderCompleted.vue index d34d89e..a75046a 100644 --- a/src/views/inventory/invCountOrderCompleted.vue +++ b/src/views/inventory/invCountOrderCompleted.vue @@ -98,8 +98,7 @@ - - +