feat(工作报告、加班申请团队视角): 工作报告、加班申请现在可以查看团队视角了(查看下属)。
fix(工作报告): 修复周报在新增/编辑时,不能展示工作日志。
This commit is contained in:
13
src/typings/api/overtime-application.d.ts
vendored
13
src/typings/api/overtime-application.d.ts
vendored
@@ -32,6 +32,7 @@ declare namespace Api {
|
||||
|
||||
type OvertimeApplicationSearchParams = CommonType.RecordNullable<
|
||||
Pick<PageParams, 'pageNo' | 'pageSize'> & {
|
||||
applicantIds: string[] | null;
|
||||
keyword: string;
|
||||
applicantName: string;
|
||||
approverId: string;
|
||||
@@ -95,5 +96,17 @@ declare namespace Api {
|
||||
terminalFlag: boolean;
|
||||
allowEdit: boolean;
|
||||
}
|
||||
|
||||
interface TeamOvertimeSummaryParams {
|
||||
month?: string | null;
|
||||
}
|
||||
|
||||
interface TeamOvertimeSummary {
|
||||
month: string;
|
||||
totalApplicationCount: number;
|
||||
pendingCount: number;
|
||||
approvedCount: number;
|
||||
rejectedCount: number;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
18
src/typings/api/system-manage.d.ts
vendored
18
src/typings/api/system-manage.d.ts
vendored
@@ -386,6 +386,24 @@ declare namespace Api {
|
||||
children?: UserManagementRelationTreeRespVO[] | null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 当前登录用户的下属树
|
||||
*
|
||||
* 用于团队视角选择器;根节点代表“全部下属范围”
|
||||
*/
|
||||
interface MySubordinateTreeNode {
|
||||
/** 用户 ID */
|
||||
userId: string;
|
||||
/** 用户昵称 */
|
||||
userNickname: string;
|
||||
/** 是否为当前登录用户根节点 */
|
||||
isRoot: boolean;
|
||||
/** 全链路下属人数 */
|
||||
subordinateCount: number;
|
||||
/** 下级用户列表 */
|
||||
children?: MySubordinateTreeNode[] | null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户管理链路保存参数
|
||||
*
|
||||
|
||||
34
src/typings/api/work-report.d.ts
vendored
34
src/typings/api/work-report.d.ts
vendored
@@ -71,6 +71,34 @@ declare namespace Api {
|
||||
total: number;
|
||||
list: T[];
|
||||
}
|
||||
|
||||
interface TeamReportPendingUser {
|
||||
userId: string;
|
||||
userNickname: string;
|
||||
}
|
||||
|
||||
interface TeamReportSummary {
|
||||
totalShouldSubmit: number;
|
||||
submittedCount: number;
|
||||
unsubmittedCount: number;
|
||||
pendingApprovalCount: number;
|
||||
unsubmittedUsers: TeamReportPendingUser[];
|
||||
}
|
||||
|
||||
interface TeamReportSummaryParams {
|
||||
reportType: ReportType;
|
||||
periodKey: string;
|
||||
}
|
||||
|
||||
interface TeamReportRemindParams {
|
||||
reportType: ReportType;
|
||||
periodKey: string;
|
||||
userIds?: string[] | null;
|
||||
}
|
||||
|
||||
interface TeamReportRemindResult {
|
||||
remindedCount: number;
|
||||
}
|
||||
}
|
||||
|
||||
namespace Weekly {
|
||||
@@ -114,6 +142,7 @@ declare namespace Api {
|
||||
}
|
||||
|
||||
type WeeklyReportSearchParams = Common.WorkReportBaseSearchParams & {
|
||||
reporterIds?: string[] | null;
|
||||
isBusinessTrip?: boolean | string | null;
|
||||
};
|
||||
|
||||
@@ -164,7 +193,9 @@ declare namespace Api {
|
||||
planItems: Common.PersonalReportPlanItem[];
|
||||
}
|
||||
|
||||
type MonthlyReportSearchParams = Common.WorkReportBaseSearchParams;
|
||||
type MonthlyReportSearchParams = Common.WorkReportBaseSearchParams & {
|
||||
reporterIds?: string[] | null;
|
||||
};
|
||||
|
||||
interface MonthlyReportSaveParams {
|
||||
periodKey: string;
|
||||
@@ -266,6 +297,7 @@ declare namespace Api {
|
||||
}
|
||||
|
||||
type ProjectReportSearchParams = Common.WorkReportBaseSearchParams & {
|
||||
projectOwnerIds?: string[] | null;
|
||||
projectId?: string | null;
|
||||
flag?: number | null;
|
||||
};
|
||||
|
||||
2
src/typings/components.d.ts
vendored
2
src/typings/components.d.ts
vendored
@@ -178,12 +178,14 @@ declare module 'vue' {
|
||||
RouterLink: typeof import('vue-router')['RouterLink']
|
||||
RouterView: typeof import('vue-router')['RouterView']
|
||||
SoybeanAvatar: typeof import('./../components/custom/soybean-avatar.vue')['default']
|
||||
SubordinateSelector: typeof import('./../components/custom/subordinate-selector.vue')['default']
|
||||
SvgIcon: typeof import('./../components/custom/svg-icon.vue')['default']
|
||||
SystemLogo: typeof import('./../components/common/system-logo.vue')['default']
|
||||
TableColumnSetting: typeof import('./../components/advanced/table-column-setting.vue')['default']
|
||||
TableHeaderOperation: typeof import('./../components/advanced/table-header-operation.vue')['default']
|
||||
TableSearchFields: typeof import('./../components/custom/table-search-fields.vue')['default']
|
||||
TableSearchPanel: typeof import('./../components/custom/table-search-panel.vue')['default']
|
||||
TeamContextPanel: typeof import('./../components/custom/team-context-panel.vue')['default']
|
||||
ThemeSchemaSwitch: typeof import('./../components/common/theme-schema-switch.vue')['default']
|
||||
UserPickerTrigger: typeof import('./../components/custom/business-user-picker/components/user-picker-trigger.vue')['default']
|
||||
WaveBg: typeof import('./../components/custom/wave-bg.vue')['default']
|
||||
|
||||
Reference in New Issue
Block a user