From c9fe8df1eb78f1e40b9b831f68b5e1a9e4ecf711 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期二, 26 三月 2024 13:52:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/router/index.js | 244 +++++++++++++++++++++++++++---------------------
1 files changed, 139 insertions(+), 105 deletions(-)
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 30471a9..75a2c7b 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -20,17 +20,19 @@
name: 'main',
component: () => import('../layout/MainErpView.vue'),
children:[
+
+
{
- path: 'product',//浜у搧
- name: 'product',
-
+ path: 'Temperedlayout',
+ name: 'Temperedlayout',
+ component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
children:[
{
- path: 'Temperedlayout',
- name: 'Temperedlayout',
- component: () => import('../views/TemperedLayout/Temperedlayout.vue')
+ path: 'selectLayout',
+ name: 'selectLayout',
+ component: () => import('../views/TL/Temperedlayout/SelectLayout.vue'),
}
- ]
+ ]
},
//sd妯″潡
{
@@ -189,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妯″潡
{
@@ -203,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',
@@ -543,10 +572,6 @@
// }
]
},
-
-
-
-
//mm妯″潡
{
path: 'productStock',
@@ -620,11 +645,6 @@
}
]
},
-
-
-
-
-
{
// 鐗╂枡璧勬枡
path:'ingredients',
@@ -649,66 +669,106 @@
},
-
-
{
- // 鐗╂枡搴撳瓨
- path:'ingredientsStock',
- name:'ingredientsStock',
- component: () => import('../views/mm/mainIngredientStock/IngredientsStock.vue'),
+ path: 'UnLoadGlass',
+ name: 'UnLoadGlass',
+ component: () => import('../views/UnLoadGlass/UnLoadGlass.vue'),
children:[
{
- path: 'selectIngredientsStock',
- name: 'selectIngredientsStock',
- component:()=>import('../views/mm/mainIngredientStock/SelectIngredientsStock.vue')
- },
-
- {
- path: 'accessoriesMonthlySettlement',
- name: 'accessoriesMonthlySettlement',
- component:()=>import('../views/mm/mainIngredientStock/AccessoriesMonthlySettlement.vue')
+ path: '/UnLoadGlass/loadmachinerack',
+ name: 'loadmachinerack',
+ component: () => import('../views/UnLoadGlass/loadmachinerack.vue')
},
{
- path: 'originalMonthlySettlement',
- name: 'originalMonthlySettlement',
- component:()=>import('../views/mm/mainIngredientStock/OriginalMonthlySettlement.vue')
- },
- // 鐗╂枡鍑哄簱
- {
- path: 'materialOutbound',
- name: 'materialOutbound',
- component:()=>import('../views/mm/mainIngredientStock/MaterialOutbound.vue')
- },
- //鍑哄簱鏂板
- {
- path:'createOutBound',
- name:'createOutBound',
- component:()=>import('../views/mm/mainIngredientStock/CreateOutBound.vue')
- },
- //杩斿簱
- {
- path:'returnToStorage',
- name:'returnToStorage',
- component:()=>import('../views/mm/mainIngredientStock/ReturnToStorage.vue')
- },
-
- //杩斿簱鏂板
- {
- path:'returnToStorageCreate',
- name:'returnToStorageCreate',
- component:()=>import('../views/mm/mainIngredientStock/ReturnToStorageCreate.vue')
+ path: '/UnLoadGlass/Landingindication',
+ name: 'Landingindication',
+ component: () => import('../views/UnLoadGlass/Landingindication.vue')
},
{
- path: '',
- redirect:'/main/ingredientsStock/SelectIngredientsStock'
+ path: '/UnLoadGlass/Landingindicationtwo',
+ name: 'Landingindicationtwo',
+ component: () => import('../views/UnLoadGlass/Landingindicationtwo.vue')
}
]
},
-
-
-
-
-
+ {
+ /*----------- 閲囪喘璁㈠崟 ----------------*/
+ 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',
@@ -763,42 +823,16 @@
]
},
{
- /*----------- 閲囪喘璁㈠崟 ----------------*/
- path: 'purchaseOrder',
- name: 'purchaseOrder',
- component: () => import('../views/mm/purchaseOrder/PurchaseOrder.vue'),
+ /*----------- ----------------*/
+ path: 'stockBasicData',
+ name: 'stockBasicData',
+ component: () => import('../views/mm/stockBasicData/StockBasicData.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: 'SelectStockBasicData',
+ name: 'SelectStockBasicData',
+ component: () => import('../views/mm/stockBasicData/Select.vue'),
+ },
]
},
{
--
Gitblit v1.8.0