From f287988f7286ff397b29a03d501add6c4852500c Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Tue, 03 Feb 2026 11:08:07 +0800
Subject: [PATCH] 修改
---
src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
index 96830dc..0323bff 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
@@ -7,6 +7,7 @@
:before-close="handleClose"
:close-on-press-escape="false"
:close-on-click-modal="false"
+ draggable
>
<el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="150px">
<el-form-item label="单位：" prop="companyId" v-if="state.isAdmin">
@@ -18,6 +19,9 @@
:value="item.id">
</el-option>
</el-select>
+ </el-form-item>
+ <el-form-item label="部门名称:" prop="deptName">
+ <el-input v-model.trim="state.form.deptName" :disabled="state.title =='查看'" placeholder="部门名称"></el-input>
</el-form-item>
<el-row>
<el-col :span="12" v-if="state.title == '新增'">
@@ -53,9 +57,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="部门名称:" prop="deptName">
- <el-input v-model.trim="state.form.deptName" :disabled="state.title =='查看'" placeholder="部门名称"></el-input>
- </el-form-item>
+
<el-form-item label="是否是管理层:" prop="deptType" v-if="state.title !== '修改密码'">
<el-radio-group v-model="state.form.deptType" :disabled="disabled">
<el-radio :label="1">是</el-radio>
@@ -66,9 +68,9 @@
<el-select clearable v-model="state.form.leaderUserId" :disabled="state.title =='查看'" filterable placeholder="负责人" style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -130,6 +132,7 @@
import {ElMessage} from "element-plus";
import {getDepart, getSysClause, saveDepart} from "@/api/orgStructure/depart";
import {listUser} from "@/api/system/user";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
const superRef = ref()
@@ -202,9 +205,9 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999, companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list:[]
+ state.userList = res.data ? res.data :[]
}else{
ElMessage.warning(res.message)
}
--
Gitblit v1.9.2