From c3e3920e4e7fcda3dd986c00bb80188381e93015 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 四月 2024 09:59:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/router/index.js | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 156 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index 323626f..95ded16 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -1,8 +1,9 @@
-import { createRouter, createWebHistory } from 'vue-router'
+import {createRouter, createWebHashHistory, createWebHistory} from 'vue-router'
import HomeView from '../views/HomeView.vue'
const router = createRouter({
- history: createWebHistory(import.meta.env.BASE_URL),
+ history: createWebHashHistory(),
+ //history: createWebHistory(import.meta.env.BASE_URL),
routes: [
{
path: '/',
@@ -21,6 +22,23 @@
component: () => import('../layout/MainErpView.vue'),
children:[
//sd妯″潡
+ {
+ path:'orderBasicData',
+ name: 'orderBasicData',
+ component: () => import('../views/sd/basicData/BasicData.vue'),
+ children:[
+ {
+ path: 'searchBasicData',
+ name: 'searchBasicData',
+ component: () => import('../views/sd/basicData/SearchBasicData.vue')
+ },
+ {
+ name: 'OrderBasicData',
+ path: '',
+ redirect:'/main/orderBasicData/searchBasicData'
+ }
+ ]
+ },
{
path: 'product',//浜у搧
name: 'product',
@@ -47,6 +65,12 @@
component: () => import('../views/sd/product/Test11.vue')
},
{
+ path: 'testSort',
+ name: 'testSort',
+ component: () => import('../views/sd/product/testSort.vue')
+ },
+ {
+ name: 'product',
path: '',
redirect:'/main/product/selectProduct'
}
@@ -108,6 +132,11 @@
name: 'createDelivery',
component: () => import('../views/sd/delivery/CreateDelivery.vue'),
},
+ {
+ path: 'deliveryPrinting',
+ name: 'deliveryPrinting',
+ component: () => import('../views/sd/delivery/DeliveryPrinting.vue'),
+ },
{
@@ -168,6 +197,11 @@
path: 'createCustomer',
name: 'createCustomer',
component: () => import('../views/sd/customer/CreateCustomer.vue'),
+ },
+ {
+ path: 'selectCustomerOrder',
+ name: 'selectCustomerOrder',
+ component: () => import('../views/sd/customer/SelectCustomerOrder.vue'),
}
]
},
@@ -255,9 +289,14 @@
component: () => import('../views/pp/processCard/PrintProcess.vue'),
},
{
- path: 'reShelving',
- name: 'reShelving',
- component: () => import('../views/pp/processCard/ReShelving.vue'),
+ path: 'productionScheduling',
+ name: 'productionScheduling',
+ component: () => import('../views/pp/processCard/ProductionScheduling.vue'),
+ },
+ {
+ path: 'selectDetailProcessCard',
+ name: 'selectDetailProcessCard',
+ component: () => import('../views/pp/processCard/SelectDetailProcessCard.vue'),
},
{
path: '',
@@ -336,18 +375,18 @@
//杩斿伐绠＄悊
path: 'rework',
name: 'rework',
- component: () => import('../views/pp/Rework/Rework.vue'),
+ component: () => import('../views/pp/rework/Rework.vue'),
children:[
{
path: 'addRework',
name: 'addRework',
- component: () => import('../views/pp/Rework/AddRework.vue'),
+ component: () => import('../views/pp/rework/AddRework.vue'),
},
{
path: 'selectRework',
name: 'selectRework',
- component: () => import('../views/pp/Rework/SelectRework.vue'),
+ component: () => import('../views/pp/rework/SelectRework.vue'),
},
{
path: '',
@@ -466,6 +505,12 @@
component: () => import('../views/pp/report/ProductionSchedule.vue'),
},
{
+ //娴佺▼鍗¤繘搴�
+ path: 'processCardProgress',
+ name: 'processCardProgress',
+ component: () => import('../views/pp/report/ProcessCardProgress.vue'),
+ },
+ {
//鍝佽川鎶ヨ〃
path: 'qualityReport',
name: 'qualityReport',
@@ -513,13 +558,50 @@
name: 'damageReport',
component: () => import('../views/pp/report/DamageReport.vue'),
},
+ {
+ //璺ㄥ伐搴忔鐮存姤琛�
+ path: 'crossProcessBreaking',
+ name: 'crossProcessBreaking',
+ component: () => import('../views/pp/report/crossProcessBreaking.vue'),
+ },
// {
// path: '',
// redirect:'/main/report/ProductionSchedule'
// }
]
},
-
+ {
+ //鍩虹鏁版嵁绠＄悊
+ path: 'productionBasicData',
+ name: 'productionBasicData',
+ component: () => import('../views/pp/productionBasicData/ProductionBasicData.vue'),
+ children:[
+ {
+ path: 'selectProductionBasicData',
+ name: 'selectProductionBasicData',
+ component: () => import('../views/pp/productionBasicData/SelectProductionBasicData.vue'),
+ },
+ {
+ path: 'addBreakageReason',
+ name: 'addBreakageReason',
+ component: () => import('../views/pp/productionBasicData/AddBreakageReason.vue'),
+ },
+ {
+ path: 'addBreakageType',
+ name: 'addBreakageType',
+ component: () => import('../views/pp/productionBasicData/AddBreakageType.vue'),
+ },
+ {
+ path: 'addTeamGroup',
+ name: 'addTeamGroup',
+ component: () => import('../views/pp/productionBasicData/AddTeamGroup.vue'),
+ },
+ {
+ path: '',
+ redirect:'/main/productionBasicData/SelectProductionBasicData'
+ }
+ ]
+ },
@@ -570,6 +652,30 @@
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: 'storageRecord',
+ name: 'storageRecord',
+ component:()=>import('../views/mm/mainProductStock/StorageRecord.vue'),
},
{
@@ -631,6 +737,31 @@
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'
@@ -669,7 +800,7 @@
/*----------- 浠撳偍鎶ヨ〃 ----------------*/
path: 'stockReport',
name: 'stockReport',
- component: () => import('../views/mm/stockReport/stockReport.vue'),
+ component: () => import('../views/mm/stockReport/StockReport.vue'),
children:[
{
path: 'WarehouseReport',
@@ -715,8 +846,20 @@
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'
}
@@ -758,7 +901,7 @@
},
{
path: '',
- redirect:'/main/Product'
+ redirect:'/main/order'
}
]
},
--
Gitblit v1.8.0