From b8fd3f8cc65e0cb84605de670af8871a0dfdd5d9 Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Thu, 23 Nov 2023 09:31:31 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=20bg-color=3D"white"=20=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=81?= =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B8=9F=E0=B8=AD=E0=B8=A3=E0=B9=8C=E0=B8=A1?= =?UTF-8?q?=E0=B8=A5=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../05_leave/componenst/Forms/01_SickForm.vue | 9 ++++ .../05_leave/componenst/Forms/03_Birth.vue | 8 ++++ .../componenst/Forms/04_HelpWifeBirthForm.vue | 23 +++++++++- .../componenst/Forms/05_VacationForm.vue | 23 +++++++++- .../Forms/11_WorkInternationalForm.vue | 6 ++- .../componenst/Forms/12_FollowSpouseForm.vue | 42 +++++++++++++++++-- 6 files changed, 102 insertions(+), 9 deletions(-) diff --git a/src/modules/05_leave/componenst/Forms/01_SickForm.vue b/src/modules/05_leave/componenst/Forms/01_SickForm.vue index 40a8ec1..4969346 100644 --- a/src/modules/05_leave/componenst/Forms/01_SickForm.vue +++ b/src/modules/05_leave/componenst/Forms/01_SickForm.vue @@ -140,6 +140,7 @@ console.log(isReadOnly.value) for="leaveNoRef" dense hide-bottom-space + bg-color="white" outlined v-model="formData.leaveNo" label="เขียนที่" @@ -179,6 +180,7 @@ console.log(isReadOnly.value) for="startLeaveDateRef" hide-bottom-space :readonly="!edit" + bg-color="white" class="full-width datepicker" :model-value="formData.startLeaveDate != null ? date2Thai(formData.startLeaveDate) : null" :label="`${'ลาตั้งแต่วันที่'}`" @@ -216,6 +218,7 @@ console.log(isReadOnly.value) ref="endLeaveDateRef" for="endLeaveDateRef" hide-bottom-space + bg-color="white" :readonly="isReadOnly" class="full-width datepicker" :model-value="formData.endLeaveDate != null ? date2Thai(formData.endLeaveDate) : null" @@ -231,6 +234,7 @@ console.log(isReadOnly.value) @@ -263,6 +268,7 @@ console.log(isReadOnly.value) v-model="formData.leaveContactTel" mask="(###)-###-####" hide-bottom-space + bg-color="white" unmasked-value label="หมายเลขโทรศัพท์ที่ติดต่อได้" :readonly="!edit" @@ -280,6 +286,7 @@ console.log(isReadOnly.value) :readonly="!edit" :rules="[val => !!val || `${'กรุณากรอกที่อยู่ที่ติดต่อได้ระหว่างลา'}`]" hide-bottom-space + bg-color="white" /> @@ -293,6 +300,7 @@ console.log(isReadOnly.value) v-model="formData.leaveDetail" label="รายละเอียด" :readonly="!edit" + bg-color="white" />
@@ -306,6 +314,7 @@ console.log(isReadOnly.value) outlined use-chips multiple + bg-color="white" class="col-12 q-pl-sm col-12" :rules="[val => !!val || `${'กรุณาเลือกไฟล์'}`]" > diff --git a/src/modules/05_leave/componenst/Forms/03_Birth.vue b/src/modules/05_leave/componenst/Forms/03_Birth.vue index d11ee2c..13c0d3d 100644 --- a/src/modules/05_leave/componenst/Forms/03_Birth.vue +++ b/src/modules/05_leave/componenst/Forms/03_Birth.vue @@ -114,6 +114,7 @@ function onValidate() { v-model="formData.leaveNo" label="เขียนที่" hide-bottom-space + bg-color="white" :readonly="!edit" :rules="[val => !!val || `${'เขียนที่'}`]" /> @@ -143,6 +144,7 @@ function onValidate() { ref="startLeaveDateRef" for="startLeaveDateRef" hide-bottom-space + bg-color="white" :readonly="!edit" class="full-width datepicker" :model-value="formData.startLeaveDate != null ? date2Thai(formData.startLeaveDate) : null" @@ -182,6 +184,7 @@ function onValidate() { ref="endLeaveDateRef" for="endLeaveDateRef" hide-bottom-space + bg-color="white" :readonly="!formData.startLeaveDate" class="full-width datepicker" :model-value="formData.endLeaveDate != null ? date2Thai(formData.endLeaveDate) : null" @@ -205,6 +208,7 @@ function onValidate() { label="ลาครั้งสุดท้ายเมื่อวันที่" readonly hide-bottom-space + bg-color="white" />
@@ -213,6 +217,7 @@ function onValidate() { dense outlined hide-bottom-space + bg-color="white" ref="leaveContactTelRef" for="leaveContactTelRef" v-model="formData.leaveContactTel" @@ -228,6 +233,7 @@ function onValidate() { dense outlined hide-bottom-space + bg-color="white" ref="leaveContactLocationRef" for="leaveContactLocationRef" v-model="formData.leaveContactLocation" @@ -242,6 +248,7 @@ function onValidate() { class="col-12 col-md-12 col-sm-12" dense outlined + bg-color="white" ref="leaveDetailRef" for="leaveDetailRef" v-model="formData.leaveDetail" @@ -256,6 +263,7 @@ function onValidate() { v-model="formData.file" @added="fileUploadDoc" dense + bg-color="white" label="เอกสารประกอบ" outlined use-chips diff --git a/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue b/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue index c9ca7b4..75fd7cd 100644 --- a/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue +++ b/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue @@ -143,6 +143,7 @@ function updateLeaveTotal() { dense outlined hide-bottom-space + bg-color="white" v-model="formData.leaveNo" label="เขียนที่" :readonly="!edit" @@ -173,6 +174,7 @@ function updateLeaveTotal() { ref="startLeaveDateRef" for="startLeaveDateRef" hide-bottom-space + bg-color="white" :readonly="!edit" class="full-width datepicker" :model-value="formData.startLeaveDate != null ? date2Thai(formData.startLeaveDate) : null" @@ -213,6 +215,7 @@ function updateLeaveTotal() { ref="endLeaveDateRef" for="endLeaveDateRef" hide-bottom-space + bg-color="white" :readonly="!formData.startLeaveDate" class="full-width datepicker" :model-value="formData.endLeaveDate != null ? date2Thai(formData.endLeaveDate) : null" @@ -225,13 +228,25 @@ function updateLeaveTotal() { - +
- + diff --git a/src/modules/05_leave/componenst/Forms/05_VacationForm.vue b/src/modules/05_leave/componenst/Forms/05_VacationForm.vue index ce41d69..7b7af0c 100644 --- a/src/modules/05_leave/componenst/Forms/05_VacationForm.vue +++ b/src/modules/05_leave/componenst/Forms/05_VacationForm.vue @@ -142,6 +142,7 @@ const isReadOnly = computed(() => { for="leaveNoRef" dense hide-bottom-space + bg-color="white" outlined v-model="formData.leaveNo" label="เขียนที่" @@ -159,6 +160,7 @@ const isReadOnly = computed(() => { for="lastYearVacationRef" dense hide-bottom-space + bg-color="white" readonly outlined v-model="formData.lastYearVacation" @@ -172,6 +174,7 @@ const isReadOnly = computed(() => { dense readonly hide-bottom-space + bg-color="white" outlined v-model="formData.currentVacation" label="จำนวนวันลาพักผ่อนประจำปีปัจจุบัน" @@ -202,6 +205,7 @@ const isReadOnly = computed(() => { ref="startLeaveDateRef" for="startLeaveDateRef" hide-bottom-space + bg-color="white" :readonly="!edit" class="full-width datepicker" :model-value="formData.startLeaveDate != null ? date2Thai(formData.startLeaveDate) : null" @@ -241,6 +245,7 @@ const isReadOnly = computed(() => { ref="endLeaveDateRef" for="endLeaveDateRef" hide-bottom-space + bg-color="white" class="full-width datepicker" :readonly="isReadOnly" :model-value="formData.endLeaveDate != null ? date2Thai(formData.endLeaveDate) : null" @@ -253,7 +258,18 @@ const isReadOnly = computed(() => { - +
{ dense outlined hide-bottom-space + bg-color="white" ref="leaveContactTelRef" for="leaveContactTelRef" v-model="formData.leaveContactTel" @@ -276,6 +293,7 @@ const isReadOnly = computed(() => { dense outlined hide-bottom-space + bg-color="white" ref="leaveContactLocationRef" for="leaveContactLocationRef" v-model="formData.leaveContactLocation" @@ -288,6 +306,7 @@ const isReadOnly = computed(() => { { :readonly="!edit" /> - + diff --git a/src/modules/05_leave/componenst/Forms/11_WorkInternationalForm.vue b/src/modules/05_leave/componenst/Forms/11_WorkInternationalForm.vue index e77b7fb..cce869e 100644 --- a/src/modules/05_leave/componenst/Forms/11_WorkInternationalForm.vue +++ b/src/modules/05_leave/componenst/Forms/11_WorkInternationalForm.vue @@ -126,6 +126,7 @@ function onSubmit() { class="col-12 col-sm-12" ref="leaveNoRef" hide-bottom-space + bg-color="white" for="leaveNoRef" dense outlined @@ -160,6 +161,7 @@ function onSubmit() { ref="startLeaveDateRef" for="startLeaveDateRef" hide-bottom-space + bg-color="white" :readonly="!edit" class="full-width datepicker" :model-value="formData.startLeaveDate != null ? date2Thai(formData.startLeaveDate) : null" @@ -199,6 +201,7 @@ function onSubmit() { ref="endLeaveDateRef" for="endLeaveDateRef" hide-bottom-space + bg-color="white" :readonly="!formData.startLeaveDate" class="full-width datepicker" :model-value="formData.endLeaveDate != null ? date2Thai(formData.endLeaveDate) : null" @@ -229,6 +232,7 @@ function onSubmit() { type="textarea" class="col-12 col-md-12 col-sm-12" dense + bg-color="white" outlined ref="leaveDetailRef" for="leaveDetailRef" @@ -237,7 +241,7 @@ function onSubmit() { :readonly="!edit" /> - + diff --git a/src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue b/src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue index c88011c..6bff458 100644 --- a/src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue +++ b/src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue @@ -185,6 +185,7 @@ watch(formData.followHistoryEnd, newVal => { for="leaveNoRef" dense hide-bottom-space + bg-color="white" outlined v-model="formData.leaveNo" label="เขียนที่" @@ -216,6 +217,7 @@ watch(formData.followHistoryEnd, newVal => { ref="startLeaveDateRef" for="startLeaveDateRef" hide-bottom-space + bg-color="white" :readonly="!edit" class="full-width datepicker" :model-value="formData.startLeaveDate != null ? date2Thai(formData.startLeaveDate) : null" @@ -256,6 +258,7 @@ watch(formData.followHistoryEnd, newVal => { ref="endLeaveDateRef" for="endLeaveDateRef" hide-bottom-space + bg-color="white" :readonly="!formData.startLeaveDate" class="full-width datepicker" :model-value="formData.endLeaveDate != null ? date2Thai(formData.endLeaveDate) : null" @@ -268,12 +271,34 @@ watch(formData.followHistoryEnd, newVal => { - +
- +
- +
@@ -283,6 +308,7 @@ watch(formData.followHistoryEnd, newVal => { ref="spouseNameRef" for="spouseNameRef" dense + bg-color="white" outlined v-model="formData.spouseName" label="ชื่อคู่สมรส" @@ -298,6 +324,7 @@ watch(formData.followHistoryEnd, newVal => { for="spousePositionRef" dense outlined + bg-color="white" v-model="formData.spousePosition" label="ตำแหน่งคู่สมรส" :readonly="!edit" @@ -312,6 +339,7 @@ watch(formData.followHistoryEnd, newVal => { dense hide-bottom-space outlined + bg-color="white" v-model="formData.spouseLevel" label="ระดับคู่สมรส" :readonly="!edit" @@ -326,6 +354,7 @@ watch(formData.followHistoryEnd, newVal => { hide-bottom-space dense outlined + bg-color="white" v-model="formData.dutyCountry" label="ไปปฏิบัติราชการ ณ ประเทศ" :readonly="!edit" @@ -359,6 +388,7 @@ watch(formData.followHistoryEnd, newVal => { for="followHistoryStartRef" hide-bottom-space :readonly="isReadOnly" + bg-color="white" class="full-width datepicker" :model-value="formData.followHistoryStart != null ? date2Thai(formData.followHistoryStart) : null" :label="`${'ตั้งแต่วันที่'}`" @@ -395,6 +425,7 @@ watch(formData.followHistoryEnd, newVal => { ref="followHistoryEndRef" for="followHistoryEndRef" hide-bottom-space + bg-color="white" :readonly="isReadOnly" class="full-width datepicker" :model-value="formData.followHistoryEnd != null ? date2Thai(formData.followHistoryEnd) : null" @@ -412,6 +443,7 @@ watch(formData.followHistoryEnd, newVal => { dense outlined hide-bottom-space + bg-color="white" ref="followHistoryCountryRef" for="followHistoryCountryRef" v-model="formData.followHistoryCountry" @@ -425,6 +457,7 @@ watch(formData.followHistoryEnd, newVal => { outlined :readonly="isReadOnly" hide-bottom-space + bg-color="white" ref="followHistoryTimeRef" for="followHistoryTimeRef" v-model="formData.followHistoryTime" @@ -436,6 +469,7 @@ watch(formData.followHistoryEnd, newVal => { type="textarea" class="col-12 col-md-12 col-sm-12" dense + bg-color="white" outlined ref="leaveDetailRef" for="leaveDetailRef" @@ -444,7 +478,7 @@ watch(formData.followHistoryEnd, newVal => { :readonly="!edit" /> - +