From 0b30ecf9d6581b4e7a6f7b397ced716acaeaefc0 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 26 三月 2024 14:15:37 +0800
Subject: [PATCH] 更新冲突
---
UI-Project/src/router/index.js | 291 ++-------------------------------------------------------
1 files changed, 14 insertions(+), 277 deletions(-)
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index e3d9453..ed145a8 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -15,6 +15,7 @@
name: 'login',
component: () => import('../views/LoginView.vue')
},
+
{
path: '/main',
name: 'main',
@@ -537,292 +538,28 @@
//mm妯″潡
{
- path: 'productStock',
- name: 'productStock',
- component: () => import('../views/mm/mainProductStock/ProductStock.vue'),
+ path: 'UnLoadGlass',
+ name: 'UnLoadGlass',
+ component: () => import('../views/UnLoadGlass/UnLoadGlass.vue'),
children:[
{
- // 鎴愬搧搴撳瓨
- path: 'productStockList',
- name: 'productStockList',
- component: () => import('../views/mm/mainProductStock/ProductStockList.vue'),
+ path: '/UnLoadGlass/loadmachinerack',
+ name: 'loadmachinerack',
+ component: () => import('../views/UnLoadGlass/loadmachinerack.vue')
},
{
- // 鎴愬搧鍏ュ簱
- path: 'createProductStock',
- name: 'createProductStock',
- component:()=> import('../views/mm/mainProductStock/CreateProductStock.vue'),
+ path: '/UnLoadGlass/Landingindication',
+ name: 'Landingindication',
+ component: () => import('../views/UnLoadGlass/Landingindication.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: '/UnLoadGlass/Landingindicationtwo',
+ name: 'Landingindicationtwo',
+ component: () => import('../views/UnLoadGlass/Landingindicationtwo.vue')
}
]
},
-
-
-
-
-
- {
- // 鐗╂枡璧勬枡
- 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:'ingredientsStock',
- name:'ingredientsStock',
- component: () => import('../views/mm/mainIngredientStock/IngredientsStock.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: '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: '',
- redirect:'/main/ingredientsStock/SelectIngredientsStock'
- }
- ]
- },
-
-
-
-
-
- {
- // 渚涘簲鍟嗙鐞嗭紒锛侊紒
- 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: '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: '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