From f5d71abaab063864b64d9db3a4e4234b872e76b4 Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Thu, 9 Nov 2023 10:58:56 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=20formattSalary?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/05_leave/componenst/Forms/01_SickForm.vue  |  2 +-
 .../05_leave/componenst/Forms/04_HelpWifeBirthForm.vue |  2 +-
 .../05_leave/componenst/Forms/05_VacationForm.vue      |  2 +-
 .../05_leave/componenst/Forms/12_FollowSpouseForm.vue  | 10 +++++-----
 .../05_leave/interface/request/FollowSpouseForm.ts     |  2 +-
 5 files changed, 9 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 ee082ab..8576621 100644
--- a/src/modules/05_leave/componenst/Forms/01_SickForm.vue
+++ b/src/modules/05_leave/componenst/Forms/01_SickForm.vue
@@ -257,7 +257,7 @@ function onValidate() {
 								:readonly="!edit"
 							/>
 
-							<q-file v-model="formData.file" @added="fileUploadDoc" dense label="เอกสารประกอบ" outlined use-chips multiple class="q-pl-sm col-6">
+							<q-file v-model="formData.file" @added="fileUploadDoc" dense label="เอกสารประกอบ" outlined use-chips multiple class="q-pl-sm col-12">
 								<template v-slot:prepend>
 									<q-icon name="attach_file" color="primary" />
 								</template>
diff --git a/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue b/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue
index e0ab2ca..3fec118 100644
--- a/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue
+++ b/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue
@@ -307,7 +307,7 @@ function onValidate() {
 							:readonly="!edit"
 						/>
 
-						<q-file v-model="formData.file" @added="fileUploadDoc" dense label="เอกสารประกอบ" outlined use-chips multiple class="q-pl-sm col-6">
+						<q-file v-model="formData.file" @added="fileUploadDoc" dense label="เอกสารประกอบ" outlined use-chips multiple class="q-pl-sm col-12">
 							<template v-slot:prepend>
 								<q-icon name="attach_file" color="primary" />
 							</template>
diff --git a/src/modules/05_leave/componenst/Forms/05_VacationForm.vue b/src/modules/05_leave/componenst/Forms/05_VacationForm.vue
index 4b8fe57..e220a2a 100644
--- a/src/modules/05_leave/componenst/Forms/05_VacationForm.vue
+++ b/src/modules/05_leave/componenst/Forms/05_VacationForm.vue
@@ -272,7 +272,7 @@ function onValidate() {
 							:readonly="!edit"
 						/>
 
-						<q-file v-model="formData.file" @added="fileUploadDoc" dense label="เอกสารประกอบ" outlined use-chips multiple class="q-pl-sm col-6">
+						<q-file v-model="formData.file" @added="fileUploadDoc" dense label="เอกสารประกอบ" outlined use-chips multiple class="q-pl-sm col-12">
 							<template v-slot:prepend>
 								<q-icon name="attach_file" color="primary" />
 							</template>
diff --git a/src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue b/src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue
index 22d6e85..185f6f6 100644
--- a/src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/componenst/Forms/12_FollowSpouseForm.vue
@@ -4,7 +4,7 @@ import type { FormData, FormRef } from "@/modules/05_leave/interface/request/Fol
 import { useCounterMixin } from "@/stores/mixin"
 
 const mixin = useCounterMixin()
-const { date2Thai } = mixin
+const { date2Thai, arabicNumberToText } = mixin
 const edit = ref<boolean>(true)
 const props = defineProps({
 	data: {
@@ -22,7 +22,7 @@ const formData = reactive<FormData>({
 	startLeaveDate: null,
 	endLeaveDate: null,
 	leaveTotal: "", //จำนวนวันลา
-	salary: "", //เงินเดือนปัจจุบัน
+	salary: 0, //เงินเดือนปัจจุบัน
 	spouseName: "", //ชื่อคู่สมรส
 	spousePosition: "", //ตำแหน่งคู่สมรส
 	spouseLevel: "", //ระดับคู่สมรส
@@ -34,7 +34,7 @@ const formData = reactive<FormData>({
 	leaveDetail: "", //รายละเอียดการลา
 	file: [], //เอกสารปะกอบ
 })
-
+const formattSalary = arabicNumberToText(formData.salary)
 const leaveNoRef = ref<object | null>(null)
 const startLeaveDateRef = ref<object | null>(null)
 const endLeaveDateRef = ref<object | null>(null)
@@ -148,7 +148,7 @@ function onValidate() {
 						/>
 
 						<div class="col-md-4 col-sm-12">
-							<q-input class="col-12 col-sm-12" ref="salaryRef" for="salaryRef" dense outlined v-model="formData.salary" label="เงินเดือนปัจจุบัน" readonly />
+							<q-input class="col-12 col-sm-12" ref="salaryRef" for="salaryRef" dense outlined v-model="formattSalary" label="เงินเดือนปัจจุบัน" readonly />
 						</div>
 
 						<datepicker
@@ -379,7 +379,7 @@ function onValidate() {
 							:readonly="!edit"
 						/>
 
-						<q-file v-model="formData.file" @added="fileUploadDoc" dense label="เอกสารประกอบ" outlined use-chips multiple class="q-pl-sm col-6">
+						<q-file v-model="formData.file" @added="fileUploadDoc" dense label="เอกสารประกอบ" outlined use-chips multiple class="q-pl-sm col-12">
 							<template v-slot:prepend>
 								<q-icon name="attach_file" color="primary" />
 							</template>
diff --git a/src/modules/05_leave/interface/request/FollowSpouseForm.ts b/src/modules/05_leave/interface/request/FollowSpouseForm.ts
index 7da04b5..403a597 100644
--- a/src/modules/05_leave/interface/request/FollowSpouseForm.ts
+++ b/src/modules/05_leave/interface/request/FollowSpouseForm.ts
@@ -3,7 +3,7 @@ interface FormData {
 	startLeaveDate: Date | null //*วัน เดือน ปีเริ่มต้นลา
 	endLeaveDate: Date | null //*วัน เดือน ปีสิ้นสุดลา
 	leaveTotal: string //จำนวนวันลา
-	salary: string //เงินเดือนปัจจุบัน
+	salary: number //เงินเดือนปัจจุบัน
 	spouseName: string //ชื่อคู่สมรส
 	spousePosition: string //ตำแหน่งคู่สมรส
 	spouseLevel: string //ระดับคู่สมรส