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

fix rules เงินเดือน

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-05-23 11:34:22 +07:00
parent 9912c0c068
commit 409292b699
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/modules/04_registryPerson/views/edit/components/DialogForm.vue
View file

@ -268,7 +268,7 @@ async function updateSelectType(val: string, status: boolean = false) {
}));
formData.positionLevel = !status ? "" : formData.positionLevel;
}
}
// else {
// store.posLevelData = [];
// // formData.positionLevel = "";
@ -369,16 +369,18 @@ function onSubmit() {
type: empType.value?.toLocaleUpperCase(),
commandDateAffect: convertDateToAPI(formData.commandDateAffect),
commandDateSign: convertDateToAPI(formData.commandDateSign),
amount: Number(String(formData.amount)?.replace(/,/g, "")),
amountSpecial: Number(
String(formData.amountSpecial)?.replace(/,/g, "")
),
positionSalaryAmount: Number(
String(formData.positionSalaryAmount)?.replace(/,/g, "")
),
mouthSalaryAmount: Number(
String(formData.mouthSalaryAmount)?.replace(/,/g, "")
),
amount: formData.amount
? Number(String(formData.amount)?.replace(/,/g, ""))
: null,
amountSpecial: formData.amountSpecial
? Number(String(formData.amountSpecial)?.replace(/,/g, ""))
: null,
positionSalaryAmount: formData.positionSalaryAmount
? Number(String(formData.positionSalaryAmount)?.replace(/,/g, ""))
: null,
mouthSalaryAmount: formData.mouthSalaryAmount
? Number(String(formData.mouthSalaryAmount)?.replace(/,/g, ""))
: null,
})
.then(async () => {
await props.fetchData?.();

1
src/modules/04_registryPerson/views/edit/components/FormPosition.vue
View file

@ -588,7 +588,6 @@ function classInput(val: boolean) {
label="เงินเดือน"
mask="###,###,###,###"
reverse-fill-mask
:rules="!isReadonly ? [(val:string) => !!val || `${'กรุณากรอกเงินเดือน'}`] :[]"
lazy-rules
hide-bottom-space
/>

4
src/modules/04_registryPerson/views/edit/components/Table.vue
View file

@ -136,7 +136,7 @@ const baseColumns = ref<QTableColumn[]>([
field: "mouthSalaryAmount",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (v) => Number(v).toLocaleString(),
format: (v) => (v ? Number(v).toLocaleString() : "-"),
},
{
name: "positionSalaryAmount",
@ -146,7 +146,7 @@ const baseColumns = ref<QTableColumn[]>([
field: "positionSalaryAmount",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (v) => Number(v).toLocaleString(),
format: (v) => (v ? Number(v).toLocaleString() : "-"),
},
{
name: "organization",