diff --git a/src/router/index.js b/src/router/index.js index acb0614..5bdae3e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -23,14 +23,12 @@ const globalRoutes = [ { path: '/404', component: _import('common/404'), name: '404', meta: { title: '404未找到' } }, { path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } }, // 采购入库 - {path: "/porecv",name: "porecv", component: resolve => require(["@/views/modules/recv/po-recv.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - {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}}, + {path: "/purchaseInbound",name: "porecv", component: resolve => require(["@/views/modules/purchase-inbound/purchase-inbound.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/recv",name: "recv", component: resolve => require(["@/views/modules/purchase-inbound/purchase-inbound.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/qualifiedStorage",name: "qualifiedStorage", component: resolve => require(["@/views/modules/purchase-inbound/qualifiedStorage.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 入库上架页面 {path: "/inboundStorage/:buNo/:inboundNo",name: "inboundStorage", - component: resolve => require(["@/views/modules/recv/inboundStorage.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + component: resolve => require(["@/views/modules/purchase-inbound/inboundStorage.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 销售退货 {path: "/salesReturn",name: "salesReturn", component: resolve => require(["@/views/modules/sales-return/sales-return.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, @@ -47,28 +45,28 @@ const globalRoutes = [ {path: "/productionPickingDetail/:buNo/:outboundNo",name: "productionPickingDetail", component: resolve => require(["@/views/modules/production-pick/productionPickingDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 生产入库 - {path: "/productionInbound",name: "productionInbound", + {path: "/productionInbound",name: "productionInbound", component: resolve => require(["@/views/modules/production/production-inbound.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - {path: "/productionQualifiedStorage",name: "productionQualifiedStorage", + {path: "/productionQualifiedStorage",name: "productionQualifiedStorage", component: resolve => require(["@/views/modules/production/productionQualifiedStorage.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/productionInboundStorage/:buNo/:inboundNo",name: "productionInboundStorage", component: resolve => require(["@/views/modules/production/productionInboundStorage.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 销售出库 - {path: "/salesOutbound",name: "salesOutbound", + {path: "/salesOutbound",name: "salesOutbound", component: resolve => require(["@/views/modules/sales/sales-outbound.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - {path: "/salesOutboundList",name: "salesOutboundList", + {path: "/salesOutboundList",name: "salesOutboundList", component: resolve => require(["@/views/modules/sales/salesOutboundList.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/salesOutboundDetail/:buNo/:outboundNo",name: "salesOutboundDetail", component: resolve => require(["@/views/modules/sales/salesOutboundDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 采购退货 - {path: "/purchaseReturn",name: "purchaseReturn", - component: resolve => require(["@/views/modules/purchase/purchase-return.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, - {path: "/purchaseReturnList",name: "purchaseReturnList", - component: resolve => require(["@/views/modules/purchase/purchaseReturnList.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/purchaseReturn",name: "purchaseReturn", + component: resolve => require(["@/views/modules/purchase-return/purchase-return.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + {path: "/purchaseReturnList",name: "purchaseReturnList", + component: resolve => require(["@/views/modules/purchase-return/purchaseReturnList.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/purchaseReturnDetail/:buNo/:returnNo",name: "purchaseReturnDetail", - component: resolve => require(["@/views/modules/purchase/purchaseReturnDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + component: resolve => require(["@/views/modules/purchase-return/purchaseReturnDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, ] diff --git a/src/views/main.vue b/src/views/main.vue index 2904b73..60cbd44 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -39,7 +39,7 @@ 收货入库
-
+
diff --git a/src/views/modules/recv/inboundStorage.vue b/src/views/modules/purchase-inbound/inboundStorage.vue similarity index 100% rename from src/views/modules/recv/inboundStorage.vue rename to src/views/modules/purchase-inbound/inboundStorage.vue diff --git a/src/views/modules/recv/po-recv.vue b/src/views/modules/purchase-inbound/purchase-inbound.vue similarity index 100% rename from src/views/modules/recv/po-recv.vue rename to src/views/modules/purchase-inbound/purchase-inbound.vue diff --git a/src/views/modules/recv/qualifiedStorage.vue b/src/views/modules/purchase-inbound/qualifiedStorage.vue similarity index 100% rename from src/views/modules/recv/qualifiedStorage.vue rename to src/views/modules/purchase-inbound/qualifiedStorage.vue diff --git a/src/views/modules/recv/recv.vue b/src/views/modules/purchase-inbound/recv.vue similarity index 100% rename from src/views/modules/recv/recv.vue rename to src/views/modules/purchase-inbound/recv.vue diff --git a/src/views/modules/purchase/purchase-return.vue b/src/views/modules/purchase-return/purchase-return.vue similarity index 100% rename from src/views/modules/purchase/purchase-return.vue rename to src/views/modules/purchase-return/purchase-return.vue diff --git a/src/views/modules/purchase/purchaseReturnDetail.vue b/src/views/modules/purchase-return/purchaseReturnDetail.vue similarity index 100% rename from src/views/modules/purchase/purchaseReturnDetail.vue rename to src/views/modules/purchase-return/purchaseReturnDetail.vue diff --git a/src/views/modules/purchase/purchaseReturnList.vue b/src/views/modules/purchase-return/purchaseReturnList.vue similarity index 100% rename from src/views/modules/purchase/purchaseReturnList.vue rename to src/views/modules/purchase-return/purchaseReturnList.vue diff --git a/src/views/modules/recv/inspectionResults.vue b/src/views/modules/recv/inspectionResults.vue deleted file mode 100644 index d1b2218..0000000 --- a/src/views/modules/recv/inspectionResults.vue +++ /dev/null @@ -1,109 +0,0 @@ - - - - -