From b00e500e9b91dbe692392da9ae4453c5ec349b8b Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Wed, 10 Jan 2024 16:23:37 +0700
Subject: [PATCH 1/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=95=E0=B8=A3=E0=B8=A7=E0=B8=88=E0=B8=84=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A1=E0=B9=80=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=89=E0=B8=AD=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/05_leave/components/formDetail/formCheckSelect.vue  | 2 +-
 src/modules/05_leave/components/formDetail/formChildbirth.vue   | 2 +-
 src/modules/05_leave/components/formDetail/formHajj.vue         | 2 +-
 src/modules/05_leave/components/formDetail/formHoliday.vue      | 2 +-
 src/modules/05_leave/components/formDetail/formLeave.vue        | 2 +-
 .../05_leave/components/formDetail/formLeaveToTraining.vue      | 2 +-
 .../components/formDetail/formLeaveToWorkInternational.vue      | 2 +-
 src/modules/05_leave/components/formDetail/formSpouse.vue       | 2 +-
 src/modules/05_leave/components/formDetail/formStudy.vue        | 2 +-
 src/modules/05_leave/components/formDetail/formUpasom.vue       | 2 +-
 .../components/formDetail/formVocationalRehabilitation.vue      | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/modules/05_leave/components/formDetail/formCheckSelect.vue b/src/modules/05_leave/components/formDetail/formCheckSelect.vue
index 2b83471..08120fe 100644
--- a/src/modules/05_leave/components/formDetail/formCheckSelect.vue
+++ b/src/modules/05_leave/components/formDetail/formCheckSelect.vue
@@ -63,7 +63,7 @@ console.log(props)
 				<div class="col text-grey-8">เอกสารแนบ</div>
 				<div class="col">
 					<div v-if="props.data.leaveDocument && props.data.leaveDocument.length > 0">
-						<div v-for="(document, index) in props.data.leaveDocument" :key="index">
+						<div v-for="(document, index) in props.data.leaveDocument" :key="index" :style="{ marginBottom: '10px' }">
 							<div>
 								{{ "เอกสารแนบฉบับที่" + (index + 1) }}
 								<q-btn :href="document" target="_blank" outline color="blue" label="ดาวน์โหลด" size="12px">
diff --git a/src/modules/05_leave/components/formDetail/formChildbirth.vue b/src/modules/05_leave/components/formDetail/formChildbirth.vue
index 1740be4..b92852f 100644
--- a/src/modules/05_leave/components/formDetail/formChildbirth.vue
+++ b/src/modules/05_leave/components/formDetail/formChildbirth.vue
@@ -57,7 +57,7 @@ const props = defineProps({
 				<div class="col text-grey-8">เอกสารแนบ</div>
 				<div class="col">
 					<div v-if="props.data.leaveDocument && props.data.leaveDocument.length > 0">
-						<div v-for="(document, index) in props.data.leaveDocument" :key="index">
+						<div v-for="(document, index) in props.data.leaveDocument" :key="index" :style="{ marginBottom: '11px' }">
 							<div>
 								{{ "เอกสารแนบฉบับที่" + (index + 1) }}
 								<q-btn :href="document" target="_blank" outline color="blue" label="ดาวน์โหลด" size="12px">
diff --git a/src/modules/05_leave/components/formDetail/formHajj.vue b/src/modules/05_leave/components/formDetail/formHajj.vue
index effc1a8..a25af68 100644
--- a/src/modules/05_leave/components/formDetail/formHajj.vue
+++ b/src/modules/05_leave/components/formDetail/formHajj.vue
@@ -50,7 +50,7 @@ const props = defineProps({
 				<div class="col text-grey-8">เอกสารแนบ</div>
 				<div class="col">
 					<div v-if="props.data.leaveDocument && props.data.leaveDocument.length > 0">
-						<div v-for="(document, index) in props.data.leaveDocument" :key="index">
+						<div v-for="(document, index) in props.data.leaveDocument" :key="index" :style="{ marginBottom: '10px' }">
 							<div>
 								{{ "เอกสารแนบฉบับที่" + (index + 1) }}
 								<q-btn :href="document" target="_blank" outline color="blue" label="ดาวน์โหลด" size="12px">
diff --git a/src/modules/05_leave/components/formDetail/formHoliday.vue b/src/modules/05_leave/components/formDetail/formHoliday.vue
index 602bf03..88cb49f 100644
--- a/src/modules/05_leave/components/formDetail/formHoliday.vue
+++ b/src/modules/05_leave/components/formDetail/formHoliday.vue
@@ -62,7 +62,7 @@ const props = defineProps({
 				<div class="col text-grey-8">เอกสารแนบ</div>
 				<div class="col">
 					<div v-if="props.data.leaveDocument && props.data.leaveDocument.length > 0">
-						<div v-for="(document, index) in props.data.leaveDocument" :key="index">
+						<div v-for="(document, index) in props.data.leaveDocument" :key="index" :style="{ marginBottom: '10px' }">
 							<div>
 								{{ "เอกสารแนบฉบับที่" + (index + 1) }}
 								<q-btn :href="document" target="_blank" outline color="blue" label="ดาวน์โหลด" size="12px">
diff --git a/src/modules/05_leave/components/formDetail/formLeave.vue b/src/modules/05_leave/components/formDetail/formLeave.vue
index b3fa6ba..c2df755 100644
--- a/src/modules/05_leave/components/formDetail/formLeave.vue
+++ b/src/modules/05_leave/components/formDetail/formLeave.vue
@@ -58,7 +58,7 @@ const props = defineProps({
 				<div class="col text-grey-8">เอกสารแนบ</div>
 				<div class="col">
 					<div v-if="props.data.leaveDocument && props.data.leaveDocument.length > 0">
-						<div v-for="(document, index) in props.data.leaveDocument" :key="index">
+						<div v-for="(document, index) in props.data.leaveDocument" :key="index" :style="{ marginBottom: '10px' }">
 							<div>
 								{{ "เอกสารแนบฉบับที่" + (index + 1) }}
 								<q-btn :href="document" target="_blank" outline color="blue" label="ดาวน์โหลด" size="12px">
diff --git a/src/modules/05_leave/components/formDetail/formLeaveToTraining.vue b/src/modules/05_leave/components/formDetail/formLeaveToTraining.vue
index 13c6275..4ea15cf 100644
--- a/src/modules/05_leave/components/formDetail/formLeaveToTraining.vue
+++ b/src/modules/05_leave/components/formDetail/formLeaveToTraining.vue
@@ -79,7 +79,7 @@ const props = defineProps({
 				<div class="col text-grey-8">เอกสารแนบ</div>
 				<div class="col">
 					<div v-if="props.data.leaveDocument && props.data.leaveDocument.length > 0">
-						<div v-for="(document, index) in props.data.leaveDocument" :key="index">
+						<div v-for="(document, index) in props.data.leaveDocument" :key="index" :style="{ marginBottom: '10px' }">
 							<div>
 								{{ "เอกสารแนบฉบับที่" + (index + 1) }}
 								<q-btn :href="document" target="_blank" outline color="blue" label="ดาวน์โหลด" size="12px">
diff --git a/src/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue b/src/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue
index 9561acd..2a8e976 100644
--- a/src/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue
+++ b/src/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue
@@ -44,7 +44,7 @@ const props = defineProps({
 				<div class="col text-grey-8">เอกสารแนบ</div>
 				<div class="col">
 					<div v-if="props.data.leaveDocument && props.data.leaveDocument.length > 0">
-						<div v-for="(document, index) in props.data.leaveDocument" :key="index">
+						<div v-for="(document, index) in props.data.leaveDocument" :key="index" :style="{ marginBottom: '10px' }">
 							<div>
 								{{ "เอกสารแนบฉบับที่" + (index + 1) }}
 								<q-btn :href="document" target="_blank" outline color="blue" label="ดาวน์โหลด" size="12px">
diff --git a/src/modules/05_leave/components/formDetail/formSpouse.vue b/src/modules/05_leave/components/formDetail/formSpouse.vue
index 9a79376..956272c 100644
--- a/src/modules/05_leave/components/formDetail/formSpouse.vue
+++ b/src/modules/05_leave/components/formDetail/formSpouse.vue
@@ -86,7 +86,7 @@ const props = defineProps({
 				<div class="col text-grey-8">เอกสารแนบ</div>
 				<div class="col">
 					<div v-if="props.data.leaveDocument && props.data.leaveDocument.length > 0">
-						<div v-for="(document, index) in props.data.leaveDocument" :key="index">
+						<div v-for="(document, index) in props.data.leaveDocument" :key="index" :style="{ marginBottom: '10px' }">
 							<div>
 								{{ "เอกสารแนบฉบับที่" + (index + 1) }}
 								<q-btn :href="document" target="_blank" outline color="blue" label="ดาวน์โหลด" size="12px">
diff --git a/src/modules/05_leave/components/formDetail/formStudy.vue b/src/modules/05_leave/components/formDetail/formStudy.vue
index 26975d2..3ec2cde 100644
--- a/src/modules/05_leave/components/formDetail/formStudy.vue
+++ b/src/modules/05_leave/components/formDetail/formStudy.vue
@@ -82,7 +82,7 @@ const props = defineProps({
 				<div class="col text-grey-8">เอกสารแนบ</div>
 				<div class="col">
 					<div v-if="props.data.leaveDocument && props.data.leaveDocument.length > 0">
-						<div v-for="(document, index) in props.data.leaveDocument" :key="index">
+						<div v-for="(document, index) in props.data.leaveDocument" :key="index" :style="{ marginBottom: '10px' }">
 							<div>
 								{{ "เอกสารแนบฉบับที่" + (index + 1) }}
 								<q-btn :href="document" target="_blank" outline color="blue" label="ดาวน์โหลด" size="12px">
diff --git a/src/modules/05_leave/components/formDetail/formUpasom.vue b/src/modules/05_leave/components/formDetail/formUpasom.vue
index 9241cb9..b5c569d 100644
--- a/src/modules/05_leave/components/formDetail/formUpasom.vue
+++ b/src/modules/05_leave/components/formDetail/formUpasom.vue
@@ -75,7 +75,7 @@ const props = defineProps({
 				<div class="col text-grey-8">เอกสารแนบ</div>
 				<div class="col">
 					<div v-if="props.data.leaveDocument && props.data.leaveDocument.length > 0">
-						<div v-for="(document, index) in props.data.leaveDocument" :key="index">
+						<div v-for="(document, index) in props.data.leaveDocument" :key="index" :style="{ marginBottom: '10px' }">
 							<div>
 								{{ "เอกสารแนบฉบับที่" + (index + 1) }}
 								<q-btn :href="document" target="_blank" outline color="blue" label="ดาวน์โหลด" size="12px">
diff --git a/src/modules/05_leave/components/formDetail/formVocationalRehabilitation.vue b/src/modules/05_leave/components/formDetail/formVocationalRehabilitation.vue
index 9561acd..2a8e976 100644
--- a/src/modules/05_leave/components/formDetail/formVocationalRehabilitation.vue
+++ b/src/modules/05_leave/components/formDetail/formVocationalRehabilitation.vue
@@ -44,7 +44,7 @@ const props = defineProps({
 				<div class="col text-grey-8">เอกสารแนบ</div>
 				<div class="col">
 					<div v-if="props.data.leaveDocument && props.data.leaveDocument.length > 0">
-						<div v-for="(document, index) in props.data.leaveDocument" :key="index">
+						<div v-for="(document, index) in props.data.leaveDocument" :key="index" :style="{ marginBottom: '10px' }">
 							<div>
 								{{ "เอกสารแนบฉบับที่" + (index + 1) }}
 								<q-btn :href="document" target="_blank" outline color="blue" label="ดาวน์โหลด" size="12px">

From eddee772843a8c104d40d6628f6e57d223d16afe Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Wed, 10 Jan 2024 16:36:41 +0700
Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=A1=E0=B8=B5=E0=B9=84?=
 =?UTF-8?q?=E0=B8=9F=E0=B8=A5=E0=B9=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_leave/components/FormLeave/01_SickForm.vue      | 10 +++++-----
 src/modules/05_leave/components/FormLeave/03_Birth.vue |  5 ++++-
 .../components/FormLeave/04_HelpWifeBirthForm.vue      |  5 ++++-
 .../05_leave/components/FormLeave/05_VacationForm.vue  |  5 ++++-
 .../components/FormLeave/06_OrdinationForm.vue         |  5 ++++-
 .../05_leave/components/FormLeave/07_HajjForm.vue      |  6 +++++-
 .../05_leave/components/FormLeave/08_MilitaryForm.vue  |  5 ++++-
 .../05_leave/components/FormLeave/09_StudyForm.vue     |  5 ++++-
 .../05_leave/components/FormLeave/10_TrainForm.vue     |  5 ++++-
 .../components/FormLeave/11_WorkInternationalForm.vue  |  5 ++++-
 .../components/FormLeave/12_FollowSpouseForm.vue       |  5 ++++-
 .../components/FormLeave/13_RehabilitationForm.vue     |  5 ++++-
 12 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
index 7c67049..a0b8dcb 100644
--- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue
+++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
@@ -393,18 +393,15 @@ onMounted(() => {
 								<q-icon name="attach_file" color="primary" />
 							</template>
 						</q-file>
-						<div class="col-12" v-if="leaveDocumentList">
-							<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ </q-card>
-						</div>
 					</div>
 				</div>
 				<div class="col-12" v-if="data">
 					<div class="col-12 col-md-12 col-sm-12">
-						<q-card bordered>
+						<q-card bordered flat>
 							<!-- <div class="col-12">
 								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ{{ leaveDocumentList }} </q-card>
 							</div> -->
-							<q-list separator>
+							<q-list separator v-if="leaveDocumentList && leaveDocumentList.length > 0">
 								<q-item v-for="(document, index) in leaveDocumentList" :key="index" class="q-my-xs">
 									<q-item-section>
 										<q-item-label class="row items-baseline">
@@ -418,6 +415,9 @@ onMounted(() => {
 									</q-item-section>
 								</q-item>
 							</q-list>
+							<div class="col-12" v-else>
+								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ </q-card>
+							</div>
 						</q-card>
 					</div>
 				</div>
diff --git a/src/modules/05_leave/components/FormLeave/03_Birth.vue b/src/modules/05_leave/components/FormLeave/03_Birth.vue
index 978a6fa..bfc5f37 100644
--- a/src/modules/05_leave/components/FormLeave/03_Birth.vue
+++ b/src/modules/05_leave/components/FormLeave/03_Birth.vue
@@ -368,7 +368,7 @@ onMounted(() => {
 						<div class="q-pl-sm text-weight-bold text-dark">เอกสารเพิ่มเติม</div>
 					</div> -->
 					<q-card bordered flat class="full-width">
-						<q-list separator>
+						<q-list separator v-if="leaveDocumentList && leaveDocumentList.length > 0">
 							<q-item v-for="(document, index) in leaveDocumentList" :key="index" class="q-my-xs">
 								<q-item-section>
 									<q-item-label class="row items-baseline">
@@ -382,6 +382,9 @@ onMounted(() => {
 								</q-item-section>
 							</q-item>
 						</q-list>
+						<div class="col-12" v-else>
+							<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ </q-card>
+						</div>
 					</q-card>
 				</div>
 				<div class="col-12 col-sm-6 row" v-if="!edit">
diff --git a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
index 4d4334a..d26a391 100644
--- a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
+++ b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
@@ -409,7 +409,7 @@ onMounted(() => {
 							<!-- <div class="col-12">
 								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ{{ leaveDocumentList }} </q-card>
 							</div> -->
-							<q-list separator>
+							<q-list separator v-if="leaveDocumentList && leaveDocumentList.length > 0">
 								<q-item v-for="(document, index) in leaveDocumentList" :key="index" class="q-my-xs">
 									<q-item-section>
 										<q-item-label class="row items-baseline">
@@ -423,6 +423,9 @@ onMounted(() => {
 									</q-item-section>
 								</q-item>
 							</q-list>
+							<div class="col-12" v-else>
+								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ </q-card>
+							</div>
 						</q-card>
 					</div>
 				</div>
diff --git a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
index 43318eb..c3fc915 100644
--- a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
@@ -407,7 +407,7 @@ onMounted(() => {
 							<!-- <div class="col-12">
 								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ{{ leaveDocumentList }} </q-card>
 							</div> -->
-							<q-list separator>
+							<q-list separator v-if="leaveDocumentList && leaveDocumentList.length > 0">
 								<q-item v-for="(document, index) in leaveDocumentList" :key="index" class="q-my-xs">
 									<q-item-section>
 										<q-item-label class="row items-baseline">
@@ -421,6 +421,9 @@ onMounted(() => {
 									</q-item-section>
 								</q-item>
 							</q-list>
+							<div class="col-12" v-else>
+								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ </q-card>
+							</div>
 						</q-card>
 					</div>
 				</div>
diff --git a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
index e697820..e9a0052 100644
--- a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
@@ -519,7 +519,7 @@ onMounted(() => {
 							<!-- <div class="col-12">
 								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ{{ leaveDocumentList }} </q-card>
 							</div> -->
-							<q-list separator>
+							<q-list separator v-if="leaveDocumentList && leaveDocumentList.length > 0">
 								<q-item v-for="(document, index) in leaveDocumentList" :key="index" class="q-my-xs">
 									<q-item-section>
 										<q-item-label class="row items-baseline">
@@ -533,6 +533,9 @@ onMounted(() => {
 									</q-item-section>
 								</q-item>
 							</q-list>
+							<div class="col-12" v-else>
+								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ </q-card>
+							</div>
 						</q-card>
 					</div>
 				</div>
diff --git a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
index 6c67c11..9f213ab 100644
--- a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
+++ b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
@@ -329,7 +329,7 @@ onMounted(() => {
 							<!-- <div class="col-12">
 								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ{{ leaveDocumentList }} </q-card>
 							</div> -->
-							<q-list separator>
+							<q-list separator v-if="leaveDocumentList && leaveDocumentList.length > 0">
 								<q-item v-for="(document, index) in leaveDocumentList" :key="index" class="q-my-xs">
 									<q-item-section>
 										<q-item-label class="row items-baseline">
@@ -343,6 +343,10 @@ onMounted(() => {
 									</q-item-section>
 								</q-item>
 							</q-list>
+
+							<div class="col-12" v-else>
+								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ </q-card>
+							</div>
 						</q-card>
 					</div>
 				</div>
diff --git a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
index 25cbc8d..62ebff9 100644
--- a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
+++ b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
@@ -406,7 +406,7 @@ onMounted(() => {
 								<!-- <div class="col-12">
 								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ{{ leaveDocumentList }} </q-card>
 							</div> -->
-								<q-list separator>
+								<q-list separator v-if="leaveDocumentList && leaveDocumentList.length > 0">
 									<q-item v-for="(document, index) in leaveDocumentList" :key="index" class="q-my-xs">
 										<q-item-section>
 											<q-item-label class="row items-baseline">
@@ -420,6 +420,9 @@ onMounted(() => {
 										</q-item-section>
 									</q-item>
 								</q-list>
+								<div class="col-12" v-else>
+									<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ </q-card>
+								</div>
 							</q-card>
 						</div>
 					</div>
diff --git a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
index 234770d..bb0bc2f 100644
--- a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
+++ b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
@@ -507,7 +507,7 @@ onMounted(async () => {
 								<!-- <div class="col-12">
 								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ{{ leaveDocumentList }} </q-card>
 							</div> -->
-								<q-list separator>
+								<q-list separator v-if="leaveDocumentList && leaveDocumentList.length > 0">
 									<q-item v-for="(document, index) in leaveDocumentList" :key="index" class="q-my-xs">
 										<q-item-section>
 											<q-item-label class="row items-baseline">
@@ -521,6 +521,9 @@ onMounted(async () => {
 										</q-item-section>
 									</q-item>
 								</q-list>
+								<div class="col-12" v-else>
+									<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ </q-card>
+								</div>
 							</q-card>
 						</div>
 					</div>
diff --git a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
index d79b75e..ab89df4 100644
--- a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
+++ b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
@@ -507,7 +507,7 @@ onMounted(async () => {
 								<!-- <div class="col-12">
 								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ{{ leaveDocumentList }} </q-card>
 							</div> -->
-								<q-list separator>
+								<q-list separator v-if="leaveDocumentList && leaveDocumentList.length > 0">
 									<q-item v-for="(document, index) in leaveDocumentList" :key="index" class="q-my-xs">
 										<q-item-section>
 											<q-item-label class="row items-baseline">
@@ -521,6 +521,9 @@ onMounted(async () => {
 										</q-item-section>
 									</q-item>
 								</q-list>
+								<div class="col-12" v-else>
+									<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ </q-card>
+								</div>
 							</q-card>
 						</div>
 					</div>
diff --git a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
index 9b01c85..44aa05c 100644
--- a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
+++ b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
@@ -349,7 +349,7 @@ onMounted(() => {
 						<div class="q-pl-sm text-weight-bold text-dark">เอกสารเพิ่มเติม</div>
 					</div>
 					<q-card bordered flat class="full-width">
-						<q-list separator>
+						<q-list separator v-if="leaveDocumentList && leaveDocumentList.length > 0">
 							<q-item v-for="(file, index) in leaveDocumentList" :key="index" class="q-my-xs">
 								<q-item-section>
 									<q-item-label class="full-width ellipsis">
@@ -359,6 +359,9 @@ onMounted(() => {
 								</q-item-section>
 							</q-item>
 						</q-list>
+						<div class="col-12" v-else>
+							<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ </q-card>
+						</div>
 					</q-card>
 				</div>
 			</div>
diff --git a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
index 0dd0bff..0973dbe 100644
--- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
@@ -566,7 +566,7 @@ onMounted(async () => {
 							<!-- <div class="col-12">
 								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ{{ leaveDocumentList }} </q-card>
 							</div> -->
-							<q-list separator>
+							<q-list separator v-if="leaveDocumentList && leaveDocumentList.length > 0">
 								<q-item v-for="(document, index) in leaveDocumentList" :key="index" class="q-my-xs">
 									<q-item-section>
 										<q-item-label class="row items-baseline">
@@ -580,6 +580,9 @@ onMounted(async () => {
 									</q-item-section>
 								</q-item>
 							</q-list>
+							<div class="col-12" v-else>
+								<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ </q-card>
+							</div>
 						</q-card>
 					</div>
 				</div>
diff --git a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
index 20c17cc..9d81906 100644
--- a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
@@ -316,7 +316,7 @@ onMounted(() => {
 						<div class="q-pl-sm text-weight-bold text-dark">เอกสารเพิ่มเติม</div>
 					</div>
 					<q-card bordered flat class="full-width">
-						<q-list separator>
+						<q-list separator v-if="leaveDocumentList && leaveDocumentList.length > 0">
 							<q-item v-for="(file, index) in leaveDocumentList" :key="index" class="q-my-xs">
 								<q-item-section>
 									<q-item-label class="full-width ellipsis">
@@ -326,6 +326,9 @@ onMounted(() => {
 								</q-item-section>
 							</q-item>
 						</q-list>
+						<div class="col-12" v-else>
+							<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสารประกอบ </q-card>
+						</div>
 					</q-card>
 				</div>
 			</div>

From e62dfb3ce36c426050081d20d33f68c2d5c5c327 Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Wed, 10 Jan 2024 17:13:27 +0700
Subject: [PATCH 3/3] =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=87=E0=B9=80=E0=B8=87=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99?=
 =?UTF-8?q?=E0=B9=84=E0=B8=82=E0=B8=A3=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=9A=20FetchCheck?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_leave/components/FormLeave/01_SickForm.vue      |  6 ++++--
 src/modules/05_leave/components/FormLeave/03_Birth.vue |  5 ++++-
 .../components/FormLeave/04_HelpWifeBirthForm.vue      |  5 ++++-
 .../05_leave/components/FormLeave/05_VacationForm.vue  |  5 ++++-
 .../components/FormLeave/06_OrdinationForm.vue         |  5 ++++-
 .../05_leave/components/FormLeave/07_HajjForm.vue      | 10 +++++++---
 .../05_leave/components/FormLeave/08_MilitaryForm.vue  |  5 ++++-
 .../05_leave/components/FormLeave/09_StudyForm.vue     |  9 ++++++---
 .../05_leave/components/FormLeave/10_TrainForm.vue     |  9 ++++++---
 .../components/FormLeave/11_WorkInternationalForm.vue  |  5 ++++-
 .../components/FormLeave/12_FollowSpouseForm.vue       |  7 +++++--
 .../components/FormLeave/13_RehabilitationForm.vue     |  5 ++++-
 12 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
index a0b8dcb..d51d125 100644
--- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue
+++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
@@ -121,11 +121,11 @@ function onValidate() {
 		props.onSubmit(formData)
 	}
 }
-
 /**
  * check ว่าลาได้ไหม จาก api
  * @param formData
  */
+const leaveEndDateRules = ref([val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`])
 const isLeave = ref<boolean>(true)
 async function fetchCheck() {
 	await http
@@ -139,8 +139,10 @@ async function fetchCheck() {
 			isLeave.value = data.isLeave
 			if (data.isLeave === true) {
 				formDataSick.leaveTotal = data.totalDate - data.sumDateWork - data.sumDateHoliday
+				this.leaveEndDateRules = [val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`]
 			} else {
 				fails($q, "ไม่สามารถลาได้")
+				this.leaveEndDateRules = [val => false || `${"ไม่สามารถลาได้"}`]
 			}
 		})
 		.catch((e: any) => {
@@ -306,7 +308,7 @@ onMounted(() => {
 									:class="inputEdit(isReadOnly)"
 									:model-value="formDataSick.leaveEndDate != null ? date2Thai(formDataSick.leaveEndDate) : null"
 									:label="`${'ลาถึงวันที่'}`"
-									:rules="[val => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
+									:rules="leaveEndDateRules"
 								>
 									<template v-slot:prepend>
 										<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
diff --git a/src/modules/05_leave/components/FormLeave/03_Birth.vue b/src/modules/05_leave/components/FormLeave/03_Birth.vue
index bfc5f37..e361107 100644
--- a/src/modules/05_leave/components/FormLeave/03_Birth.vue
+++ b/src/modules/05_leave/components/FormLeave/03_Birth.vue
@@ -107,6 +107,7 @@ function onValidate() {
 	}
 }
 
+const leaveEndDateRules = ref([val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`])
 /**
  * check ว่าลาได้ไหม จาก api
  * @param formData
@@ -124,8 +125,10 @@ async function fetchCheck() {
 			isLeave.value = data.isLeave
 			if (data.isLeave === true) {
 				formDataBirth.leaveTotal = data.totalDate
+				this.leaveEndDateRules = [val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`]
 				// formDataBirth.leaveLast = data.sumDateWork
 			} else {
+				this.leaveEndDateRules = [val => false || `${"ไม่สามารถลาได้"}`]
 				fails($q, "ไม่สามารถลาได้")
 			}
 		})
@@ -247,7 +250,7 @@ onMounted(() => {
 							class="full-width datepicker"
 							:model-value="formDataBirth.leaveEndDate != null ? date2Thai(formDataBirth.leaveEndDate) : null"
 							:label="`${'ลาถึงวันที่'}`"
-							:rules="[val => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
+							:rules="leaveEndDateRules"
 						>
 							<template v-slot:prepend>
 								<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
diff --git a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
index d26a391..e9546b1 100644
--- a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
+++ b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
@@ -125,6 +125,7 @@ function updateLeaveTotal() {
  * check ว่าลาได้ไหม จาก api
  * @param formData
  */
+const leaveEndDateRules = ref([val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`])
 const isLeave = ref<boolean>(true)
 async function fetchCheck() {
 	await http
@@ -138,9 +139,11 @@ async function fetchCheck() {
 			isLeave.value = data.isLeave
 			if (data.isLeave === true) {
 				formDataHelpWife.leaveTotal = data.totalDate - data.sumDateWork - data.sumDateHoliday
+				this.leaveEndDateRules = [val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`]
 				// formDataHelpWife.leaveLast = data.totalDate
 			} else {
 				fails($q, "ไม่สามารถลาได้")
+				this.leaveEndDateRules = [val => false || `${"ไม่สามารถลาได้"}`]
 			}
 		})
 		.catch((e: any) => {
@@ -263,7 +266,7 @@ onMounted(() => {
 							class="full-width datepicker"
 							:model-value="formDataHelpWife.leaveEndDate != null ? date2Thai(formDataHelpWife.leaveEndDate) : null"
 							:label="`${'ลาถึงวันที่'}`"
-							:rules="[val => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
+							:rules="leaveEndDateRules"
 						>
 							<template v-slot:prepend>
 								<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
diff --git a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
index c3fc915..7f99cc0 100644
--- a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
@@ -119,6 +119,7 @@ function onValidate() {
  * check ว่าลาได้ไหม จาก api
  * @param formData
  */
+const leaveEndDateRules = ref([val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`])
 const isLeave = ref<boolean>(true)
 async function fetchCheck() {
 	await http
@@ -133,8 +134,10 @@ async function fetchCheck() {
 			if (data.isLeave === true) {
 				formDataVacation.leaveTotal = data.totalDate - data.sumDateWork - data.sumDateHoliday
 				// formDataVacation.leaveLast = data.totalDate
+				this.leaveEndDateRules = [val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`]
 			} else {
 				fails($q, "ไม่สามารถลาได้")
+				this.leaveEndDateRules = [val => false || `${"ไม่สามารถลาได้"}`]
 			}
 		})
 		.catch((e: any) => {
@@ -311,7 +314,7 @@ onMounted(() => {
 							:readonly="isReadOnly"
 							:model-value="formDataVacation.leaveEndDate != null ? date2Thai(formDataVacation.leaveEndDate) : null"
 							:label="`${'ลาถึงวันที่'}`"
-							:rules="[val => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
+							:rules="leaveEndDateRules"
 						>
 							<template v-slot:prepend>
 								<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
diff --git a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
index e9a0052..a1361bc 100644
--- a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
@@ -131,6 +131,7 @@ function onValidate() {
  * check ว่าลาได้ไหม จาก api
  * @param formData
  */
+const leaveEndDateRules = ref([val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`])
 const isLeave = ref<boolean>(true)
 async function fetchCheck() {
 	await http
@@ -145,8 +146,10 @@ async function fetchCheck() {
 			if (data.isLeave === true) {
 				// formDataOrdination.leaveTotal = data.totalDate - data.sumDateWork - data.sumDateHoliday
 				formDataOrdination.leaveTotal = data.totalDate
+				this.leaveEndDateRules = [val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`]
 			} else {
 				fails($q, "ไม่สามารถลาได้")
+				this.leaveEndDateRules = [val => false || `${"ไม่สามารถลาได้"}`]
 			}
 		})
 		.catch((e: any) => {
@@ -276,7 +279,7 @@ onMounted(() => {
 							:model-value="formDataOrdination.leaveEndDate != null ? date2Thai(formDataOrdination.leaveEndDate) : null"
 							:label="`${'ลาถึงวันที่'}`"
 							:readonly="!formDataOrdination.leaveStartDate || statusCheck === 'NEW'"
-							:rules="[val => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
+							:rules="leaveEndDateRules"
 						>
 							<template v-slot:prepend>
 								<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
diff --git a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
index 9f213ab..ca073ff 100644
--- a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
+++ b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
@@ -102,8 +102,10 @@ function onValidate() {
  * check ว่าลาได้ไหม จาก api
  * @param formData
  */
+const leaveEndDateRules = ref([val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`])
 const isLeave = ref<boolean>(true)
 async function fetchCheck() {
+	console.log("check")
 	await http
 		.post(config.API.leaveCheck(), {
 			type: dataStore.typeId ?? null,
@@ -116,8 +118,10 @@ async function fetchCheck() {
 			if (data.isLeave === true) {
 				// formDataHaji.leaveTotal = data.totalDate - data.sumDateWork - data.sumDateHoliday
 				formDataHaji.leaveTotal = data.totalDate
+				this.leaveEndDateRules = [val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`]
 			} else {
 				fails($q, "ไม่สามารถลาได้")
+				this.leaveEndDateRules = [val => false || `${"ไม่สามารถลาได้"}`]
 			}
 		})
 		.catch((e: any) => {
@@ -222,7 +226,7 @@ onMounted(() => {
 							week-start="0"
 							:enableTimePicker="false"
 							:locale="'th'"
-							@update:model-value="updateLeaveTotal"
+							@update:model-value="updateLeaveTotal(), fetchCheck()"
 							:readonly="!formDataHaji.leaveStartDate || statusCheck === 'NEW'"
 							:min-date="formDataHaji.leaveStartDate"
 						>
@@ -242,9 +246,9 @@ onMounted(() => {
 									:readonly="!formDataHaji.leaveStartDate || statusCheck === 'NEW'"
 									hide-bottom-space
 									:label="`${'ลาถึงวันที่'}`"
-									@update:model-value="fetchCheck()"
 									:model-value="formDataHaji.leaveEndDate != null ? date2Thai(formDataHaji.leaveEndDate) : null"
-									:rules="[val => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
+									:rules="leaveEndDateRules"
+									@update:model-value="fetchCheck()"
 								>
 									<template v-slot:prepend>
 										<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
diff --git a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
index 62ebff9..9a52128 100644
--- a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
+++ b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
@@ -118,6 +118,7 @@ function onValidate() {
  * check ว่าลาได้ไหม จาก api
  * @param formData
  */
+const leaveEndDateRules = ref([val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`])
 const isLeave = ref<boolean>(true)
 async function fetchCheck() {
 	await http
@@ -132,8 +133,10 @@ async function fetchCheck() {
 			if (data.isLeave === true) {
 				// formDataMilitary.leaveTotal = data.totalDate - data.sumDateWork - data.sumDateHoliday
 				formDataMilitary.leaveTotal = data.totalDate
+				this.leaveEndDateRules = [val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`]
 			} else {
 				fails($q, "ไม่สามารถลาได้")
+				this.leaveEndDateRules = [val => false || `${"ไม่สามารถลาได้"}`]
 			}
 		})
 		.catch((e: any) => {
@@ -261,7 +264,7 @@ onMounted(() => {
 							class="full-width datepicker"
 							:model-value="formDataMilitary.leaveEndDate != null ? date2Thai(formDataMilitary.leaveEndDate) : null"
 							:label="`${'ลาถึงวันที่'}`"
-							:rules="[val => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
+							:rules="leaveEndDateRules"
 						>
 							<template v-slot:prepend>
 								<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
diff --git a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
index bb0bc2f..9e2e0f7 100644
--- a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
+++ b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
@@ -136,6 +136,8 @@ function onValidate() {
  * @param formData
  */
 const isLeave = ref<boolean>(true)
+const leaveEndDateRules = ref([val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`])
+
 async function fetchCheck() {
 	await http
 		.post(config.API.leaveCheck(), {
@@ -149,8 +151,10 @@ async function fetchCheck() {
 			if (data.isLeave === true) {
 				// formDataStudy.leaveTotal = data.totalDate - data.sumDateWork - data.sumDateHoliday;
 				formDataStudy.leaveTotal = data.totalDate
+				this.leaveEndDateRules = [val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`]
 			} else {
 				fails($q, "ไม่สามารถลาได้")
+				this.leaveEndDateRules = [val => false || `${"ไม่สามารถลาได้"}`]
 			}
 		})
 		.catch((e: any) => {
@@ -162,7 +166,6 @@ async function fetchCheck() {
  * function อัพเดทค่า LeaveTotal
  */
 function updateLeaveTotal() {
-	fetchCheck()
 	const newLeaveTotal = calculateDurationYmd(formDataStudy.leaveStartDate, formDataStudy.leaveEndDate)
 	formDataStudy.leaveTotal = newLeaveTotal
 }
@@ -265,7 +268,7 @@ onMounted(async () => {
 					borderless
 					week-start="0"
 					:locale="'th'"
-					@update:model-value="updateLeaveTotal()"
+					@update:model-value="updateLeaveTotal(), fetchCheck()"
 					:readonly="!formDataStudy.leaveStartDate || statusCheck === 'NEW'"
 					:enableTimePicker="false"
 					:min-date="formDataStudy.leaveStartDate"
@@ -288,7 +291,7 @@ onMounted(async () => {
 							:label="`${'ลาถึงวันที่'}`"
 							:readonly="!formDataStudy.leaveStartDate || statusCheck === 'NEW'"
 							:model-value="formDataStudy.leaveEndDate != null ? date2Thai(formDataStudy.leaveEndDate) : null"
-							:rules="[val => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
+							:rules="leaveEndDateRules"
 						>
 							<template v-slot:prepend>
 								<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
diff --git a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
index ab89df4..0e34655 100644
--- a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
+++ b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
@@ -133,6 +133,8 @@ function onValidate() {
  * check ว่าลาได้ไหม จาก api
  * @param formData
  */
+const leaveEndDateRules = ref([val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`])
+
 const isLeave = ref<boolean>(true)
 async function fetchCheck() {
 	await http
@@ -147,8 +149,10 @@ async function fetchCheck() {
 			if (data.isLeave === true) {
 				// formDataTrain.leaveTotal = data.totalDate - data.sumDateWork - data.sumDateHoliday
 				formDataTrain.leaveTotal = data.totalDate
+				this.leaveEndDateRules = [val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`]
 			} else {
 				fails($q, "ไม่สามารถลาได้")
+				this.leaveEndDateRules = [val => false || `${"ไม่สามารถลาได้"}`]
 			}
 		})
 		.catch((e: any) => {
@@ -160,7 +164,6 @@ async function fetchCheck() {
  * function อัพเดทค่า LeaveTotal
  */
 function updateLeaveTotal() {
-	fetchCheck()
 	const newLeaveTotal = calculateDurationYmd(formDataTrain.leaveStartDate, formDataTrain.leaveEndDate)
 	formDataTrain.leaveTotal = newLeaveTotal
 }
@@ -267,7 +270,7 @@ onMounted(async () => {
 					menu-class-name="modalfix"
 					autoApply
 					borderless
-					@update:model-value="updateLeaveTotal()"
+					@update:model-value="updateLeaveTotal(), fetchCheck()"
 					week-start="0"
 					:readonly="!formDataTrain.leaveStartDate || statusCheck === 'NEW'"
 					:locale="'th'"
@@ -292,7 +295,7 @@ onMounted(async () => {
 							:label="`${'ลาถึงวันที่'}`"
 							:readonly="!formDataTrain.leaveStartDate || statusCheck === 'NEW'"
 							:model-value="formDataTrain.leaveEndDate != null ? date2Thai(formDataTrain.leaveEndDate) : null"
-							:rules="[val => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
+							:rules="leaveEndDateRules"
 						>
 							<template v-slot:prepend>
 								<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
diff --git a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
index 44aa05c..c6c2a42 100644
--- a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
+++ b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
@@ -128,6 +128,7 @@ async function onClickDownloadFile(id: string, fileName: string) {
  * check ว่าลาได้ไหม จาก api
  * @param formData
  */
+const leaveEndDateRules = ref([val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`])
 const isLeave = ref<boolean>(true)
 async function FetchCheck() {
 	await http
@@ -142,8 +143,10 @@ async function FetchCheck() {
 			if (data.isLeave === true) {
 				formDataWorkInternational.leaveTotal = data.totalDate - data.sumDateWork - data.sumDateHoliday
 				// formDataWorkInternational.leaveLast = data.totalDate
+				this.leaveEndDateRules = [val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`]
 			} else {
 				fails($q, "ไม่สามารถลาได้")
+				this.leaveEndDateRules = [val => false || `${"ไม่สามารถลาได้"}`]
 			}
 		})
 		.catch((e: any) => {
@@ -263,7 +266,7 @@ onMounted(() => {
 							class="full-width datepicker"
 							:model-value="formDataWorkInternational.leaveEndDate != null ? date2Thai(formDataWorkInternational.leaveEndDate) : null"
 							:label="`${'ลาถึงวันที่'}`"
-							:rules="[val => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
+							:rules="leaveEndDateRules"
 						>
 							<template v-slot:prepend>
 								<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
diff --git a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
index 0973dbe..fe5e4b4 100644
--- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
@@ -142,6 +142,7 @@ function onValidate() {
  * check ว่าลาได้ไหม จาก api
  * @param formData
  */
+const leaveEndDateRules = ref([val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`])
 const isLeave = ref<boolean>(true)
 async function fetchCheck() {
 	await http
@@ -156,8 +157,10 @@ async function fetchCheck() {
 			if (data.isLeave === true) {
 				// formDataFollowSpouse.leaveTotal = data.totalDate - data.sumDateWork - data.sumDateHoliday;
 				//   formDataFollowSpouse.leaveTotal = data.totalDate;
+				this.leaveEndDateRules = [val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`]
 			} else {
 				fails($q, "ไม่สามารถลาได้")
+				this.leaveEndDateRules = [val => false || `${"ไม่สามารถลาได้"}`]
 			}
 		})
 		.catch((e: any) => {
@@ -286,7 +289,7 @@ onMounted(async () => {
 					hide-bottom-space
 					:enableTimePicker="false"
 					week-start="0"
-					@update:model-value="updateLeaveTotal()"
+					@update:model-value="updateLeaveTotal(), fetchCheck()"
 					:readonly="!formDataFollowSpouse.leaveStartDate || statusCheck === 'NEW'"
 					:min-date="formDataFollowSpouse.leaveStartDate"
 				>
@@ -308,7 +311,7 @@ onMounted(async () => {
 							class="full-width datepicker"
 							:model-value="formDataFollowSpouse.leaveEndDate != null ? date2Thai(formDataFollowSpouse.leaveEndDate) : null"
 							:label="`${'ลาถึงวันที่'}`"
-							:rules="[val => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
+							:rules="leaveEndDateRules"
 						>
 							<template v-slot:prepend>
 								<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
diff --git a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
index 9d81906..7c88f21 100644
--- a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
@@ -107,6 +107,7 @@ const fileUploadDoc = async (files: any) => {
  * check ว่าลาได้ไหม จาก api
  * @param formData
  */
+const leaveEndDateRules = ref([val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`])
 const isLeave = ref<boolean>(true)
 async function FetchCheck() {
 	await http
@@ -119,10 +120,12 @@ async function FetchCheck() {
 			const data = res.data.result
 			isLeave.value = data.isLeave
 			if (data.isLeave === true) {
+				this.leaveEndDateRules = [val => !!val || `${"กรุณาเลือกลาถึงวันที่"}`]
 				// formDataRehabilitation.leaveTotal = data.totalDate - data.sumDateWork - data.sumDateHoliday
 				// formDataRehabilitation.leaveTotal = data.totalDate
 			} else {
 				fails($q, "ไม่สามารถลาได้")
+				this.leaveEndDateRules = [val => false || `${"ไม่สามารถลาได้"}`]
 			}
 		})
 		.catch((e: any) => {
@@ -256,7 +259,7 @@ onMounted(() => {
 							:readonly="!formDataRehabilitation.leaveStartDate || statusCheck === 'NEW'"
 							:model-value="formDataRehabilitation.leaveEndDate != null ? date2Thai(formDataRehabilitation.leaveEndDate) : null"
 							:label="`${'ลาถึงวันที่'}`"
-							:rules="[val => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
+							:rules="leaveEndDateRules"
 						>
 							<template v-slot:prepend>
 								<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>