From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +0800
Subject: [PATCH] 合并冲突
---
static/js/menu.js | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/static/js/menu.js b/static/js/menu.js
index 6f55193..0542805 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -18,26 +18,26 @@
v: "妫�楠屼笅鍗�",
i: "font icon-erjidaohang",
u: "b1-inspection-order",
- p: ""
+ p: "selectInsOrderParameter"
}, {
v: "妫�楠屼换鍔�",
i: "font icon-erjidaohang",
- u: "",
- p: ""
+ u: "b1-inspect-order-plan",
+ p: "selectInsOrderPlanList"
}, {
v: "鎶ュ憡缂栧埗",
i: "font icon-erjidaohang",
- u: "",
+ u: "b1-report-preparation",
p: ""
}, {
v: "璐圭敤缁熻",
i: "font icon-erjidaohang",
- u: "",
+ u: "b1-expenses",
p: ""
}, {
v: "鏍峰搧绠＄悊",
i: "font icon-erjidaohang",
- u: "",
+ u: "b1-sample",
p: ""
}]
},
@@ -51,10 +51,10 @@
u: "b2-standard",
p: "selectStandardTreeList"
}, {
- v: "鏍囧噯妯℃澘",
+ v: "鍘熷璁板綍妯℃澘",
i: "font icon-erjidaohang",
- u: "",
- p: ""
+ u: "b2-standard-template",
+ p: "selectStandardTemplatePageList"
}]
},
{
@@ -64,7 +64,7 @@
c: [{
v: "宸ユ椂绠＄悊",
i: "font icon-erjidaohang",
- u: "fans-submit",
+ u: "",
p: ""
}, {
v: "浜哄憳鑰冨嫟",
@@ -543,7 +543,7 @@
}, {
v: "瀹為獙瀹ょ殑妫�娴嬭兘鍔涙。妗�",
i: "font icon-erjidaohang",
- u: "standard_method",
+ u: "a7-standard-method",
g: "7.2 鏂规硶鐨勯�夋嫨銆侀獙璇佸拰纭",
p: "selectStandardMethodList"
}, {
--
Gitblit v1.9.3