From 588adeae8bfb13468c01dfa0d76f9650462c2182 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 24 Dec 2024 17:49:14 +0700 Subject: [PATCH] fix --- .../detail/Achievement/01_ProfessionalLicense.vue | 2 +- .../components/detail/Salary/01_PositionSalary.vue | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue index aee932914..6e2b126d6 100644 --- a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue +++ b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue @@ -625,7 +625,7 @@ onMounted(() => { bg-color="white" class="inputgreen" dense - :rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่ใบอนุญาต'}`]" + :rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่ใบอนุญาต'}`,(val:string) => val.length <= 20 || `${'เลขที่ใบอนุญาตยาวเกินกำหนด'}`]" hide-bottom-space /> diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue index 69fa554ba..f0472a3cf 100644 --- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue +++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue @@ -312,6 +312,12 @@ function onClickOpenDialog(statusEdit: boolean = false, data: any = []) { formDataSalary.refCommandNo = statusEdit ? data.refCommandNo : ""; formDataSalary.templateDoc = ""; formDataSalary.doc = statusEdit ? data.templateDoc : ""; + + formDataSalary.amountSpecial = statusEdit + ? data.amountSpecial === 0 + ? "" + : data.amountSpecial + : ""; } /** function ปิด dialog ตำแหน่งเงินเดือน*/