From d083b10403968b394a0a2076a3cab72efa5810ea Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 02 九月 2024 17:17:21 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master
---
src/assets/api/controller.js | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 077cdc7..6a1a026 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -40,7 +40,8 @@
}
const user = {
- selectUserList: "/user/selectUserList", //鑾峰彇鐢ㄦ埛鍒楄〃
+ selectUserList: "/user/selectUserList", //鑾峰彇鐢ㄦ埛鍒楄〃 (鐢ㄤ簬鐝,宸ユ椂)
+ selectUserList2: "/user/selectUserList2", //鑾峰彇鐢ㄦ埛鍒楄〃 (鐢ㄤ簬鐢ㄦ埛绠＄悊椤甸潰)
selectPersonnelOverview: "/user/selectPersonnelOverview", // 璧勬簮瑕佹眰-浜哄憳鎬昏
selectRoleList: "/role/selectRoleList", //鑾峰彇瑙掕壊鍒楄〃
updateUser: "/user/updateUser", //淇敼鐢ㄦ埛淇℃伅
@@ -166,7 +167,7 @@
selectOrderManDay: "/insOrder/selectOrderManDay", //鏌ヨ璁㈠崟鎬诲叡棰勮鏃堕棿
upInsOrder: "/insOrder/upInsOrder", //妫�楠屼笅鍙�
getInsOrder: "/insOrder/getInsOrder", //鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�
- upInsOrderOfState: "/insOrder/upInsOrderOfState", //瀹℃牳妫�楠屽崟鏈鸿繘琛岀姸鎬佷慨鏀�
+ upInsOrderOfState: "/insOrder/upInsOrderOfState2", //瀹℃牳妫�楠屽崟鏈鸿繘琛岀姸鎬佷慨鏀�
addInsOrderTemplate: "/insOrder/addInsOrderTemplate", //娣诲姞妫�楠屽崟妯℃澘
selectInsOrderTemplate: "/insOrder/selectInsOrderTemplate", //鏌ヨ妫�楠屽崟妯℃澘
selectInsOrderTemplateById: "/insOrder/selectInsOrderTemplateById", //閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭
@@ -206,6 +207,7 @@
getReportModel: "/insOrderPlan/getReportModel", // 鍒囨崲鍏夌氦-鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�
write: "/insOrderPlan/write", // 濉啓娓╁害涓庢箍搴�
temCycle: "/insOrderPlan/temCycle", // 娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)
+ jumpTeam: "/insOrderPlan/jumpTeam", // 鎻掗槦
}
const systemLog = {
@@ -309,6 +311,7 @@
const sealScope = {
selectSeal: "/sealScope/selectSeal", //鏌ヨ鍗扮珷鍒楄〃
addSeal: "/sealScope/addSeal", //娣诲姞鍗扮珷鍙傛暟
+ delectSeal: "/sealScope/delectSeal", //娣诲姞鍗扮珷鍙傛暟
}
const informationNotification = {
--
Gitblit v1.9.3