From ff46cc24356b2cd2f23ab3cd7892e61b682d2b8c Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: Mon, 11 May 2026 10:03:42 +0800
Subject: [PATCH] 主线提交
---
src/views/onlineEducation/systemManage/user/components/userDialog.vue | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/src/views/onlineEducation/systemManage/user/components/userDialog.vue b/src/views/onlineEducation/systemManage/user/components/userDialog.vue
index ec226fe..59f2a98 100644
--- a/src/views/onlineEducation/systemManage/user/components/userDialog.vue
+++ b/src/views/onlineEducation/systemManage/user/components/userDialog.vue
@@ -50,6 +50,7 @@
</el-form-item>
<el-form-item label="所属企业:" prop="companyName" v-if="state.title !== '修改密码' && showCompany">
<el-select
+ clearable
v-if="state.isAdmin"
v-model="state.form.companyName"
filterable
@@ -102,7 +103,7 @@
style="width: 45%;"
filterable
remote
- searchKey="name"
+ searchKey="username"
:methods="getUser">
</scorllSelect>
</el-form-item>
@@ -263,9 +264,9 @@
}
if(type !== 'view' && type !== 'pwd'){
- if(state.isAdmin){
- // await getCompanyList('open')
- }
+ // if(state.isAdmin){
+ // await getCompanyList("")
+ // }
}
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : type ==='pwd' ? '修改密码' : '查看' ;
if(type === 'edit' || type === 'view') {
@@ -297,7 +298,7 @@
dialogVisible.value = true
if(type === 'edit' && state.form && (state.form.userType === 2||state.form.userType === 3)){
await nextTick(() => {
- doGetUser()
+ // doGetUser()
})
}
}
@@ -310,6 +311,20 @@
loading.value = true;
const queryParams = {
name: val
+ }
+ const res = await getCompany(queryParams)
+ if (res.code == 200) {
+ loading.value = false;
+ state.companyList = res.data.list
+
+ } else {
+ ElMessage.warning(res.message)
+ }
+ }else {
+ loading.value = true;
+ const queryParams = {
+ pageNum: 1,
+ pageSize: 10
}
const res = await getCompany(queryParams)
if (res.code == 200) {
@@ -368,7 +383,20 @@
}else if(state.title == '编辑'){
const {confirmPassword,...data} = state.form
data.password = Base64.encode(data.password)
- const res = await editUser(data)
+ const param = {
+ name: data.name,
+ sex:data.sex,
+ phone: data.phone,
+ id:data.id,
+ companyId: data.companyId,
+ userType:data.userType,
+ username:data.username,
+ password: data.password,
+ parentId: data.parentId
+
+ }
+
+ const res = await editUser(param)
if(res.code == 200){
ElMessage.success(res.message)
emit('getList')
@@ -398,8 +426,11 @@
}
scrollRef.value.getList(param,'change');
}
-const changeType = () => {
+const changeType = async (val) => {
state.companyList = [];
+ if(state.isAdmin && val !=0){
+ await getCompanyList("")
+ }
state.form.parentId = null;
state.form.parentName = '';
state.form.companyId = null;
--
Gitblit v1.9.2