From 60322c503d201e4d1000e62d8ecf17db4f628e4c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 12 三月 2025 15:49:23 +0800
Subject: [PATCH] 合并冲突
---
src/api/system/user.js | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/api/system/user.js b/src/api/system/user.js
index bd2c924..cb4750c 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -138,24 +138,24 @@
// 鑾峰彇浜轰簨绯荤粺缁勭粐
export function selectCompaniesList() {
return request({
- url: "/companies/selectCompaniesList",
+ url: "/system/newUser/selectCompaniesList",
method: "get",
});
}
// 鑾峰彇浜轰簨绯荤粺缁勭粐涓嬬殑浜哄憳
export function selectSimpleList(data) {
return request({
- url: "/companies/selectSimpleList",
- method: "post",
+ url: "/system/newUser/selectSimpleList",
+ method: "get",
params: data,
});
}
// 鑾峰彇浜轰簨绯荤粺缁勭粐涓嬬殑浜哄憳
export function addPersonUser(data) {
return request({
- url: "/companies/addPersonUser",
+ url: "/system/newUser/addPersonUser",
method: "post",
- params: data,
+ data: data,
});
}
// 鑾峰彇瑙掕壊
@@ -165,13 +165,7 @@
method: "get",
});
}
-// 鑾峰彇鍗曚綅
-export function selectCustomEnum() {
- return request({
- url: "/user/selectCustomEnum",
- method: "get",
- });
-}
+
// 鎻愪氦娣诲姞鏋舵瀯淇℃伅
export function addDepartment(params) {
return request({
@@ -189,3 +183,19 @@
params: query,
});
}
+
+// 鑾峰彇褰撳墠鐧诲綍浜哄憳閮ㄩ棬
+export function selectUserDepartmentLimsName() {
+ return request({
+ url: "/system/newUser/selectUserDepartmentLimsName",
+ method: "get",
+ });
+}
+
+// 鑾峰彇瀹為獙瀹や笅鐨勬楠屽憳鍒楄〃
+export function getLaboratoryPersonList() {
+ return request({
+ url: "/system/newUser/getLaboratoryPersonList",
+ method: "get",
+ });
+}
--
Gitblit v1.9.3