From 60e36c367ccfb6382b29f02df97bebca76351235 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 14 八月 2024 17:30:08 +0800
Subject: [PATCH] 提交
---
src/views/hazardousChemicals/systemManage/user/components/userDialog.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/views/hazardousChemicals/systemManage/user/components/userDialog.vue b/src/views/hazardousChemicals/systemManage/user/components/userDialog.vue
index dc47147..50def4c 100644
--- a/src/views/hazardousChemicals/systemManage/user/components/userDialog.vue
+++ b/src/views/hazardousChemicals/systemManage/user/components/userDialog.vue
@@ -41,7 +41,7 @@
</el-form-item>
<el-form-item label="所属企业:" prop="companyName" v-if="state.title !== '修改密码' && state.form.userType !=0">
<el-select
- v-if="state.isAdmin && state.title != '编辑用户'"
+ v-if="state.isAdmin"
clearable
v-model="state.form.companyName"
filterable
@@ -64,9 +64,9 @@
</el-select>
<el-input v-else disabled style="width: 100%" v-model="state.form.companyName"></el-input>
</el-form-item>
- <el-form-item label="所属部门:" prop="departId" v-if="(state.currentUserType == 1 && state.title != '查看用户') || (state.currentUserType == 0 && state.form.userType == 2 && state.title == '编辑用户') ">
+ <el-form-item label="所属部门:" prop="departId" v-if="state.form.userType !=0" >
<el-cascader
- v-if="state.currentUserType == 1 && (state.title == '新增用户' || state.title == '编辑用户')"
+ v-if="(state.currentUserType == 1 ||state.currentUserType == 0) && (state.title == '新增用户' || state.title == '编辑用户')"
style="width: 100%"
ref="classifyRef"
v-model="state.form.departId"
@@ -189,7 +189,7 @@
phone: [{ required: true, validator: validateUserPhone, trigger: 'blur' }],
userType: [{ required: true, message: '请选择用户类型', trigger: 'blur' }],
sex: [{ required: true, message: '请选择性别', trigger: 'blur' }],
- departId:[{ required: true, message: '请选择部门', trigger: 'blur' }],
+ // departId:[{ required: true, message: '请选择部门', trigger: 'blur' }],
},
companyList: [],
deptList: [],
@@ -221,9 +221,6 @@
userInfo.value = JSON.parse(Cookies.get('userInfo'))
console.log("userInfo",userInfo.value)
state.currentUserType = userInfo.value.userType
- if(state.currentUserType == 1){
- await getDeptList()
- }
if(userInfo.value.userType === 0){
state.isAdmin = true;
}else {
@@ -231,6 +228,9 @@
state.form.companyId = userInfo.value.companyId;
state.form.companyName = userInfo.value.companyName;
state.form.userType = 2
+ }
+ if(userInfo.value.userType != 0 || (userInfo.value.userType ==0 && (type =='edit' || state.title =='查看用户'))){
+ await getDeptList()
}
state.title = type === 'add' ? '新增用户' : type ==='edit' ? '编辑用户' : type ==='pwd' ? '修改密码' : '查看用户' ;
if(type === 'edit' || type === 'view') {
@@ -283,7 +283,10 @@
const loadingDept = ref(false)
const getDeptList = async (val)=>{
loadingDept.value = true;
- const res = await getDept()
+ const param = {
+ companyId: state.form.companyId
+ }
+ const res = await getDept(param)
if (res.code == 200) {
loading.value = false;
state.deptList = recursion(res.data)
@@ -386,10 +389,12 @@
dialogVisible.value = false;
}
-const selectValue = (val) => {
+const selectValue = (val) => {
+ state.form.departId = null
state.companyList.forEach(item => {
if(item.name === val){
state.form.companyId = item.id
+ getDeptList();
}
})
}
--
Gitblit v1.9.2