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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2025-01-21 17:26:14 +07:00
commit 80e7d58b5d
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/11_discipline/components/4_Result/Form.vue
View file

@ -271,6 +271,7 @@ watch(
}
);
</script>
<template>
<div class="row col-12 bg-white">
<div v-if="isSave" class="col-12">
@ -430,7 +431,7 @@ watch(
{{
props.row.salary
? props.row.salary.toLocaleString()
: ""
: "-"
}}
</div>
<div v-else-if="col.name === 'profileType'">
@ -441,7 +442,7 @@ watch(
}}
</div>
<div v-else>
{{ col.value }}
{{ col.value ?? '-'}}
</div>
</q-td>
</q-tr>

2
src/modules/11_discipline/store/Main.ts
View file

@ -108,7 +108,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return val.toLocaleString();
return val ? val.toLocaleString() : '-';
},
},
{

10
src/modules/13_salary/components/05_salaryListsEmployee/DialogProperties.vue
View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { ref, watch } from "vue";
import { ref, watch } from "vue";
import { useQuasar } from "quasar";
import { useCounterMixin } from "@/stores/mixin";
@ -83,10 +83,10 @@ function onSubmit() {
watch(
() => modal.value,
() => {
isPunish.value = props.isPunish;
isSuspension.value = props.isSuspension;
isAbsent.value = props.isAbsent;
isLeave.value = props.isLeave;
isPunish.value = props.isPunish ? props.isPunish : false;
isSuspension.value = props.isSuspension ? props.isSuspension : false;
isAbsent.value = props.isAbsent ? props.isAbsent : false;
isLeave.value = props.isLeave ? props.isLeave : false;
}
);
</script>