From 9f19840c03e8a1f4c669d9ab58cb74583539b637 Mon Sep 17 00:00:00 2001 From: oat_dev Date: Fri, 15 Mar 2024 17:55:32 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?= =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?= =?UTF-8?q?=E0=B8=95=E0=B8=B4:=20=E0=B8=9C=E0=B8=B9=E0=B8=81API=20?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9D=E0=B8=B6=E0=B8=81=E0=B8=AD?= =?UTF-8?q?=E0=B8=9A=E0=B8=A3=E0=B8=A1(Training)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/registry/api.registry.ts | 8 + .../Achievement/01_ProfessionalLicense.vue | 1 + .../detail/Achievement/02_Train.vue | 337 +++++++++++++----- 3 files changed, 266 insertions(+), 80 deletions(-) diff --git a/src/api/registry/api.registry.ts b/src/api/registry/api.registry.ts index 49a69dc12..faf2c11f4 100644 --- a/src/api/registry/api.registry.ts +++ b/src/api/registry/api.registry.ts @@ -11,4 +11,12 @@ export default { `${registryNew}insignia/${insignId}`, profileNewInsignHisByInsignId: (insignId: string) => `${registryNew}insignia/history/${insignId}`, + + profileNewTraining: `${registryNew}training`, + profileNewTrainingByProfileId: (profileId: string) => + `${registryNew}training/${profileId}`, + profileNewTrainingByTrainingId: (trainingId: string) => + `${registryNew}training/${trainingId}`, + profileNewTrainingHisByTrainingId: (trainingId: string) => + `${registryNew}training/history/${trainingId}`, }; diff --git a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue index b0c09720d..2d71d5130 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue +++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue @@ -225,6 +225,7 @@ function closeHistoryDialog() { bordered :paging="true" dense + v-model:pagination="pagination" :rows-per-page-options="[20, 50, 100]" class="custom-header-table" :visible-columns="visibleColumns" diff --git a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue index 205f3339c..6e4bf1a93 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue +++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue @@ -1,16 +1,29 @@ @@ -440,7 +633,7 @@ watch( round color="primary" icon="edit" - @click="addDataDialog = true" + @click="dialog = true" > แก้ไขข้อมูล @@ -466,16 +659,7 @@ watch(
{{ col.label }}
-
- {{ col.value ? date2Thai(col.value) : "-" }} -
-
{{ col.value }}
+
{{ col.value }}
@@ -485,11 +669,14 @@ watch( - + - +
@@ -568,7 +755,7 @@ watch( !!val || `${'กรุณาเลือกปีที่เริ่มต้นการฝึกอบรม/ดูงาน'}`, ]" - :label="`${'ปี ที่เริ่มต้นการฝึกอบรม/ดูงาน'}`" + :label="`${'ปีที่เริ่มต้นการฝึกอบรม/ดูงาน'}`" >