From b9b929cee338523de30ba0db4e77c50b1ef03583 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期三, 12 十一月 2025 16:24:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/store/modules/permission.js | 339 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 291 insertions(+), 48 deletions(-)
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 4f09f67..c5581f4 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,8 +44,8 @@
title: "閿�鍞鐞�",
},
hidden: false,
- name: "Sell",
- path: "/sell",
+ name: "Sales",
+ path: "/sales",
redirect: "noRedirect",
children: [
{
@@ -56,8 +56,8 @@
title: "閿�鍞嚭搴撳崟",
},
hidden: false,
- name: "SellOut",
- path: "sellOut",
+ name: "SalesOUt",
+ path: "salesOUt",
redirect: "noRedirect",
component: "Layout",
children: [
@@ -68,7 +68,8 @@
noCache: false,
title: "閿�鍞嚭搴撳崟缁存姢",
},
- component: () =>import("@/views/sell/sellOut/sellOutBill.vue"),
+ component: () =>
+ import("@/views/sell/sellOut/sellOutBill.vue"),
hidden: false,
name: "SellOutBill",
path: "sellOutBill",
@@ -80,15 +81,101 @@
noCache: false,
title: "閿�鍞嚭搴撳崟",
},
- component: () => import('@/views/sell/sellOut/sellOutBillEdit.vue'),
+ component: () =>
+ import("@/views/sell/sellOut/sellOutBillEdit.vue"),
hidden: false,
name: "SellOutBillEdit",
path: "sellOutBillEdit",
},
],
},
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "閿�鍞鍗�",
+ },
+ hidden: false,
+ name: "SeOrder",
+ path: "seOrder",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "閿�鍞鍗曠淮鎶�",
+ },
+ component: () =>
+ import("@/views/sell/xsSeOrderBill/xsSeOrderBill.vue"),
+ hidden: false,
+ name: "XsSeOrderBill",
+ path: "xsSeOrderBill",
+ },
+ ],
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鍙戣揣閫氱煡鍗�",
+ },
+ hidden: false,
+ name: "SeOutStock",
+ path: "seOutStock",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鍙戣揣閫氱煡鍗曠淮鎶�",
+ },
+ component: () =>
+ import("@/views/sell/XsSeOutStockBill.vue"),
+ hidden: false,
+ name: "XsSeOutStockBill",
+ path: "xsSeOutStockBill",
+ },
+ ],
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "閫�璐ч�氱煡鍗�",
+ },
+ hidden: false,
+ name: "SeOutStockBack",
+ path: "seOutStockBack",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "閫�璐ч�氱煡鍗曠淮鎶�",
+ },
+ component: () =>
+ import("@/views/sell/XsSeOutStockBackBillList.vue"),
+ hidden: false,
+ name: "XsSeOutStockBackBillList",
+ path: "xsSeOutStockBackBillList",
+ },
+ ],
+ },
],
- },{
+ },
+ {
alwaysShow: true,
component: "Layout",
meta: {
@@ -110,8 +197,8 @@
title: "鐢熶骇璧勬枡",
},
hidden: false,
- name: "Production",
- path: "production",
+ name: "Gy",
+ path: "gy",
redirect: "noRedirect",
component: "Layout",
children: [
@@ -122,52 +209,23 @@
noCache: false,
title: "鐢熶骇璧勬枡鍒楄〃",
},
- component: () =>
- import("@/views/basic/production/gySource.vue"),
+ component: () => import("@/views/basic/gySource/index.vue"),
hidden: false,
name: "GySource",
path: "gySource",
},
- // {
- // meta: {
- // icon: "build",
- // link: null,
- // noCache: false,
- // title: "鐢熶骇璧勬枡鍒楄〃",
- // },
- // component: () =>
- // import("@/views/basic/production/gySource.vue"),
- // hidden: false,
- // name: "GySource",
- // path: "gySource",
- // }
],
},
- ],
- },{
- alwaysShow: true,
- component: "Layout",
- meta: {
- icon: "build",
- link: null,
- noCache: false,
- title: "绯荤粺绠＄悊",
- },
- hidden: false,
- name: "System",
- path: "/system",
- redirect: "noRedirect",
- children: [
{
meta: {
icon: "build",
link: null,
noCache: false,
- title: "鐢ㄦ埛绠＄悊",
+ title: "鍏敤璧勬枡",
},
hidden: false,
- name: "User",
- path: "user",
+ name: "Gy",
+ path: "gy",
redirect: "noRedirect",
component: "Layout",
children: [
@@ -176,20 +234,206 @@
icon: "build",
link: null,
noCache: false,
- title: "鐢ㄦ埛鍒楄〃",
+ title: "浠撳簱鍒楄〃",
},
component: () =>
- import("@/views/system/user/xtUserList.vue"),
+ import("@/views/basic/gyWarehouse/gyWarehouse.vue"),
hidden: false,
- name: "XtUserList",
- path: "xtUserList",
+ name: "GyWarehouse",
+ path: "gyWarehouse",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "浠撲綅鍒楄〃",
+ },
+ component: () =>
+ import("@/views/basic/gyStockPlace/gyStockPlace.vue"),
+ hidden: false,
+ name: "GyStockPlace",
+ path: "gyStockPlace",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鑱屽憳鍒楄〃",
+ },
+ component: () =>
+ import("@/views/basic/gyEmployee/gyEmployee.vue"),
+ hidden: false,
+ name: "GyEmployee",
+ path: "gyEmployee",
+ },
+ ],
+ },
+ ],
+ },
+ {
+ alwaysShow: true,
+ component: "Layout",
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "閲囪喘绠＄悊",
+ },
+ hidden: false,
+ name: "Purchase",
+ path: "/purchase",
+ redirect: "noRedirect",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "閲囪喘璁㈠崟",
+ },
+ hidden: false,
+ name: "PoOrder",
+ path: "poOrder",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "閲囪喘璁㈠崟鍒楄〃",
+ },
+ component: () =>
+ import("@/views/purchase/cgPoOrderBill/cgPoOrderBill"),
+ hidden: false,
+ name: "CgPoOrderBill",
+ path: "cgPoOrderBill",
+ },
+ ],
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鏀舵枡閫氱煡鍗�",
+ },
+ hidden: false,
+ name: "PoInStock",
+ path: "PoInStock",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鏀舵枡閫氱煡鍗曞垪琛�",
+ },
+ component: () =>
+ import(
+ "@/views/purchase/cgPoInStockBill/cgPoInStockBill.vue"
+ ),
+ hidden: false,
+ name: "CgPoInStockBill",
+ path: "cgPoInStockBill",
+ },
+ ],
+ },
+ {
+ alwaysShow: true,
+ component: "Layout",
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "绯荤粺绠＄悊",
+ },
+ hidden: false,
+ name: "System",
+ path: "/system",
+ redirect: "noRedirect",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鐢ㄦ埛绠＄悊",
+ },
+ hidden: false,
+ name: "User",
+ path: "user",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鐢ㄦ埛鍒楄〃",
+ },
+ component: () =>
+ import("@/views/system/user/xtUserList.vue"),
+ hidden: false,
+ name: "XtUserList",
+ path: "xtUserList",
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ {
+ alwaysShow: true,
+ component: "Layout",
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鐢熶骇绠＄悊",
+ },
+ hidden: false,
+ name: "ICMO",
+ path: "/icmo",
+ redirect: "noRedirect",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鐢熶骇璁㈠崟",
+ },
+ hidden: false,
+ name: "ScIcmoBill",
+ path: "scIcmoBill",
+ redirect: "noRedirect",
+ component: "Layout",
+ children: [
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鐢熶骇璁㈠崟鍒楄〃",
+ },
+ component: () => import("@/views/ICMO/ScICMOBillList.vue"),
+ hidden: false,
+ name: "ScICMOBillList",
+ path: "scICMOBillList",
},
],
},
],
},
];
- console.log(data)
const sdata = JSON.parse(JSON.stringify(data));
const rdata = JSON.parse(JSON.stringify(data));
const sidebarRoutes = filterAsyncRouter(sdata);
@@ -201,7 +445,6 @@
commit("SET_SIDEBAR_ROUTERS", constantRoutes.concat(sidebarRoutes));
commit("SET_DEFAULT_ROUTES", sidebarRoutes);
commit("SET_TOPBAR_ROUTES", sidebarRoutes);
- console.log(11, rewriteRoutes);
resolve(rewriteRoutes);
});
},
--
Gitblit v1.9.1