hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into devTee

Browse source 
# Conflicts:
#	src/api/02_organizational/api.organization.ts
#	src/modules/02_organizationalNew/interface/index/Main.ts
This commit is contained in:
setthawutttty 2024-01-31 17:28:55 +07:00
commit f38acf3eaa
7 changed files with 456 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/modules/02_organizationalNew/interface/index/Main.ts
View file

@ -29,7 +29,6 @@ interface FormDataPosition {
prefixNo: string;
positionNo: string;
suffixNo: string;
confirm: boolean;
}
interface FormDataNewStructure {
@ -82,7 +81,7 @@ interface HistoryPostType {
}
interface FormPositionSelect {
positionId: string,
positionId: string;
positionName: string;
positionField: string;
positionType: string;
@ -92,16 +91,28 @@ interface FormPositionSelect {
positionArea: string;
}
interface RowDetailPositions {
positionId: string,
positionName: string
positionField: string
positionType: string
positionLevel: string
positionExecutive: string
positionExecutiveField: string
positionArea: string
interface FormPositionSelectRef {
positionName: object | null;
positionField: object | null;
positionType: object | null;
positionLevel: object | null;
positionExecutive: object | null;
positionExecutiveField: object | null;
positionArea: object | null;
[key: string]: any;
}
interface RowDetailPositions {
positionId: string;
positionName: string;
positionField: string;
positionType: string;
positionLevel: string;
positionExecutive: string;
positionExecutiveField: string;
positionArea: string;
}
export type {
Pagination,
DataOption,
@ -116,5 +127,6 @@ export type {
ListMenu,
FormPositionSelect,
RowDetailPositions,
HistoryPostType
HistoryPostType,
FormPositionSelectRef,
};

40
src/modules/02_organizationalNew/interface/response/organizational.ts
View file

@ -31,4 +31,42 @@ interface OrgRevision {
orgRevisionName: string;
}
export type { DataActive, OrgTree, OrgRevision };
interface OptionType {
id: string;
posTypeName: string;
}
interface OptionLevel {
id: string;
posLevelName: string;
}
interface OptionExecutive {
id: string;
posExecutiveName: string;
}
interface DataPosition {
id: string;
posExecutiveId: string;
posExecutiveName: string;
posLevelId: string;
posLevelName: string;
posTypeId: string;
posTypeName: string;
positionArea: string;
positionExecutiveField: string;
positionField: string;
positionIsSelected: boolean;
positionName: string;
}
export type {
DataActive,
OrgTree,
OrgRevision,
OptionType,
OptionLevel,
OptionExecutive,
DataPosition,
};