From c53d5fd1f68e9a681f8437d0b9fcc264dc4b65c2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 12 六月 2020 15:14:19 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/views/system/user/index.vue | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 87e75d1..ca6781b 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -133,7 +133,7 @@
</el-row>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="40" align="center" />
+ <el-table-column type="selection" width="50" align="center" />
<el-table-column label="鐢ㄦ埛缂栧彿" align="center" prop="userId" />
<el-table-column label="鐢ㄦ埛鍚嶇О" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="鐢ㄦ埛鏄电О" align="center" prop="nickName" :show-overflow-tooltip="true" />
@@ -198,7 +198,7 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀瑰弬鏁伴厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="600px">
+ <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
@@ -208,7 +208,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
- <treeselect v-model="form.deptId" :options="deptOptions" placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" />
+ <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true" :show-count="true" placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -222,7 +222,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
+ <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛鍚嶇О" prop="userName">
<el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" />
</el-form-item>
</el-col>
@@ -295,7 +295,7 @@
</el-dialog>
<!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
- <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px">
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
ref="upload"
:limit="1"
@@ -572,8 +572,6 @@
resetUserPwd(row.userId, value).then(response => {
if (response.code === 200) {
this.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + value);
- } else {
- this.msgError(response.msg);
}
});
}).catch(() => {});
@@ -588,8 +586,6 @@
this.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
- } else {
- this.msgError(response.msg);
}
});
} else {
@@ -598,8 +594,6 @@
this.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
- } else {
- this.msgError(response.msg);
}
});
}
@@ -662,4 +656,4 @@
}
}
};
-</script>
+</script>
\ No newline at end of file
--
Gitblit v1.9.3