测通完成评查,投票,意见列表,任务列表,任务关联文档列表的内容。剩余创建任务,提出意见的完善

This commit is contained in:
2025-07-23 10:22:51 +08:00
parent 47664fc0e8
commit 8800e982ab
13 changed files with 750 additions and 331 deletions
+41 -15
View File
@@ -1,4 +1,5 @@
import { get } from '../axios-client';
import { API_BASE_URL } from '../../config/api-config';
// 用户信息接口
export interface UserInfo {
@@ -48,27 +49,52 @@ export interface ApiResponse<T> {
* @param includeUsers 是否包含用户信息
* @returns 组织架构树
*/
export async function getOrganizationTree(includeUsers: boolean = true): Promise<ApiResponse<OrganizationResponse>> {
export async function getOrganizationTree(includeUsers: boolean = true, jwtToken?: string): Promise<ApiResponse<OrganizationResponse>> {
try {
console.log('开始调用获取组织架构API');
const response = await get<OrganizationResponse>(
`/admin/users/organizations?include_users=${includeUsers}`
);
console.log('组织架构API响应:', response);
if (response.error) {
console.error('获取组织架构失败:', response.error);
return {
success: false,
error: response.error
};
let responseData: OrganizationResponse;
if (jwtToken) {
// 如果提供了JWT Token,则使用fetch并携带Authorization头
const url = `${API_BASE_URL}/admin/users/organizations?include_users=${includeUsers}`;
const response = await fetch(url, {
headers: {
'Authorization': `Bearer ${jwtToken}`,
'Content-Type': 'application/json'
}
});
if (!response.ok) {
const errorText = await response.text();
console.error('获取组织架构失败 (fetch):', errorText);
return {
success: false,
error: `HTTP error! status: ${response.status}, ${errorText}`
};
}
responseData = await response.json();
} else {
// 否则,使用原有的get方法
const response = await get<OrganizationResponse>(
`/admin/users/organizations?include_users=${includeUsers}`
);
if (response.error || !response.data) {
console.error('获取组织架构失败 (get):', response.error);
return {
success: false,
error: response.error || '获取组织架构数据失败'
};
}
responseData = response.data;
}
console.log('组织架构API响应:', responseData);
return {
success: true,
data: response.data
data: responseData
};
} catch (error) {
console.error('获取组织架构失败:', error);
@@ -211,4 +237,4 @@ export async function getFlatOrganizations(includeUsers: boolean = true): Promis
error: error instanceof Error ? error.message : '获取扁平化组织列表失败'
};
}
}
}