From cf49fa32aad9c0089a3b48c4d0445528fb5cc445 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 30 九月 2024 12:55:52 +0800
Subject: [PATCH] Merge branch 'master' into release
---
src/views/console/system/addUser.vue | 74 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/src/views/console/system/addUser.vue b/src/views/console/system/addUser.vue
index 9f5f8fd..f9ce99f 100644
--- a/src/views/console/system/addUser.vue
+++ b/src/views/console/system/addUser.vue
@@ -13,8 +13,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瀵嗙爜" prop="password">
- <el-input v-model="form.password" placeholder="瀵嗙爜" clearable></el-input>
+ <el-form-item label="瀵嗙爜">
+ <el-input v-model="form.password" placeholder="" :disabled="isDisabled" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -60,6 +60,7 @@
emits: ['success', 'closed'],
data() {
return {
+ isDisabled: false,
deptIdList: [],
employeeIdOptions: [],
roleList: [],
@@ -73,9 +74,9 @@
isSaveing: false,
//琛ㄥ崟鏁版嵁
form: {
+ password: "",
account: "",
realName: "",
- password: "",
phone: "",
email: "",
employeeId: "",
@@ -107,11 +108,28 @@
mounted() {
this.getRole();
this.getDeptIdList();
- this.getEmployee();
},
methods: {
employeeIdChange(val) { //鍏宠仈鍛樺伐
- val = val[val.length - 1];
+ if(val == null) {
+ this.form.employeeId = "";
+ this.form.employeeName = "";
+ return;
+ };
+ var that = this;
+ this.form.employeeId = val[val.length - 1];
+ function forEmp(arr) {
+ arr.forEach(item=> {
+ if(item.id == that.form.employeeId) {
+ that.form.employeeName = item.name;
+ }else {
+ if(item.children) {
+ forEmp(item.children);
+ }
+ }
+ })
+ }
+ forEmp(this.employeeIdOptions);
},
roleIdChange(val) { //鏁版嵁鏉冮檺
this.form.roleIdStr = val.join(",");
@@ -123,6 +141,9 @@
open(mode='add'){
this.mode = mode;
this.visible = true;
+ if(mode=='add') {
+ this.getEmployee("");
+ }
return this
},
//鍔犺浇鏍戞暟鎹�
@@ -137,10 +158,8 @@
//琛ㄥ崟鎻愪氦鏂规硶
submit(){
var obj = Object.assign({},this.form);
- obj.employeeId = obj.employeeIdStr;
obj.deptId = obj.deptIdStr;
obj.roleId = obj.roleIdStr;
- delete obj.employeeIdStr;
delete obj.deptIdStr;
delete obj.roleIdStr;
this.$refs.dialogForm.validate(async (valid) => {
@@ -175,24 +194,45 @@
}
})
},
- getEmployee() {
- this.$HTTP.get("/api/blade-cps/employee/unbind-employee?employeeId=").then(res=> {
+ getEmployee(employeeId) {
+ this.$HTTP.get("/api/blade-cps/employee/unbind-employee?employeeId=" + employeeId).then(res=> {
if(res.code == 200) {
+ function changeArr(arr) {
+ arr.forEach(item=> {
+ if(!item.children) {
+ if(item.isGroup) {
+ item.disabled = true;
+ }else {
+ item.disabled = false;
+ }
+ }else {
+ changeArr(item.children)
+ }
+ })
+ }
+ changeArr(res.data[0].children);
this.employeeIdOptions = res.data;
}
})
},
- //琛ㄥ崟娉ㄥ叆鏁版嵁
+ showDetail(data) {
+ this.$HTTP.get("/api/blade-user/detail?id="+data.id).then(res=> {
+ if(res.code == 200) {
+ res.data.deptIdStr = res.data.deptId;
+ res.data.roleIdStr = res.data.roleId;
+ res.data.roleId = res.data.roleId.split(",");
+ res.data.deptId = [res.data.deptId];
+ this.form = res.data;
+ this.getEmployee(res.data.employeeId);
+ }
+ })
+ },
+ //琛ㄥ崟娉ㄥ叆鏁版嵁
setData(data){
- this.form.id = data.id
- this.form.userName = data.userName
- this.form.avatar = data.avatar
- this.form.name = data.name
- this.form.group = data.group
- this.form.dept = data.dept
-
//鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
//Object.assign(this.form, data)
+ this.showDetail(data);
+ this.isDisabled = true;
}
}
}
--
Gitblit v1.9.3