diff --git a/src/router/index.js b/src/router/index.js index f0a2c52..7b10ae7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1436,6 +1436,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"] + } + } + ] + }, ] }, { 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/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: [], 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}, 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: "", 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 > + - - + @@ -142,14 +141,6 @@ >详情 - - 删除 - @@ -400,6 +391,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..a75046a 100644 --- a/src/views/inventory/invCountOrderCompleted.vue +++ b/src/views/inventory/invCountOrderCompleted.vue @@ -98,8 +98,7 @@ - - + @@ -371,6 +370,7 @@ export default { this.codeQuery = { orderIdFk: row.orderIdFk, productId: row.productId, + batchNo: row.batchNo, edit: false }; this.codesVisible = true;