From 4ead339be278d7f64ab043c0e6fdd6b91bd42a16 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 24 Oct 2023 17:21:03 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=87=E0=B8=A7=E0=B8=94?= =?UTF-8?q?=203=20=E0=B8=AB=E0=B8=A5=E0=B8=B1=E0=B8=87=E0=B8=95=E0=B8=A3?= =?UTF-8?q?=E0=B8=A7=E0=B8=88=E0=B8=A3=E0=B8=B1=E0=B8=9A=20=20-=20UI=20?= =?UTF-8?q?=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?= =?UTF-8?q?=E0=B8=8A=E0=B8=B1=E0=B9=88=E0=B8=A7=E0=B8=84=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EditEmployee/Employment.vue | 288 ++++++++++++++++++ .../interface/response/Main.ts | 11 +- .../08_registryEmployee/views/EditDetail.vue | 7 +- 3 files changed, 304 insertions(+), 2 deletions(-) create mode 100644 src/modules/08_registryEmployee/components/EditEmployee/Employment.vue diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue b/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue new file mode 100644 index 000000000..5d853ee25 --- /dev/null +++ b/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue @@ -0,0 +1,288 @@ + + + + + diff --git a/src/modules/08_registryEmployee/interface/response/Main.ts b/src/modules/08_registryEmployee/interface/response/Main.ts index 272bbb5e5..9cb23c57b 100644 --- a/src/modules/08_registryEmployee/interface/response/Main.ts +++ b/src/modules/08_registryEmployee/interface/response/Main.ts @@ -46,5 +46,14 @@ interface employeePosition { positionEmployeePositionSides: ObjectNameId[]; use: boolean; } +interface FormEmployment { + dateEmployment: Date | null + orderEmployment: string +} +interface FormEmploymentRef { + dateEmployment: Object | null + orderEmployment: Object | null + [key: string]: any; +}; -export type { employeePosition }; +export type { employeePosition, FormEmployment, FormEmploymentRef }; diff --git a/src/modules/08_registryEmployee/views/EditDetail.vue b/src/modules/08_registryEmployee/views/EditDetail.vue index 975c6cf6c..fc830579b 100644 --- a/src/modules/08_registryEmployee/views/EditDetail.vue +++ b/src/modules/08_registryEmployee/views/EditDetail.vue @@ -20,6 +20,7 @@ import Information from "@/modules/08_registryEmployee/components/EditEmployee/I import TempInformation from "@/modules/08_registryEmployee/components/EditEmployee/Information/Tempinformation.vue"; import Address from "@/modules/08_registryEmployee/components/EditEmployee/Information/Address.vue"; import Family from "@/modules/08_registryEmployee/components/EditEmployee/Information/Family.vue"; +import Employment from "@/modules/08_registryEmployee/components/EditEmployee/Employment.vue"; import type { DataOption } from "@/modules/04_registry/interface/index/Main"; import http from "@/plugins/http"; @@ -409,9 +410,13 @@ const Retire = async () => {
+ +
+ +
-
+