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

แก้คำ

Browse source 
ปีพ.ศ.
This commit is contained in:
setthawutttty 2024-12-13 16:22:29 +07:00
parent 74b028c68e
commit aaa9292abb
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
View file

@ -758,7 +758,7 @@ onMounted(() => {
props.row.amount props.row.amount
? `${props.row.amount.toLocaleString()}${ ? `${props.row.amount.toLocaleString()}${
props.row.amountSpecial !== 0 && props.row.amountSpecial props.row.amountSpecial !== 0 && props.row.amountSpecial
? `(${props.row.amountSpecial.toLocaleString()})` ? ` (${props.row.amountSpecial.toLocaleString()})`
: "" : ""
}` }`
: "-" : "-"

4
src/modules/11_discipline/components/9_DisciplineReport/Main.vue
View file

@ -248,7 +248,7 @@ onMounted(async () => {
<template> <template>
<div class="toptitle text-dark col-12 row items-center"> <div class="toptitle text-dark col-12 row items-center">
จำนวนและรายชื่อที่กระทำความผิดทางวินัย รายงานวินัยครับเขาให้อิงตามปีปฏิทิน
</div> </div>
<div class="q-pa-sm q-gutter-sm"> <div class="q-pa-sm q-gutter-sm">
@ -367,7 +367,7 @@ onMounted(async () => {
dense dense
outlined outlined
:model-value="Number(year) + 543" :model-value="Number(year) + 543"
:label="`${'ปีงบประมาณ'}`" :label="`${'ปีพ.ศ.'}`"
> >
<template v-slot:prepend> <template v-slot:prepend>
<q-icon <q-icon

2
src/modules/18_command/components/Step/2_ListPersons.vue
View file

@ -454,7 +454,7 @@ onMounted(async () => {
? `${props.row.amount.toLocaleString()}${ ? `${props.row.amount.toLocaleString()}${
props.row.amountSpecial !== 0 && props.row.amountSpecial !== 0 &&
props.row.amountSpecial props.row.amountSpecial
? `(${props.row.amountSpecial.toLocaleString()})` ? ` (${props.row.amountSpecial.toLocaleString()})`
: "" : ""
}` }`
: "-" : "-"

9
src/modules/18_command/components/Step/Dialog2_Salary.vue
View file

@ -139,6 +139,7 @@ watch(
const list = props.selectPersonData; const list = props.selectPersonData;
formData.amount = list.amount; formData.amount = list.amount;
formData.positionSalaryAmount = list.positionSalaryAmount; formData.positionSalaryAmount = list.positionSalaryAmount;
formData.amountSpecial = list.amountSpecial;
formData.monthSalaryAmount = list.mouthSalaryAmount; formData.monthSalaryAmount = list.mouthSalaryAmount;
formData.remarkVertical = list.remarkVertical; formData.remarkVertical = list.remarkVertical;
formData.remarkHorizontal = list.remarkHorizontal; formData.remarkHorizontal = list.remarkHorizontal;
@ -170,7 +171,7 @@ watch(
lazy-rules lazy-rules
hide-bottom-space hide-bottom-space
v-model="formData.amount" v-model="formData.amount"
:class="getClass(!readonly)" :class="getClass(storeDetail.isSalary)"
mask="###,###,###,###,###,###" mask="###,###,###,###,###,###"
reverse-fill-mask reverse-fill-mask
:readonly="!storeDetail.isSalary" :readonly="!storeDetail.isSalary"
@ -188,7 +189,7 @@ watch(
lazy-rules lazy-rules
hide-bottom-space hide-bottom-space
v-model="formData.amountSpecial" v-model="formData.amountSpecial"
:class="getClass(!readonly)" :class="getClass(storeDetail.isSalary)"
:readonly="!storeDetail.isSalary" :readonly="!storeDetail.isSalary"
mask="###,###,###,###,###,###" mask="###,###,###,###,###,###"
reverse-fill-mask reverse-fill-mask
@ -205,7 +206,7 @@ watch(
lazy-rules lazy-rules
hide-bottom-space hide-bottom-space
v-model="formData.positionSalaryAmount" v-model="formData.positionSalaryAmount"
:class="getClass(!readonly)" :class="getClass(storeDetail.isSalary)"
:readonly="!storeDetail.isSalary" :readonly="!storeDetail.isSalary"
mask="###,###,###,###,###,###" mask="###,###,###,###,###,###"
reverse-fill-mask reverse-fill-mask
@ -223,7 +224,7 @@ watch(
lazy-rules lazy-rules
hide-bottom-space hide-bottom-space
v-model="formData.monthSalaryAmount" v-model="formData.monthSalaryAmount"
:class="getClass(!readonly)" :class="getClass(storeDetail.isSalary)"
:readonly="!storeDetail.isSalary" :readonly="!storeDetail.isSalary"
mask="###,###,###,###,###,###" mask="###,###,###,###,###,###"
reverse-fill-mask reverse-fill-mask