修改年审和评价中使用到的选择人员接口与回显
This commit is contained in:
@ -2,7 +2,7 @@ import React, { useState, useEffect, useCallback } from 'react';
|
|||||||
import { Table, Input, Button, Space, message } from 'antd';
|
import { Table, Input, Button, Space, message } from 'antd';
|
||||||
import type { TablePaginationConfig } from 'antd/es/table';
|
import type { TablePaginationConfig } from 'antd/es/table';
|
||||||
import { SearchOutlined } from '@ant-design/icons';
|
import { SearchOutlined } from '@ant-design/icons';
|
||||||
import { getUserList } from '@/servers/api/user';
|
import { getUserPage } from '@/pages/supplier/admission/admissionManagement/services'
|
||||||
import './EvaluateTaskPersonnelSelector.less';
|
import './EvaluateTaskPersonnelSelector.less';
|
||||||
import { useIntl } from 'umi';
|
import { useIntl } from 'umi';
|
||||||
|
|
||||||
@ -75,20 +75,21 @@ const EvaluateTaskPersonnelSelector: React.FC<EvaluateTaskPersonnelSelectorProps
|
|||||||
const fetchPersonnelData = useCallback(async () => {
|
const fetchPersonnelData = useCallback(async () => {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
try {
|
try {
|
||||||
const params: API.UserListRequest = {
|
// { basePageRequest: { pageNo: page, pageSize }, userId }
|
||||||
|
|
||||||
|
const userId = sessionStorage.getItem('userId') as string
|
||||||
|
const params = {
|
||||||
basePageRequest: {
|
basePageRequest: {
|
||||||
pageNumber: pagination.current as number,
|
pageNo: pagination.current as number,
|
||||||
pageSize: pagination.pageSize as number, // 获取足够多的数据
|
pageSize: pagination.pageSize as number, // 获取足够多的数据
|
||||||
},
|
},
|
||||||
keyword: keyword || undefined,
|
userId,
|
||||||
filter,
|
|
||||||
userIds: filter ? filterUserIds : undefined,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const response = await getUserList(params);
|
const response = await getUserPage(params);
|
||||||
|
|
||||||
if (response && response.data.code === 200 && response.data.data) {
|
if (response && response.code === 200 ) {
|
||||||
const users = response.data.data as API.UserItem[];
|
const users = response.data.records as API.UserItem[];
|
||||||
|
|
||||||
// 转换API返回的用户数据为组件所需格式
|
// 转换API返回的用户数据为组件所需格式
|
||||||
const personnelData: API.PersonnelItem[] = users.map((user) => ({
|
const personnelData: API.PersonnelItem[] = users.map((user) => ({
|
||||||
@ -97,7 +98,7 @@ const EvaluateTaskPersonnelSelector: React.FC<EvaluateTaskPersonnelSelectorProps
|
|||||||
userDept: user.orgName, // 用户部门
|
userDept: user.orgName, // 用户部门
|
||||||
userDeptId: user.orgId, // 用户部门ID
|
userDeptId: user.orgId, // 用户部门ID
|
||||||
position: '', // API中没有提供职位信息
|
position: '', // API中没有提供职位信息
|
||||||
isSelected: user.isSelected,
|
isSelected: user.isSelected || false,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
setPersonnel(personnelData);
|
setPersonnel(personnelData);
|
||||||
|
Reference in New Issue
Block a user