hrms-bangkok/hrms-user
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

แก้ type

Browse source
This commit is contained in:
setthawutttty 2025-04-30 17:57:47 +07:00
parent 677c6b7bc7
commit 9af702f459
13 changed files with 60 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/05_leave/components/DialogDetail.vue
View file

@ -310,12 +310,13 @@ function checkLeaveType(leaveTypeId: string) {
checkForm.value = "FormCheckSelect";
} else if (
type === "LV-008" &&
formData.leaveSubTypeName === "ลาไปศึกษาต่อ"
formData.leaveSubTypeName === "ศึกษาต่อ"
) {
checkForm.value = "FormStudy";
} else if (
type === "LV-008" &&
formData.leaveSubTypeName === "ลาฝึกอบรม/ปฎิบัติการวิจัย/ดูงาน"
(type === "LV-008" && formData.leaveSubTypeName === "ฝึกอบรม") ||
(type === "LV-008" && formData.leaveSubTypeName === "ปฎิบัติการวิจัย") ||
(type === "LV-008" && formData.leaveSubTypeName === "ดูงาน")
) {
checkForm.value = "FormLeaveToTraining";
} else if (type === "LV-009") {

4
src/modules/05_leave/components/FormLeave/07_HajjForm.vue
View file

@ -161,8 +161,8 @@ async function fetchCheck() {
isLeave.value = data.isLeave;
formDataHaji.leaveTotal = data.totalDate;
leaveText.value = calculateDurationYmd(
formDataHaji.leaveStartDate,
formDataHaji.leaveEndDate
convertDateToAPI(formDataHaji.leaveStartDate),
convertDateToAPI(formDataHaji.leaveEndDate)
);
reasonLeave.value = data.message
? data.message

4
src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
View file

@ -184,8 +184,8 @@ async function fetchCheck() {
isLeave.value = data.isLeave;
formDataMilitary.leaveTotal = data.totalDate;
leaveText.value = calculateDurationYmd(
formDataMilitary.leaveStartDate,
formDataMilitary.leaveEndDate
convertDateToAPI(formDataMilitary.leaveStartDate),
convertDateToAPI(formDataMilitary.leaveEndDate)
);
reasonLeave.value = data.message
? data.message

4
src/modules/05_leave/components/FormLeave/09_StudyForm.vue
View file

@ -199,8 +199,8 @@ async function fetchCheck() {
isLeave.value = data.isLeave;
formDataStudy.leaveTotal = data.totalDate;
leaveText.value = calculateDurationYmd(
formDataStudy.leaveStartDate,
formDataStudy.leaveEndDate
convertDateToAPI(formDataStudy.leaveStartDate),
convertDateToAPI(formDataStudy.leaveEndDate)
);
reasonLeave.value = data.message
? data.message

4
src/modules/05_leave/components/FormLeave/10_TrainForm.vue
View file

@ -184,8 +184,8 @@ async function fetchCheck() {
isLeave.value = data.isLeave;
formDataTrain.leaveTotal = data.totalDate;
leaveText.value = calculateDurationYmd(
formDataTrain.leaveStartDate,
formDataTrain.leaveEndDate
convertDateToAPI(formDataTrain.leaveStartDate),
convertDateToAPI(formDataTrain.leaveEndDate)
);
reasonLeave.value = data.message
? data.message

4
src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
View file

@ -190,8 +190,8 @@ async function fetchCheck() {
formDataWorkInternational.leaveTotal = data.totalDate;
leaveText.value = calculateDurationYmd(
formDataWorkInternational.leaveStartDate,
formDataWorkInternational.leaveEndDate
convertDateToAPI(formDataWorkInternational.leaveStartDate),
convertDateToAPI(formDataWorkInternational.leaveEndDate)
);
reasonLeave.value = data.message
? data.message

6
src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
View file

@ -220,10 +220,10 @@ async function fetchCheck() {
.then((res: any) => {
const data = res.data.result;
isLeave.value = data.isLeave;
formDataFollowSpouse.leaveTotalDay = data.totalDate;
formDataFollowSpouse.leaveTotal = data.totalDate;
leaveText.value = calculateDurationYmd(
formDataFollowSpouse.leaveStartDate,
formDataFollowSpouse.leaveEndDate
convertDateToAPI(formDataFollowSpouse.leaveStartDate),
convertDateToAPI(formDataFollowSpouse.leaveEndDate)
);
reasonLeave.value = data.message
? data.message

4
src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
View file

@ -148,8 +148,8 @@ async function fetchCheck() {
isLeave.value = data.isLeave;
formDataRehabilitation.leaveTotal = data.totalDate;
leaveText.value = calculateDurationYmd(
formDataRehabilitation.leaveStartDate,
formDataRehabilitation.leaveEndDate
convertDateToAPI(formDataRehabilitation.leaveStartDate),
convertDateToAPI(formDataRehabilitation.leaveEndDate)
);
reasonLeave.value = data.message

2
src/modules/05_leave/components/formDetail/09_StudyForm.vue
View file

@ -22,7 +22,7 @@ const props = defineProps({
</div>
<div class="row">
<div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
<div class="col-xs-12 col-md-6">ลาไปศึกษาต่อ</div>
<div class="col-xs-12 col-md-6">ศึกษาต่อ</div>
</div>
<div class="row">
<div class="col-xs-12 col-md-6 text-grey-8">เขียนที่</div>

34
src/modules/05_leave/components/formDetail/10_TrainForm.vue
View file

@ -1,8 +1,8 @@
<script setup lang="ts">
import { useLeaveStore } from '@/modules/05_leave/store'
import { useLeaveStore } from "@/modules/05_leave/store";
const store = useLeaveStore()
const { converstType } = store
const store = useLeaveStore();
const { converstType } = store;
/**
* รับ prop จาก component
*/
@ -21,7 +21,7 @@ const props = defineProps({
</div>
<div class="row">
<div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
<div class="col-xs-12 col-md-6">ลาฝึกอบรม/ปฎิบัติการวิจัย/ดูงาน</div>
<div class="col-xs-12 col-md-6">{{ props.data.leaveSubTypeName }}</div>
</div>
<div class="row">
<div class="col-xs-12 col-md-6 text-grey-8">เขียนที่</div>
@ -29,11 +29,33 @@ const props = defineProps({
</div>
<div class="row">
<div class="col-xs-12 col-md-6 text-grey-8">ลาตั้งแต่วันที่</div>
<div class="col-xs-12 col-md-6">{{ props.data.leaveDateStart }} {{ `${props.data.leaveRange && props.data.leaveRange !== 'ALL' ? `(${converstType(props.data.leaveRange)})`:''}` }}</div>
<div class="col-xs-12 col-md-6">
{{ props.data.leaveDateStart }}
{{
`${
props.data.leaveRange && props.data.leaveRange !== "ALL"
? `(${converstType(props.data.leaveRange)})`
: ""
}`
}}
</div>
</div>
<div class="row">
<div class="col-xs-12 col-md-6 text-grey-8">ลาถึงวันที่</div>
<div class="col-xs-12 col-md-6">{{ props.data.leaveDateEnd }} {{ `${props.data.leaveDateStart !== props.data.leaveDateEnd ? `${props.data.leaveRangeEnd && props.data.leaveRangeEnd !== 'ALL' ? `(${converstType(props.data.leaveRangeEnd)})`:''}` :''}` }}</div>
<div class="col-xs-12 col-md-6">
{{ props.data.leaveDateEnd }}
{{
`${
props.data.leaveDateStart !== props.data.leaveDateEnd
? `${
props.data.leaveRangeEnd && props.data.leaveRangeEnd !== "ALL"
? `(${converstType(props.data.leaveRangeEnd)})`
: ""
}`
: ""
}`
}}
</div>
</div>
<div class="row">
<div class="col-xs-12 col-md-6 text-grey-8">จำนวนวันที่ลา</div>

6
src/modules/05_leave/store.ts
View file

@ -184,8 +184,10 @@ export const useLeaveStore = defineStore("Leave", () => {
}
/** รายการประเภทการลาของ ลาไปศึกษา ฝึกอบรม ปฎิบัติการวิจัย หรือดูงาน*/
const optionsSpecific = ref<string[]>([
"ลาไปศึกษาต่อ",
"ลาฝึกอบรม/ปฎิบัติการวิจัย/ดูงาน",
"ศึกษาต่อ",
"ฝึกอบรม",
"ปฎิบัติการวิจัย",
"ดูงาน",
]);
/** รายการประเภทการลาของ ลาอุปสมบทหรือลาประกอบพิธีฮัจญ์*/

7
src/modules/05_leave/views/AddPage.vue
View file

@ -235,14 +235,15 @@ onMounted(async () => {
:on-submit="onSubmit"
/>
<StudyForm
v-if="model === 'LV-008' && modelSpecific === 'ลาไปศึกษาต่อ'"
v-if="model === 'LV-008' && modelSpecific === 'ศึกษาต่อ'"
style="width: 100%"
:on-submit="onSubmit"
/>
<TrainForm
v-if="
model === 'LV-008' &&
modelSpecific == 'ลาฝึกอบรม/ปฎิบัติการวิจัย/ดูงาน'
(model === 'LV-008' && modelSpecific == 'ฝึกอบรม') ||
(model === 'LV-008' && modelSpecific == 'ปฎิบัติการวิจัย') ||
(model === 'LV-008' && modelSpecific == 'ดูงาน')
"
:on-submit="onSubmit"
/>

7
src/modules/05_leave/views/EditPage.vue
View file

@ -465,7 +465,7 @@ onMounted(async () => {
:click-delete="clickDelete"
/>
<StudyForm
v-if="model === 'LV-008' && modelSpecific === 'ลาไปศึกษาต่อ'"
v-if="model === 'LV-008' && modelSpecific === 'ศึกษาต่อ'"
style="width: 100%"
:data="formData"
:on-submit="onSubmit"
@ -474,8 +474,9 @@ onMounted(async () => {
/>
<TrainForm
v-if="
model === 'LV-008' &&
modelSpecific == 'ลาฝึกอบรม/ปฎิบัติการวิจัย/ดูงาน'
(model === 'LV-008' && modelSpecific == 'ฝึกอบรม') ||
(model === 'LV-008' && modelSpecific == 'ปฎิบัติการวิจัย') ||
(model === 'LV-008' && modelSpecific == 'ดูงาน')
"
:data="formData"
:on-submit="onSubmit"