From c44585a8b4380bf045a759c3be2d92c4f525cdc0 Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Fri, 21 Jul 2023 12:22:14 +0700 Subject: [PATCH] =?UTF-8?q?api=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A?= =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88?= =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=8A=E0=B8=B1=E0=B9=88=E0=B8=A7?= =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=B2=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../08_registryEmployee/request/Main.ts | 54 +- .../08_registryEmployee/views/Main.vue | 600 +++++++++++------- 2 files changed, 411 insertions(+), 243 deletions(-) diff --git a/src/modules/08_registryEmployee/request/Main.ts b/src/modules/08_registryEmployee/request/Main.ts index eecf581d1..ed0a008b2 100644 --- a/src/modules/08_registryEmployee/request/Main.ts +++ b/src/modules/08_registryEmployee/request/Main.ts @@ -1,13 +1,47 @@ interface FormRegistryEmployee { - no: string; - name: string; - positionNum: string; + id: string; + fullname: String; + fullnameOld: String; + oc: String; position: string; - path: string; - type: string; - level: string; - affiliation: string; - yearly: number; - pay: string; + positionPathSide: String; + positionLine: String; + govAge: number; + refSalary: String; + positionEmployeePosition: String | null; + positionEmployeePositionSide: String | null; + positionEmployeeGroup: String | null; + age: String; + amount: String; + dateAppoint: String | null; + dateStart: String | null; + createdAt: String | null; +// salaryDate: String | null; + isLeave: String; +// leaveReason: string; + leaveDateOrder: String | null; } -export type { FormRegistryEmployee }; +interface ResponseEmployeeTemp { + id: string; + fullname: String; + fullnameOld: String; + oc: String; + position: string; + positionPathSide: String; + positionLine: String; + govAge: number; + refSalary: String; + positionEmployeePosition: String | null; + positionEmployeePositionSide: String | null; + positionEmployeeGroup: String | null; + age: String; + amount: String; + dateAppoint: Date | null; + dateStart: Date | null; + createdAt: Date | null; + salaryDate: Date | null; + isLeave: boolean; + leaveReason: string; + leaveDateOrder: Date | null; +} +export type { ResponseEmployeeTemp, FormRegistryEmployee }; diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue index 485ed54d1..06b09aefa 100644 --- a/src/modules/08_registryEmployee/views/Main.vue +++ b/src/modules/08_registryEmployee/views/Main.vue @@ -33,7 +33,7 @@ {{ props.rowIndex + 1 }} - - {{ props.row.positionNum }} + + {{ props.row.fullname }} - - {{ props.row.name }} + + {{ props.row.positionEmployeePosition }} - - {{ props.row.position }} + + {{ props.row.positionEmployeePositionSide }} - - {{ props.row.path }} + + {{ props.row.positionLine }} - - {{ props.row.type }} + + {{ props.row.positionEmployeeGroup }} - - {{ props.row.level }} + + {{ props.row.oc }} - - {{ props.row.affiliation }} + + {{ props.row.amount }} - - {{ props.row.yearly }} + + {{ props.row.govAge }} - - {{ props.row.pay }} + + {{ props.row.dateAppoint }} + + {{ props.row.dateStart }} + + + {{ props.row.salaryDate }} + + + {{ props.row.refSalary }} + + + {{ props.row.age }} + + + {{ props.row.fullnameOld }} + + + {{ props.row.createdAt }} + + + {{ props.row.isLeave }} + + + {{ props.row.leaveDateOrder }} + + + + + +