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

fix(leave):dislpay field null

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-12-16 16:22:30 +07:00
parent 4c569a1d3f
commit b142dfcc76
2 changed files with 56 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
View file

@ -365,20 +365,24 @@ async function fetchDetailLeave(paramsId: string) {
formData.coupleDayLevelCountry = data.coupleDayLevelCountry
? data.coupleDayLevelCountry
: "-";
formData.coupleDayCountryHistory = data.coupleDayCountryHistory
? data.coupleDayCountryHistory
: "-";
formData.coupleDayTotalHistory = data.coupleDayTotalHistory
? data.coupleDayTotalHistory
: "-";
formData.coupleDayCountryHistory =
data.coupleDayCountryHistory && data.coupleDayCountryHistory !== "null"
? data.coupleDayCountryHistory
: "-";
formData.coupleDayTotalHistory =
data.coupleDayTotalHistory && data.coupleDayTotalHistory !== "null"
? data.coupleDayTotalHistory
: "-";
formData.coupleDayStartDateHistory =
data.coupleDayStartDateHistory &&
date2Thai(data.coupleDayStartDateHistory);
formData.coupleDayEndDateHistory =
data.coupleDayEndDateHistory && date2Thai(data.coupleDayEndDateHistory);
formData.coupleDaySumTotalHistory = data.coupleDaySumTotalHistory
? data.coupleDaySumTotalHistory
: "";
formData.coupleDaySumTotalHistory =
data.coupleDaySumTotalHistory &&
data.coupleDaySumTotalHistory !== "null"
? data.coupleDaySumTotalHistory
: "";
formData.approveStep = data.approveStep ? data.approveStep : "-";
formData.dear = data.dear ? data.dear : "-";
formData.profileType = data.profileType;

53
src/modules/09_leave/components/05_Leave/formDetail/formSpouse.vue
View file

@ -1,10 +1,10 @@
<script setup lang="ts">
/** importStore */
import { useCounterMixin } from "@/stores/mixin";
import { useLeavelistDataStore } from '@/modules/09_leave/stores/LeaveStore';
import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
const store = useLeavelistDataStore()
const { converstType } = store
const store = useLeavelistDataStore();
const { converstType } = store;
const mixin = useCounterMixin();
const { calculateDurationYmd } = mixin;
@ -51,15 +51,40 @@ function convertDateToEng(dataThia: string) {
</div>
<div class="row">
<div class="col text-grey-8">ลาตั้งแต่วันที่</div>
<div class="col">{{ props.data.leaveDateStart }} {{ `${props.data.leaveRange && props.data.leaveRange !== 'ALL' ? `(${converstType(props.data.leaveRange)})`:''}` }}</div>
<div class="col">
{{ props.data.leaveDateStart }}
{{
`${
props.data.leaveRange && props.data.leaveRange !== "ALL"
? `(${converstType(props.data.leaveRange)})`
: ""
}`
}}
</div>
</div>
<div class="row">
<div class="col text-grey-8">ลาถึงวันที่</div>
<div class="col">{{ props.data.leaveDateEnd }} {{ `${props.data.leaveDateStart !== props.data.leaveDateEnd ? `${props.data.leaveRangeEnd && props.data.leaveRangeEnd !== 'ALL' ? `(${converstType(props.data.leaveRangeEnd)})`:''}` :''}` }}</div>
<div class="col">
{{ 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 text-grey-8">จำนวนวันที่ลา</div>
<div class="col">{{ props.data.leaveTotal ? props.data.leaveTotal + " วัน" : "-" }}</div>
<div class="col">
{{ props.data.leaveTotal ? props.data.leaveTotal + " วัน" : "-" }}
</div>
</div>
<div class="row">
<div class="col text-grey-8">วันเดือนปีเกิด</div>
@ -80,7 +105,9 @@ function convertDateToEng(dataThia: string) {
<div class="row">
<div class="col text-grey-8">เงินเดือนปัจจุบัน</div>
<div class="col">
{{ props.data.leaveSalary.toLocaleString() }} ({{ props.data.leaveSalaryText }})
{{ props.data.leaveSalary.toLocaleString() }} ({{
props.data.leaveSalaryText
}})
</div>
</div>
<div class="row">
@ -111,9 +138,15 @@ function convertDateToEng(dataThia: string) {
<div class="col">
<div>{{ props.data.coupleDayCountryHistory }}</div>
<div>{{ props.data.coupleDayTotalHistory }}</div>
<div>{{ props.data.coupleDayStartDateHistory }}</div>
<div>{{ props.data.coupleDayEndDateHistory }}</div>
<div>{{ props.data.coupleDaySumTotalHistory ? props.data.coupleDaySumTotalHistory + ` วัน`:'-'}}</div>
<div>{{ props.data.coupleDayStartDateHistory || "-" }}</div>
<div>{{ props.data.coupleDayEndDateHistory || "-" }}</div>
<div>
{{
props.data.coupleDaySumTotalHistory
? props.data.coupleDaySumTotalHistory + ` วัน`
: "-"
}}
</div>
</div>
</div>
<div class="row">