- {{ props.rowIndex + 1 }}
+ {{
+ (formFilter.page - 1) * formFilter.pageSize + props.rowIndex + 1
+ }}
{{
@@ -378,22 +385,27 @@ watch(
+
+
diff --git a/src/modules/13_salary/interface/index/SalaryList.ts b/src/modules/13_salary/interface/index/SalaryList.ts
index 0f8d7fa16..4a2767dfd 100644
--- a/src/modules/13_salary/interface/index/SalaryList.ts
+++ b/src/modules/13_salary/interface/index/SalaryList.ts
@@ -5,4 +5,10 @@ interface DataFilter {
type: string;
}
-export type { DataFilter };
+interface DataFilterPerson {
+ page: number;
+ pageSize: number;
+ keyword: string;
+}
+
+export type { DataFilter, DataFilterPerson };
diff --git a/src/modules/13_salary/interface/request/SalaryList.ts b/src/modules/13_salary/interface/request/SalaryList.ts
new file mode 100644
index 000000000..11938e9a5
--- /dev/null
+++ b/src/modules/13_salary/interface/request/SalaryList.ts
@@ -0,0 +1,33 @@
+interface DataPersonReq {
+ id: string;
+ type: string;
+ amount: number;
+ child1: string;
+ child1Id: string;
+ child2: string;
+ child2Id: string;
+ child3: string | null;
+ child3Id: string | null;
+ child4: string | null;
+ child4Id: string | null;
+ citizenId: string;
+ firstName: string;
+ isDuration: boolean;
+ isPunish: boolean;
+ isResult: boolean;
+ isRetired: boolean;
+ isRetired2: boolean;
+ lastName: string;
+ orgShortName: string;
+ posExecutive: string | null;
+ posLevel: string;
+ posMasterNo: number;
+ posMasterNoPrefix: string;
+ posMasterNoSuffix: string;
+ posType: string;
+ position: string;
+ prefix: string;
+ root: string;
+ rootId: string;
+}
+export type { DataPersonReq };
diff --git a/src/modules/13_salary/interface/response/SalaryList.ts b/src/modules/13_salary/interface/response/SalaryList.ts
index 4f9848b6f..a5c431246 100644
--- a/src/modules/13_salary/interface/response/SalaryList.ts
+++ b/src/modules/13_salary/interface/response/SalaryList.ts
@@ -11,4 +11,35 @@ interface DataPeriodQuota {
chosen: number; //เลือกไปแล้ว
remaining: number; //คงเหลือโควตาnumber
}
-export type { DataPeriodLatest, DataPeriodQuota };
+
+interface DataPerson {
+ amount: number;
+ child1: string;
+ child1Id: string;
+ child2: string;
+ child2Id: string;
+ child3: string | null;
+ child3Id: string | null;
+ child4: string | null;
+ child4Id: string | null;
+ citizenId: string;
+ firstName: string;
+ isDuration: boolean;
+ isPunish: boolean;
+ isResult: boolean;
+ isRetired: boolean;
+ isRetired2: boolean;
+ lastName: string;
+ orgShortName: string;
+ posExecutive: string | null;
+ posLevel: string;
+ posMasterNo: number;
+ posMasterNoPrefix: string;
+ posMasterNoSuffix: string;
+ posType: string;
+ position: string;
+ prefix: string;
+ root: string;
+ rootId: string;
+}
+export type { DataPeriodLatest, DataPeriodQuota, DataPerson };