From cc9ddf2ecaf3ad935374f49c842227f7eb15779d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 十一月 2022 10:21:15 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/systemSetting/baseSetting/user/components/updateUser/index.vue | 32 ++++++--------------------------
1 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue b/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue
index 86f30f7..4b73e8f 100644
--- a/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue
@@ -83,6 +83,7 @@
// 淇敼鐢ㄦ埛淇℃伅
handleUser() {
const { flag, user, tempName, selectOrg, tempRole, isArraySame } = this;
+ let umsDepartManage={userId:user.id,departId:selectOrg.orgsid[0]}
this.$refs.user.validate((valid) => {
if (valid) {
user.isDy = `${user.isDy}`;
@@ -95,30 +96,8 @@
} else {
if (user.departName) {
this.$axios({
- method: 'post',
- url: `sccg/admin/update/${user.id}`,
- data: {
- "id": user.id,
- "username": user.username,
- "password": user.password,
- "icon": user.icon,
- "email": user.email,
- "nickName": user.nickName,
- "note": user.note,
- "createTime": user.createTime,
- "loginTime": user.loginTime,
- "status": user.status ? 1 : 0,
- "macAddress": user.macAddress,
- "ipAddress": user.ipAddress,
- "isDy": `${user.isDy}`,
- "sex": `${user.sex}`,
- "jobTitle": user.jobTitle,
- "departmentId": selectOrg.orgsid[0],
- "departName": user.departName,
- "userType": user.userType,
- "zj": user.zj,
- "mobile": user.mobile,
- }
+ method: 'put',
+ url: `/sccg/depart/user_update_depart?userId=`+user.id+'&departId='+selectOrg.orgsid[0]
})
.then(res => {
this.$message({
@@ -151,8 +130,8 @@
}
else {
this.$axios({
- method: 'post',
- url: 'sccg/admin/role/update?adminId=' + user.id + '&roleIds=' + user.role,
+ method: 'put',
+ url: 'sccg/depart/user_update_Role?id=' + user.id + '&roles=' + user.role,
})
.then(res => {
this.$message({
@@ -196,6 +175,7 @@
},
// 閮ㄩ棬淇敼
handleCheck(data, checked) {
+ console.log(this.selectOrg.orgsid[0])
this.user.departName = data.departName;
// 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮�
const indexs = this.selectOrg.orgsid.indexOf(data.id);
--
Gitblit v1.8.0