diff --git a/src/router/index.js b/src/router/index.js index 9f25242..75e4626 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -27,19 +27,17 @@ const globalRoutes = [ {path: "/recv",name: "recv", component: resolve => require(["@/views/modules/recv/recv.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/qualifiedStorage",name: "qualifiedStorage", component: resolve => require(["@/views/modules/recv/qualifiedStorage.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/inspectionResults",name: "inspectionResults", - component: resolve => require(["@/views/modules/recv/inspectionResults.vue"], resolve), - meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + component: resolve => require(["@/views/modules/recv/inspectionResults.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 入库上架页面 - {path: "/inboundStorage/:inboundNo/:partNo",name: "inboundStorage", - component: resolve => require(["@/views/modules/recv/inboundStorage.vue"], resolve), - meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/inboundStorage/:inboundNo/:partNo",name: "inboundStorage", + component: resolve => require(["@/views/modules/recv/inboundStorage.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // V1 // handlingunit {path: "/handlingunit",name: "handlingunit", component: resolve => require(["@/views/modules/handling-unit/handling-unit-management.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 生产发料 {path: "/productionissue",name: "productionissue", component: resolve => require(["@/views/modules/production-issue/productionIssuePda.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, -//生产退料 +//生产退料 {path: "/productionreturn",name: "productionreturn", component: resolve => require(["@/views/modules/production-issue/productionReturnPDA.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: '/production-issue/pick/:orderNo', name: 'ProductionIssuePick',component: resolve => require(["@/views/modules/production-issue/pick.vue"], resolve), @@ -70,40 +68,6 @@ const globalRoutes = [ // 运输任务 {path: "/transportation",name: "transportation", component: resolve => require(["@/views/modules/transport-task/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - -// V2 - // handlingunit -/* - {path: "/handlingunit",name: "handlingunit", component: resolve => require(["@/views/modules/v2/handling-unit/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - // 生产发料 - {path: "/productionissue",name: "productionissue", component: resolve => require(["@/views/modules/v2/production-issue/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - - // 生产入库 - {path: "/productionInbound",name: "productionwhse", component: resolve => require(["@/views/modules/v2/production-receipt/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - - // 委外 - {path: "/outsource",name: "outsource", component: resolve => require(["@/views/modules/v2/outsourcing-issue/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - - // 客户订单发货 - {path: "/saleshipping",name: "saleshipping", component: resolve => require(["@/views/modules/v2/sales-shipment/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - - // 销售退货 - {path: "/salereturn",name: "salereturn", component: resolve => require(["@/views/modules/v2/sales-return/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - - // 其他出入库 - {path: "/otherinout",name: "otherinout", component: resolve => require(["@/views/modules/v2/other-transaction/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - - // Material Requisition - {path: "/mrissue",name: "mrissue", component: resolve => require(["@/views/modules/v2/mr-issue/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - - // 盘点 - {path: "/stocktaking",name: "stocktaking", component: resolve => require(["@/views/modules/inventory/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - - // 运输任务 - {path: "/transportation",name: "transportation", component: resolve => require(["@/views/modules/v2/transport-task/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - -*/ - ] // 主入口路由(需嵌套上左右整体布局) diff --git a/src/views/modules/production-issue/productionIssuePda.vue b/src/views/modules/production-issue/productionIssuePda.vue index 3dedb41..ce18d39 100644 --- a/src/views/modules/production-issue/productionIssuePda.vue +++ b/src/views/modules/production-issue/productionIssuePda.vue @@ -30,25 +30,22 @@ @click="goToDetail(item)" >