From 7e827c55fa38991089d6d735f5f425b3e9cb96e1 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: Tue, 30 Jun 2026 16:46:08 +0800
Subject: [PATCH] 修改名称
---
src/views/onlineEducation/systemManage/user/components/userDialog.vue | 75 ++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 22 deletions(-)
diff --git a/src/views/onlineEducation/systemManage/user/components/userDialog.vue b/src/views/onlineEducation/systemManage/user/components/userDialog.vue
index ec226fe..ca181c8 100644
--- a/src/views/onlineEducation/systemManage/user/components/userDialog.vue
+++ b/src/views/onlineEducation/systemManage/user/components/userDialog.vue
@@ -13,7 +13,7 @@
<el-input v-model.trim="state.form.username" :disabled="state.title =='编辑' || state.title =='查看'" placeholder="请输入用户名" ></el-input>
</el-form-item>
<el-form-item label="名称:" prop="name" v-if="state.title !== '修改密码'">
- <el-input v-model.trim="state.form.name" :disabled="disabled" placeholder="请输入公司、部门或者车间岗位名"></el-input>
+ <el-input v-model.trim="state.form.name" :disabled="disabled" placeholder="请输入学院、实验室名称"></el-input>
</el-form-item>
<el-form-item label="性别:" prop="sex" v-if="state.title !== '修改密码'">
<el-radio-group v-model="state.form.sex" :disabled="disabled">
@@ -33,23 +33,24 @@
<el-form-item label="用户类型:" v-if="state.title !== '修改密码'" prop="userType">
<el-radio-group v-model="state.form.userType" :disabled="disabled" @change="changeType" v-if="state.title == '新增'">
<el-radio :label="0" v-if="state.currentUserType == 0">管理员</el-radio>
- <el-radio :label="1" v-if="state.currentUserType == 0 ">企业级</el-radio>
- <el-radio :label="2" v-if="state.currentUserType == 1 ">部门级</el-radio>
- <el-radio :label="3" v-if="!state.isAdmin">车间（岗位）级</el-radio>
+ <el-radio :label="1" v-if="state.currentUserType == 0 ">单位级</el-radio>
+ <el-radio :label="2" v-if="state.currentUserType == 1 ">学院级</el-radio>
+ <el-radio :label="3" v-if="!state.isAdmin">实验室级</el-radio>
<el-radio :label="4" v-if="state.currentUserType == 0">其他</el-radio>
</el-radio-group>
- <span v-else-if="state.title == '查看'">{{state.currentUserType === 0 ? '管理员' : state.currentUserType === 1 ? '企业级' : state.currentUserType === 2 ? '部门级' : state.currentUserType === 3 ? '车间级' :'其他'}}</span>
- <span v-else-if="state.title == '编辑'">{{state.form.userType === 0 ? '管理员' : state.form.userType === 1 ? '企业级' : state.form.userType === 2 ? '部门级' : state.form.userType === 3 ? '车间级' :'其他'}}</span>
+ <span v-else-if="state.title == '查看'">{{state.currentUserType === 0 ? '管理员' : state.currentUserType === 1 ? '单位级' : state.currentUserType === 2 ? '学院级' : state.currentUserType === 3 ? '实验室级' :'其他'}}</span>
+ <span v-else-if="state.title == '编辑'">{{state.form.userType === 0 ? '管理员' : state.form.userType === 1 ? '单位级' : state.form.userType === 2 ? '学院级' : state.form.userType === 3 ? '实验室级' :'其他'}}</span>
<!-- <el-radio-group v-model="state.form.userType" :disabled="disabled" @change="changeType" v-else-if="state.title == '编辑'">-->
<!-- <el-radio :label="0" v-if="state.currentUserType == 0">管理员</el-radio>-->
-<!-- <el-radio :label="1" >企业级</el-radio>-->
-<!-- <el-radio :label="2" >部门级</el-radio>-->
-<!-- <el-radio :label="3" >车间（岗位）级</el-radio>-->
+<!-- <el-radio :label="1" >单位级</el-radio>-->
+<!-- <el-radio :label="2" >学院级</el-radio>-->
+<!-- <el-radio :label="3" >实验室级</el-radio>-->
<!-- <el-radio :label="4" >其他</el-radio>-->
<!-- </el-radio-group>-->
</el-form-item>
- <el-form-item label="所属企业:" prop="companyName" v-if="state.title !== '修改密码' && showCompany">
+ <el-form-item label="所属单位:" prop="companyName" v-if="state.title !== '修改密码' && showCompany">
<el-select
+ clearable
v-if="state.isAdmin"
v-model="state.form.companyName"
filterable
@@ -78,7 +79,7 @@
<!-- style="width: 45%"-->
<!-- v-loadMore="loadMore"-->
<!-- class="m-2"-->
-<!-- placeholder="请选择所属企业"-->
+<!-- placeholder="请选择所属单位"-->
<!-- popper-class="more_select_dropdown"-->
<!-- >-->
<!-- <el-option-->
@@ -102,7 +103,7 @@
style="width: 45%;"
filterable
remote
- searchKey="name"
+ searchKey="username"
:methods="getUser">
</scorllSelect>
</el-form-item>
@@ -218,7 +219,7 @@
parentId: null
},
formRules:{
- name: [{ required: true, message: '请输入公司、部门或者车间岗位名称', trigger: 'blur' }],
+ name: [{ required: true, message: '请输入学院、实验室名称称', trigger: 'blur' }],
companyName: [{ required: true, message: '请选择上级企业', trigger: 'blur' }],
username: [{ required: true, trigger: "blur", validator: validateUsername }],
password: [{ required: true, validator: validatePwd, trigger: 'blur' }],
@@ -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;
@@ -414,7 +445,7 @@
showChild.value = false;
}
}
- //当前是企业级/其他用户选择部门
+ //当前是单位级/其他用户选择学院
if((state.currentUserType === 1 && state.form.userType === 2) || (state.currentUserType === 4 && state.form.userType === 2)){
state.form.parentId = userInfo.value.id;
state.form.companyName = userInfo.value.companyName
@@ -422,7 +453,7 @@
showChild.value = false;
showCompany.value = true;
- } //当前是企业级/其他用户选择车间
+ } //当前是单位级/其他用户选择实验室
else if((state.currentUserType === 1 && state.form.userType === 3) || (state.currentUserType === 4 && state.form.userType === 3)){
state.form.companyName = userInfo.value.companyName
state.form.companyId = userInfo.value.companyId;
@@ -436,7 +467,7 @@
scrollRef.value.getList(param,'change');
})
}
- //当前是部门级选择车间
+ //当前是学院级选择实验室
if((state.currentUserType === 2 && state.form.userType === 3)){
state.form.parentId = userInfo.value.id;
state.form.companyName = userInfo.value.companyName
--
Gitblit v1.9.2