From d098e2e3a16837ad0a61c1a2df93b27c7d16bfd2 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 06 九月 2024 17:10:29 +0800
Subject: [PATCH] 批量导入

---
 src/views/hazardousChemicals/systemManage/user/components/userDialog.vue |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/views/hazardousChemicals/systemManage/user/components/userDialog.vue b/src/views/hazardousChemicals/systemManage/user/components/userDialog.vue
index dc47147..9492f5a 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 && state.title !== '修改密码'" >
           <el-cascader
-              v-if="state.currentUserType == 1 && (state.title == '新增用户' || state.title == '编辑用户')"
+              v-if="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: [],
@@ -218,12 +218,10 @@
 const userInfo = ref()
 const classifyRef = ref(null)
 const openDialog = async (type, value) => {
+
   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 {
@@ -232,7 +230,11 @@
     state.form.companyName = userInfo.value.companyName;
     state.form.userType = 2
   }
+
   state.title = type === 'add' ? '新增用户' : type ==='edit' ? '编辑用户' : type ==='pwd' ? '修改密码' : '查看用户' ;
+  if(state.title !== '修改密码' && (userInfo.value.userType != 0 || (userInfo.value.userType ==0 && (type =='edit' || state.title =='查看用户')))){
+    await getDeptList()
+  }
   if(type === 'edit' || type === 'view') {
     startUsername.value = value.username
     if( type === 'view'){
@@ -241,7 +243,8 @@
     if(type === 'edit' && state.isAdmin){
       await getCompanyList("")
     }
-    state.form = value
+
+    state.form = JSON.parse(JSON.stringify(value));
   }
   if(type == 'pwd'){
     state.form.id = value.id
@@ -283,7 +286,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)
@@ -341,6 +347,8 @@
       data.password = Base64.encode(data.password)
       const res = await editUser(data)
       if(res.code == 200){
+
+        // Cookies.set('userInfo',JSON.stringify(data))
         ElMessage.success(res.message)
         emit('getList')
         handleClose()
@@ -384,12 +392,15 @@
   superRef.value.clearValidate();
   superRef.value.resetFields()
   dialogVisible.value = false;
+  emit('getList')
 }
 
-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