From bf5c42b55da25fbcbb8f92bde539a8e27d800b40 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 26 三月 2024 14:16:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/router/index.js | 331 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 320 insertions(+), 11 deletions(-)
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index ed145a8..75a2c7b 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -15,12 +15,25 @@
name: 'login',
component: () => import('../views/LoginView.vue')
},
-
{
path: '/main',
name: 'main',
component: () => import('../layout/MainErpView.vue'),
children:[
+
+
+ {
+ path: 'Temperedlayout',
+ name: 'Temperedlayout',
+ component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
+ children:[
+ {
+ path: 'selectLayout',
+ name: 'selectLayout',
+ component: () => import('../views/TL/Temperedlayout/SelectLayout.vue'),
+ }
+ ]
+ },
//sd妯″潡
{
path: 'product',//浜у搧
@@ -178,6 +191,33 @@
}
]
},
+ // {
+ // path:'appMenu',
+ // name:'appMenu',
+ // component: () => import('../layout/component/appMpenu.vue'),
+ // children:[
+ // {
+ // path: 'appMenu',
+ // name: 'appMenu',
+ // component:()=>import('../layout/component/appMpenu.vue')
+ // },
+ // {
+ // path: 'appView',
+ // name: 'appView',
+ // component:()=>import('../layout/component/appView.vue')
+ // },
+ // {
+ // path: 'logoHeader',
+ // name: 'logoHeader',
+ // component:()=>import('../layout/component/logoHeader.vue')
+ // },
+ // {
+ // path: 'routerHeader',
+ // name: 'routerHeader',
+ // component:()=>import('../layout/component/routerHeader.vue')
+ // },
+ // ]
+ // },
//pp妯″潡
{
@@ -192,11 +232,11 @@
name: 'selectAddWorkOrder',
component: () => import('../views/pp/workOrder/SelectAddWorkOrder.vue'),
},
- {
- path: 'releaseWorkOrder',
- name: 'releaseWorkOrder',
- component: () => import('../views/pp/workOrder/ReleaseWorkOrder.vue'),
- },
+ // {
+ // path: 'releaseWorkOrder',
+ // name: 'releaseWorkOrder',
+ // component: () => import('../views/pp/workOrder/ReleaseWorkOrder.vue'),
+ // },
{
path: 'addWorkOrder',
name: 'addWorkOrder',
@@ -532,11 +572,103 @@
// }
]
},
-
-
-
-
//mm妯″潡
+ {
+ path: 'productStock',
+ name: 'productStock',
+ component: () => import('../views/mm/mainProductStock/ProductStock.vue'),
+ children:[
+ {
+ // 鎴愬搧搴撳瓨
+ path: 'productStockList',
+ name: 'productStockList',
+ component: () => import('../views/mm/mainProductStock/ProductStockList.vue'),
+ },
+ {
+ // 鎴愬搧鍏ュ簱
+ path: 'createProductStock',
+ name: 'createProductStock',
+ component:()=> import('../views/mm/mainProductStock/CreateProductStock.vue'),
+ },
+ {
+ // 鎴愬搧鍑哄簱
+ path: 'finishedProductOut',
+ name: 'finishedProductOut',
+ component:()=>import('../views/mm/mainProductStock/FinishedProductOut.vue')
+ },
+ {
+ // 鎴愬搧鍑哄簱
+ path: 'finishedProductReturn',
+ name: 'finishedProductReturn',
+ component:()=>import('../views/mm/mainProductStock/FinishedProductReturn.vue')
+ },
+ {
+ // 璁㈠崟璋冩嫧
+ path: 'orderAllocation',
+ name: 'orderAllocation',
+ component:()=>import('../views/mm/mainProductStock/OrderAllocation.vue'),
+ },
+ {
+ // 鎴愬搧棰嗗嚭
+ path: 'finishedGoodsIssue',
+ name: 'finishedGoodsIssue',
+ component:()=>import('../views/mm/mainProductStock/FinishedGoodsIssue.vue'),
+ },
+ {
+ // 鎴愬搧杩斿伐
+ path: 'finishedProductRework',
+ name: 'finishedProductRework',
+ component:()=>import('../views/mm/mainProductStock/FinishedProductRework.vue'),
+ },
+ {
+ // 璋冩嫧璁板綍
+ path: 'transferRecord',
+ name: 'transferRecord',
+ component:()=>import('../views/mm/mainProductStock/TransferRecord.vue'),
+ },
+ {
+ // 棰嗗嚭璁板綍
+ path: 'takeOutRecord',
+ name: 'takeOutRecord',
+ component:()=>import('../views/mm/mainProductStock/TakeOutRecord.vue'),
+ },
+ {
+ // 杩斿伐璁板綍
+ path: 'reworkRecord',
+ name: 'reworkRecord',
+ component:()=>import('../views/mm/mainProductStock/ReworkRecord.vue'),
+ },
+
+ {
+ path: '',
+ redirect:'/main/productStock/ProductStockList'
+ }
+ ]
+ },
+ {
+ // 鐗╂枡璧勬枡
+ path:'ingredients',
+ name:'ingredients',
+ component: () => import('../views/mm/mainIngredient/Ingredients.vue'),
+ children:[
+ {
+ path: 'selectIngredients',
+ name: 'selectIngredients',
+ component:()=>import('../views/mm/mainIngredient/SelectIngredients.vue')
+ },
+ {
+ path: 'createIngredients',
+ name: 'createIngredients',
+ component:()=>import('../views/mm/mainIngredient/CreateIngredients.vue')
+ },
+ {
+ path: '',
+ redirect:'/main/ingredients/SelectIngredients'
+ }
+ ]
+ },
+
+
{
path: 'UnLoadGlass',
name: 'UnLoadGlass',
@@ -559,7 +691,184 @@
}
]
},
-
+ {
+ /*----------- 閲囪喘璁㈠崟 ----------------*/
+ path: 'purchaseOrder',
+ name: 'purchaseOrder',
+ component: () => import('../views/mm/purchaseOrder/PurchaseOrder.vue'),
+ children: [
+ {
+ path: 'SelectPurchaseOrder',
+ name: 'SelectPurchaseOrder',
+ component: () => import('../views/mm/purchaseOrder/Select.vue'),
+ }, {
+ path: 'CreatePurchaseOrder',
+ name: 'CreatePurchaseOrder',
+ component: () => import('../views/mm/purchaseOrder/Create.vue')
+ },
+ /*----------- 鏂板 ----------------*/
+ {
+ path: 'PaymentPurchaseOrder',
+ name: 'PaymentPurchaseOrder',
+ component: () => import('../views/mm/purchaseOrder/Payment.vue')
+ },
+ /*----------- 閫�璐� ----------------*/
+ {
+ path: 'ReturnPurchaseOrder',
+ name: 'ReturnPurchaseOrder',
+ component: () => import('../views/mm/purchaseOrder/Return.vue')
+ },
+ /*----------- 鍏ュ簱 ----------------*/
+ {
+ path: 'StoragePurchaseOrder',
+ name: 'StoragePurchaseOrder',
+ component: () => import('../views/mm/purchaseOrder/Storage.vue')
+ },
+ {
+ path: '',
+ redirect: '/main/purchaseOrder/SelectPurchaseOrder'
+ }
+ ]
+ },
+ {
+ /*----------- 鎺扮墖/璇嗗埆 ----------------*/
+ path: 'identify',
+ name: 'identify',
+ component: () => import('../views/mm/identify/Identify.vue'),
+ children: [
+ {
+ path: 'SelectIdentify',
+ name: 'SelectIdentify',
+ component: () => import('../views/mm/identify/Select.vue'),
+ }
+ ]
+ },
+ {
+ /*----------- 鍗у紡缂撳瓨----------------*/
+ path: 'caching',
+ name: 'caching',
+ component: () => import('../views/mm/caching/Caching.vue'),
+ children: [
+ {
+ path: 'SelectCaching',
+ name: 'SelectCaching',
+ component: () => import('../views/mm/caching/caching.vue'),
+ }
+ ]
+ },
+ {
+ /*----------- 澶х悊鐗囩----------------*/
+ path: 'slicecage',
+ name: 'slicecage',
+ component: () => import('../views/mm/slicecage/Slicecage.vue'),
+ children: [
+ {
+ path: 'SelectSlicecage',
+ name: 'SelectSlicecage',
+ component: () => import('../views/mm/slicecage/slicecage.vue'),
+ }
+ ]
+ },
+ {
+ // 渚涘簲鍟嗙鐞嗭紒锛侊紒
+ path:'trader',
+ name:'trader',
+ component: () => import('../views/mm/mainTrader/Trader.vue'),
+ children:[
+ {
+ path: 'selectTrader',
+ name: 'selectTrader',
+ component:()=>import('../views/mm/mainTrader/SelectTrader.vue')
+ },
+ {
+ path: 'createTrader',
+ name: 'createTrader',
+ component:()=>import('../views/mm/mainTrader/CreateTrader.vue')
+ },
+ {
+ path: '',
+ redirect:'/main/trader/SelectTrader'
+ }
+ ]
+ },
+ /*------------- sunshiqiang Add --*/
+ {
+ /*----------- 浠撳偍鎶ヨ〃 ----------------*/
+ path: 'stockReport',
+ name: 'stockReport',
+ component: () => import('../views/mm/stockReport/stockReport.vue'),
+ children:[
+ {
+ path: 'WarehouseReport',
+ name: 'WarehouseReport',
+ component: () => import('../views/mm/stockReport/WarehouseReport.vue'),
+ }, {
+ path: 'StockMonthReport',
+ name: 'StockMonthReport',
+ component: () => import('../views/mm/stockReport/StockMonthReport.vue'),
+ }, {
+ path: 'SubsidiaryMonthReport',
+ name: 'SubsidiaryMonthReport',
+ component: () => import('../views/mm/stockReport/SubsidiaryMonthReport.vue'),
+ },
+ /*----------- 鏂板 ----------------*/
+ {
+ path: 'StockWarehouseReport',
+ name: 'StockWarehouseReport',
+ component: () => import('../views/mm/stockReport/StockWarehouseReport.vue'),
+ }, {
+ path: '',
+ redirect: '/main/stockReport/WarehouseReport'
+ }
+ ]
+ },
+ {
+ /*----------- ----------------*/
+ path: 'stockBasicData',
+ name: 'stockBasicData',
+ component: () => import('../views/mm/stockBasicData/StockBasicData.vue'),
+ children: [
+ {
+ path: 'SelectStockBasicData',
+ name: 'SelectStockBasicData',
+ component: () => import('../views/mm/stockBasicData/Select.vue'),
+ },
+ ]
+ },
+ {
+ /*----------- 閲囪喘鍏ュ簱 ----------------*/
+ path: 'purchaseStorage',
+ name: 'purchaseStorage',
+ component: () => import('../views/mm/purchaseStorage/PurchaseStorage.vue'),
+ children: [
+ {
+ path: 'SelectPurchaseStorage',
+ name: 'SelectPurchaseStorage',
+ component: () => import('../views/mm/purchaseStorage/Select.vue'),
+ },
+ {
+ path: '',
+ redirect: '/main/purchaseStorage/SelectPurchaseStorage'
+ }
+ ]
+ },
+ {
+ /*----------- 閲囪喘閫�璐� ----------------*/
+ path: 'purchaseReturn',
+ name: 'purchaseReturn',
+ component: () => import('../views/mm/purchaseReturn/PurchaseReturn.vue'),
+ children: [
+ {
+ path: 'SelectPurchaseReturn',
+ name: 'SelectPurchaseReturn',
+ component: () => import('../views/mm/purchaseReturn/Select.vue'),
+ },
+ {
+ path: '',
+ redirect: '/main/purchaseReturn/SelectPurchaseReturn'
+ }
+ ]
+ },
{
path: '',
redirect:'/main/order'
--
Gitblit v1.8.0