From 6108e3d49712b6ded5cf3c3e735ec40f13e35971 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 11 十一月 2025 15:03:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUE_New
---
src/router/index.js | 104 +++++++++++++++++++++++++++-------------------------
1 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index b4e727f..9f5f3e6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -41,26 +41,31 @@
},
],
},
- {
- path: "/login",
- component: () => import("@/views/login"),
- hidden: true,
- },
- {
- path: "/register",
- component: () => import("@/views/register"),
- hidden: true,
- },
+ //404
{
path: "/404",
component: () => import("@/views/error/404"),
hidden: true,
},
+ //401
{
path: "/401",
component: () => import("@/views/error/401"),
hidden: true,
},
+ //鐧诲綍
+ {
+ path: "/login",
+ component: () => import("@/views/login"),
+ hidden: true,
+ },
+ //娉ㄥ唽
+ {
+ path: "/register",
+ component: () => import("@/views/register"),
+ hidden: true,
+ },
+ //棣栭〉
{
path: "",
component: Layout,
@@ -74,6 +79,7 @@
},
],
},
+ //涓汉涓績
{
path: "/user",
component: Layout,
@@ -88,83 +94,62 @@
},
],
},
- // //鐧诲綍璺宠浆椤�
- // {
- // path: "/indexPage",
- // component: () => import("@/views/indexPage"),
- // hidden: true,
- // },
//閿�鍞嚭搴撳崟
- // {
- // path: "/sales/salesOUt/sellOutBill",
- // component: () => import("@/views/sellOutBill/index"),
- // hidden: true,
- // },
{
- path: "/sales/salesOUt/sellOutBill",
+ path: "/sell/sellOut/sellOutBill",
component: Layout,
hidden: true,
// permissions: ["system:goods:add"],
redirect: "noredirect",
meta: {
breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/sales/salesOUt", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ activeMenu: "/sell/sellOut/sellOutBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
children: [
{
- path: "/sales/salesOUt/sellOutBill",
- component: () => import("@/views/sell/sellOutBill"),
+ path: "/sell/sellOut/sellOutBill",
+ component: () => import("@/views/sell/sellOut/sellOutBill.vue"),
name: "SellOutBill",
- meta: { title: "閿�鍞嚭搴撳崟", activeMenu: "sales/salesOUt" },
+ meta: { title: "閿�鍞嚭搴撳崟", activeMenu: "sell/sellOUt/sellOutBill" },
},
],
},
- //閿�鍞嚭搴撳崟缂栬緫椤甸潰
- // {
- // path: "/sellOutBillEdit",
- // component: () => import("@/views/sales/salesOUt/sellOutBill/edit/index"),
- // hidden: true,
- // },
+ //閿�鍞嚭搴撳崟缂栬緫
{
- path: "/sales/salesOUt/sellOutBillEdit",
+ path: "/sell/sellOut/sellOutBillEdit",
component: Layout,
hidden: true,
redirect: "noredirect",
meta: {
breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/sales/salesOUt/sellOutBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ activeMenu: "/sell/sellOut/sellOutBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
children: [
{
- path: "/sales/salesOUt/sellOutBillEdit",
- component: () => import("@/views/sell/sellOutBill/edit"),
+ path: "/sell/sellOut/sellOutBillEdit",
+ component: () => import("@/views/sell/sellOut/sellOutBillEdit.vue"),
name: "SellOutBillEdit",
- meta: { title: "閿�鍞嚭搴撳崟缂栬緫", activeMenu: "sales/salesOUt" },
+ meta: { title: "閿�鍞嚭搴撳崟缂栬緫", activeMenu: "/sell/sellOut/sellOutBillEdit" },
},
],
},
- //閿�鍞崟
- // {
- // path: "/sellBill",
- // component: () => import("@/views/sellBill/index"),
- // hidden: true,
- // },
- //鐢熶骇璧勬簮
+ //閲囪喘鍏ュ簱鍗�
{
- path: "/basic/gy/gySource",
+ path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList",
component: Layout,
hidden: true,
+ // permissions: ["system:goods:add"],
redirect: "noredirect",
meta: {
breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/basic/gy/gySource", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ activeMenu: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
children: [
{
- path: "/basic/gy/gySource",
- component: () => import("@/views/basic/gySource"),
- name: "GySource",
- meta: { title: "鐢熶骇璧勬簮鍒楄〃", activeMenu: "basic/gy" },
+ path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList",
+ component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList"),
+ name: "Kf_POStockInBillList",
+ meta: { title: "閲囪喘鍏ュ簱鍗�", activeMenu: "/CaiGouGuanLi/CaiGouRuKu" },
},
],
},
@@ -179,6 +164,25 @@
component: () => import("@/views/component/printList/hBarPlanPrint"),
hidden: true,
},
+ //鐢熶骇璧勬簮
+ {
+ path: "/basic/production/gySource",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/basic/production/gySource", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/basic/production/gySource",
+ component: () => import("@/views/basic/production/gySource.vue"),
+ name: "GySource",
+ meta: { title: "鐢熶骇璧勬簮鍒楄〃", activeMenu: "basic/production" },
+ },
+ ],
+ },
// 浠撳簱
{
path: "/gyWarehouse",
--
Gitblit v1.9.1