Commit b244bf6b by 周海峰

no message

parent 3de9a072
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
</div> </div>
<div class="text-grey-6 text-center q-mt-md"> <div class="text-grey-6 text-center q-mt-md">
已选 {{ tempCheckedUsers.size }} 人 已选 {{ tempCheckedUsers.size }} 人/ {{ deptUsers.length }} 人
</div> </div>
</div> </div>
</q-modal-layout> </q-modal-layout>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<script> <script>
import Tree from 'ant-design-vue/lib/tree'; import Tree from 'ant-design-vue/lib/tree';
import 'ant-design-vue/dist/antd.css'; import 'ant-design-vue/dist/antd.css';
import {deptTree, getDeptUsers} from "@/service/user/user"; import {deptTree, getDeptUsers, getDeptUsersWithChildren} from "@/service/user/user";
let cachedTreeData = null; let cachedTreeData = null;
...@@ -265,19 +265,20 @@ ...@@ -265,19 +265,20 @@
this.currentDept = dept; this.currentDept = dept;
this.deptUserSearchText = ''; this.deptUserSearchText = '';
this.deptModal = true; this.deptModal = true;
this.tempCheckedUsers = new Set();
// 懒加载部门用户 // 懒加载部门用户(包括子部门)
if (dept.key >= 1000000) { if (dept.key >= 1000000) {
const realDeptId = dept.key - 1000000; const realDeptId = dept.key - 1000000;
this.deptUserLoading = true; this.deptUserLoading = true;
this.deptUsers = []; this.deptUsers = [];
try { try {
let res = await getDeptUsers(realDeptId, 1, 100); // 修改:调用新 API,查询部门及子部门用户
let users = (res.data.data.list || res.data.data) || []; let res = await getDeptUsersWithChildren(realDeptId);
let users = (res.data.data && res.data.data.list) || res.data.data || [];
this.deptUsers = users.map(u => ({ this.deptUsers = users.map(u => ({
key: u.id, key: u.id,
title: u.title || u.label || '', title: u.username || u.title || '',
no: u.no || '' no: u.account || u.number || ''
})); }));
} catch (e) { } catch (e) {
console.error('loadDeptUsers error:', e); console.error('loadDeptUsers error:', e);
......
...@@ -215,6 +215,15 @@ export function getweixinisleaderindeptByaccount(){ ...@@ -215,6 +215,15 @@ export function getweixinisleaderindeptByaccount(){
}); });
} }
export function getDeptUsersWithChildren(deptId) {
return request({
url: '/user/dept_users_with_children/' + deptId,
method: 'get',
params: { pageNum: 1, pageSize: 100 },
loading: 'gears'
});
}
export function listByIds(ids) { export function listByIds(ids) {
return request({ return request({
url: '/user/list_by_ids', url: '/user/list_by_ids',
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论