From fd9deb7e45ff86f3570a3048a459b29f0ebbd628 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 13 六月 2024 18:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
static/js/menu.js | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/static/js/menu.js b/static/js/menu.js
index 23c17b7..661aeff 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -13,7 +13,7 @@
{
v: "涓氬姟绠＄悊",
i: "font icon-kexueyanjiuheshiyankaifa",
- p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport",
+ p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport costStatistics selectWarehouse",
c: [{
v: "妫�楠屼笅鍗�",
i: "font icon-erjidaohang",
@@ -39,12 +39,18 @@
i: "font icon-erjidaohang",
u: "b1-sample",
p: "selectWarehouse"
- }]
+ },{
+ v: "涓嶅悎鏍肩鐞�",
+ i: "font icon-erjidaohang",
+ u: "b1-unpass",
+ p: ""
+ }
+ ]
},
{
v: "鏍囧噯闆�",
i: "font icon-biaozhunji",
- p: "",
+ p: "selectStandardTreeList selectStandardTemplatePageList",
c: [{
v: "鏍囧噯搴�",
i: "font icon-erjidaohang",
@@ -64,8 +70,8 @@
c: [{
v: "宸ユ椂绠＄悊",
i: "font icon-erjidaohang",
- u: "",
- p: ""
+ u: "b3-work-time-management",
+ p: "selectAuxiliaryWorkingHours"
}, {
v: "浜哄憳鑰冨嫟",
i: "font icon-erjidaohang",
@@ -74,7 +80,7 @@
}, {
v: "浜哄憳鑰冭瘎",
i: "font icon-erjidaohang",
- u: "",
+ u: "b3-personnel-evaluation",
p: ""
}, {
v: "浜哄憳鑰冩牳",
@@ -94,8 +100,8 @@
}, {
v: "鐝",
i: "font icon-erjidaohang",
- u: "",
- p: ""
+ u: "b3-classes",
+ p: "performanceShiftPage performanceShiftPageYear"
}]
},
{
@@ -121,7 +127,7 @@
v: "鏍峰搧缂洪櫡鎸囨暟",
i: "font icon-erjidaohang",
u: "b4-sample-defects",
- p: ""
+ p: "selectSampleDefects"
}, {
v: "鑰楁潗缁熻",
i: "font icon-erjidaohang",
@@ -168,12 +174,12 @@
v: "瑙掕壊绠＄悊",
i: "el-icon-s-tools",
u: "role-manage",
- p: ""
+ p: "selectRoleLists"
}, {
v: "鐢ㄦ埛绠＄悊",
i: "el-icon-s-tools",
u: "person-manage",
- p: ""
+ p: "selectUserList"
}, {
v: "瀹㈡埛绠＄悊",
i: "el-icon-s-tools",
@@ -183,7 +189,7 @@
v: "绯荤粺鏃ュ織",
i: "el-icon-s-tools",
u: "system-log",
- p: "selectSystemLogList"
+ p: ""
}, {
v: "娑堟伅璇︽儏",
i: "el-icon-s-tools",
@@ -286,13 +292,13 @@
i: "font icon-erjidaohang",
u: "a6-personnel-overview",
g: "6.2 浜哄憳",
- p: "selectUserList"
+ p: "selectPersonnelOverview"
}, {
v: "浜哄憳鏄庣粏",
i: "font icon-erjidaohang",
u: "a6-personnel-detail",
g: "6.2 浜哄憳",
- p: "selectUserList"
+ p: "selectDepartmentLim"
}, {
v: "浜哄憳鍩硅",
i: "font icon-erjidaohang",
@@ -362,7 +368,7 @@
}, {
v: "澶栨潵浜哄憳绠＄悊",
i: "font icon-erjidaohang",
- u: "",
+ u: "a6-external-personnel-management",
g: "6.3 璁炬柦鍜岀幆澧冩潯浠�",
p: ""
}, {
@@ -398,7 +404,7 @@
}, {
v: "搴熺墿澶勭悊浜ゆ帴璁板綍",
i: "font icon-erjidaohang",
- u: "",
+ u: "a6-waste-handover",
g: "6.3 璁炬柦鍜岀幆澧冩潯浠�",
p: ""
}, {
@@ -494,7 +500,7 @@
}, {
v: "鏍囧噯鐗╄川娓呭崟",
i: "font icon-erjidaohang",
- u: "",
+ u: "a6-standard-material-list",
g: "6.5 璁￠噺婧簮鎬�",
p: ""
}, {
@@ -506,7 +512,7 @@
}, {
v: "鏍囧噯鐗╄川棰嗙敤",
i: "font icon-erjidaohang",
- u: "",
+ u: "a6-standard-material-requisition",
g: "6.5 璁￠噺婧簮鎬�",
p: ""
}, {
--
Gitblit v1.9.3