From 332ef51e96e950ec66c38a40a167926b680d37dc Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期五, 12 十二月 2025 16:56:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue
index d0d19e8..20a850e 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue
@@ -38,9 +38,9 @@
>
<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>
@@ -176,6 +176,7 @@
import {ElMessage} from "element-plus";
import {getDeptInfo, saveResponsibility} 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()
@@ -233,9 +234,9 @@
}
const getUserList = async ()=> {
- const res = await listUser()
+ const res = await getEmployeeRecords()
if(res.code == 200){
- state.userList = res.data.list?res.data.list:[]
+ state.userList = res.data ? res.data :[]
}else{
ElMessage.warning(res.message)
}
@@ -323,4 +324,4 @@
font-size: 14px !important;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2