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:
Warunee Tamkoo 2023-09-05 09:28:15 +07:00
parent d478de515b
commit c8b24028a1
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/modules/10_order/components/step/step02.vue
View file

@ -41,9 +41,9 @@ const {
const route = useRoute(); const route = useRoute();
const $q = useQuasar(); const $q = useQuasar();
const modalData = ref<any>({ const modalData = ref<any>({
salaryAmount: 0, salaryAmount: null,
positionSalaryAmount: 0, positionSalaryAmount: null,
monthSalaryAmount: 0, monthSalaryAmount: null,
}); });
const myForm = ref<QForm | null>(null); const myForm = ref<QForm | null>(null);
const myFormAdd = ref<QForm | null>(null); const myFormAdd = ref<QForm | null>(null);
@ -129,11 +129,9 @@ const getData = async (id: string) => {
selectStatus: r.selectStatus !== null ? r.selectStatus : false, selectStatus: r.selectStatus !== null ? r.selectStatus : false,
sequence: r.sequence !== null ? r.sequence : 0, sequence: r.sequence !== null ? r.sequence : 0,
refRecordId: r.refRecordId, refRecordId: r.refRecordId,
salaryAmount: r.salaryAmount !== 0 ? r.salaryAmount : null, salaryAmount: r.salaryAmount,
positionSalaryAmount: positionSalaryAmount: r.positionSalaryAmount,
r.positionSalaryAmount !== 0 ? r.positionSalaryAmount : null, monthSalaryAmount: r.monthSalaryAmount,
monthSalaryAmount:
r.monthSalaryAmount !== 0 ? r.monthSalaryAmount : null,
}); });
}); });
// console.log("list", list); // console.log("list", list);
@ -275,11 +273,9 @@ const fetchSalary = async (personalId: string) => {
console.log(res); console.log(res);
const data = res.data.result; const data = res.data.result;
modalData.value = { modalData.value = {
salaryAmount: data.salaryAmount !== 0 ? data.salaryAmount : null, salaryAmount: data.salaryAmount === 0 && data.positionSalaryAmount === 0 && data.monthSalaryAmount===0 ? null : data.salaryAmount,
positionSalaryAmount: positionSalaryAmount: data.salaryAmount === 0 && data.positionSalaryAmount === 0 && data.monthSalaryAmount===0 ? null : data.positionSalaryAmount,
data.positionSalaryAmount !== 0 ? data.positionSalaryAmount : null, monthSalaryAmount: data.salaryAmount === 0 && data.positionSalaryAmount === 0 && data.monthSalaryAmount===0 ? null : data.monthSalaryAmount,
monthSalaryAmount:
data.monthSalaryAmount !== 0 ? data.monthSalaryAmount : null,
}; };
// console.log("data", modalData.value); // console.log("data", modalData.value);
}) })
@ -409,7 +405,7 @@ const addlist = async (data: Object) => {
const save = async () => { const save = async () => {
// console.log("save===>", rows.value); // console.log("save===>", rows.value);
// console.log(statuscode.value); // console.log(statuscode.value);
const check = rows.value.find((x: any) => x.salaryAmount == null); const check = rows.value.find((x: any) => x.salaryAmount == 0);
if ( if (
(selected.value.length > 0 && !check) || (selected.value.length > 0 && !check) ||
(statuscode.value === true && selected.value.length > 0) (statuscode.value === true && selected.value.length > 0)
@ -547,7 +543,7 @@ const getClass = (val: boolean) => {
</q-td> </q-td>
<q-td auto-width v-if="statuscode !== true"> <q-td auto-width v-if="statuscode !== true">
<q-btn <q-btn
v-if="props.row.salaryAmount === null" v-if="props.row.salaryAmount === 0"
dense dense
size="12px" size="12px"
flat flat
@ -628,7 +624,7 @@ const getClass = (val: boolean) => {
:dense="true" :dense="true"
v-model="modalData.salaryAmount" v-model="modalData.salaryAmount"
:label="`${'เงินเดือน'}`" :label="`${'เงินเดือน'}`"
:rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]" :rules="[(val: any) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
hide-bottom-space hide-bottom-space
/> />
</div> </div>