mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-20 16:26:43 +08:00
Merge branch '251114-feature-course-online' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 251114-feature-course-online
This commit is contained in:
@@ -111,6 +111,15 @@ const getUsersByIds = function(ids) {
|
|||||||
return ajax.postJson(baseURL,'/user/getUserMessageToDai',ids);
|
return ajax.postJson(baseURL,'/user/getUserMessageToDai',ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据关键字检索用户(创建人下拉)
|
||||||
|
* @param {string} keyword
|
||||||
|
*/
|
||||||
|
const selectUser = function(keyword = '') {
|
||||||
|
return ajax.postJson(baseURL,'/user/selectuser',{ keyword });
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
userParentOrg,
|
userParentOrg,
|
||||||
findOrgsByKeyword,
|
findOrgsByKeyword,
|
||||||
@@ -125,5 +134,6 @@ export default {
|
|||||||
getUsersByIds,
|
getUsersByIds,
|
||||||
updateUser,
|
updateUser,
|
||||||
logout,
|
logout,
|
||||||
getAllOrgTree
|
getAllOrgTree,
|
||||||
|
selectUser
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,12 +44,11 @@
|
|||||||
:data="tableData"
|
:data="tableData"
|
||||||
@selection-change="onSelectionChange"
|
@selection-change="onSelectionChange"
|
||||||
:row-key="row => row.id"
|
:row-key="row => row.id"
|
||||||
max-height="420"
|
|
||||||
>
|
>
|
||||||
<el-table-column type="selection" width="50" />
|
<el-table-column type="selection" width="50" />
|
||||||
<el-table-column prop="userName" label="姓名" min-width="220" show-overflow-tooltip />
|
<el-table-column prop="userName" label="姓名" min-width="120" show-overflow-tooltip />
|
||||||
<el-table-column prop="workNum" label="工号" width="120" />
|
<el-table-column prop="workNum" label="工号" width="130" />
|
||||||
<el-table-column prop="departName" label="部门" width="120" />
|
<el-table-column prop="departName" label="部门" width="140" />
|
||||||
<el-table-column prop="orgPath" label="组织路径" min-width="200" show-overflow-tooltip />
|
<el-table-column prop="orgPath" label="组织路径" min-width="200" show-overflow-tooltip />
|
||||||
</el-table>
|
</el-table>
|
||||||
<div class="pagination">
|
<div class="pagination">
|
||||||
@@ -244,7 +243,7 @@ export default {
|
|||||||
type: 13,
|
type: 13,
|
||||||
deptIds: [],
|
deptIds: [],
|
||||||
groupIds: [],
|
groupIds: [],
|
||||||
studentList: this.selectedRows.map((e) => ({ id: e.userId })),
|
studentList: this.selectedRows.map((e) => ({ id: e.userId, realName: e.userName })),
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$showManageMessage("添加成功", 'success');
|
this.$showManageMessage("添加成功", 'success');
|
||||||
this.$emit("confirm", this.selectedRows);
|
this.$emit("confirm", this.selectedRows);
|
||||||
|
|||||||
Reference in New Issue
Block a user