From f24c737c0be17b8a5e44f6355bbdec80539732cf Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Fri, 19 Jan 2024 14:12:08 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20popup=20?= =?UTF-8?q?=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2=20=E0=B8=81?= =?UTF-8?q?=E0=B8=A3=E0=B8=A3=E0=B8=A1=E0=B8=81=E0=B8=B2=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../11_discipline/components/DialogDuty.vue | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/modules/11_discipline/components/DialogDuty.vue b/src/modules/11_discipline/components/DialogDuty.vue index d93c10fc1..993f16f12 100644 --- a/src/modules/11_discipline/components/DialogDuty.vue +++ b/src/modules/11_discipline/components/DialogDuty.vue @@ -49,22 +49,19 @@ async function submit() { if (myForm.value !== null) { myForm.value.validate().then((success) => { if (success) { - dialogConfirm( - $q, - async () => { - await props.save(props.id, duty.value, resolution.value); - duty.value = ""; - resolution.value = ""; - } - ); + dialogConfirm($q, async () => { + await props.save(props.id, duty.value, resolution.value); + duty.value = ""; + resolution.value = ""; + }); } }); } } watch(props, () => { - duty.value = props?.duty; - resolution.value = props?.command; + duty.value = props?.duty === "-" ? "" : props.duty; + resolution.value = props?.command === "-" ? "" : props.command; }); @@ -81,7 +78,7 @@ watch(props, () => { dense class="col-12 q-mb-sm" debounce="300" - placeholder="หน้าที่" + label="หน้าที่" :rules="[(val) => !!val || `กรุณากรอกหน้าที่`]" hide-bottom-space /> @@ -91,7 +88,7 @@ watch(props, () => { dense class="col-12 q-mb-sm" debounce="300" - placeholder="มติ/คำสั่ง" + label="มติ/คำสั่ง" :rules="[(val) => !!val || `กรุณากรอก มติ/คำสั่ง`]" hide-bottom-space /> From d099554b82ab1ad60c3547070723011745bc4708 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Fri, 19 Jan 2024 14:47:30 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=E0=B8=81=E0=B8=B3=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B8=94=E0=B8=AA=E0=B8=96=E0=B8=B2=E0=B8=99=E0=B8=B0=E0=B8=9C?= =?UTF-8?q?=E0=B8=A5=E0=B8=AA=E0=B8=AD=E0=B8=9A=20=E0=B8=A7=E0=B8=B4?= =?UTF-8?q?=E0=B8=99=E0=B8=B1=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3_InvestigateDisciplinary/Form.vue | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue index 0d78fafb7..b356700d3 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue @@ -325,11 +325,12 @@ async function fetchDatadetail() { prefix: person.prefix, firstName: person.firstName, lastName: person.lastName, - position: person.position === null ? '-':person.position, - positionLevel: person.positionLevel === null ? '-':person.positionLevel, - salary: person.salary === null ? '-':person.salary, + position: person.position === null ? "-" : person.position, + positionLevel: + person.positionLevel === null ? "-" : person.positionLevel, + salary: person.salary === null ? "-" : person.salary, personId: person.personId, - posNo: person.posNo === null ? '-':person.posNo, + posNo: person.posNo === null ? "-" : person.posNo, organization: person.organization, isSend: person.isSend, isSuspend: person.isSuspend, @@ -337,7 +338,9 @@ async function fetchDatadetail() { statusDiscard: person.statusDiscard, })); - formData.disciplinaryStatusResult = props.data.disciplinaryStatusResult; + formData.disciplinaryStatusResult = props.data.disciplinaryStatusResult + ? props.data.disciplinaryStatusResult + : "NOT_SPECIFIED"; formData.disciplinaryCauseText = props.data.disciplinaryCauseText; formData.disciplinaryResult = props.data.disciplinaryResult; formData.disciplinaryExtendHistory = props.data.disciplinaryExtendHistory; @@ -349,11 +352,12 @@ async function fetchDatadetail() { prefix: person.prefix, firstName: person.firstName, lastName: person.lastName, - position: person.position === null ? '-':person.position, - positionLevel: person.positionLevel === null ? '-':person.positionLevel, - salary: person.salary === null ? '-':person.salary, + position: person.position === null ? "-" : person.position, + positionLevel: + person.positionLevel === null ? "-" : person.positionLevel, + salary: person.salary === null ? "-" : person.salary, personId: person.personId, - posNo: person.posNo === null ? '-':person.posNo, + posNo: person.posNo === null ? "-" : person.posNo, organization: person.organization, isSend: person.isSend, isSuspend: person.isSuspend,