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

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-07-10 16:21:05 +07:00
commit 57c8cf89a0
2 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -312,15 +312,16 @@ const fetchSalary = async (personalId: string) => {
const putSalary = async () => { const putSalary = async () => {
dialogConfirm($q, async () => { dialogConfirm($q, async () => {
showLoader(); showLoader();
if (modalData.value.salaryAmount === null) { modalData.value.salaryAmount
modalData.value.salaryAmount = 0; ? modalData.value.salaryAmount
} : (modalData.value.salaryAmount = 0);
if (modalData.value.positionSalaryAmount === null) { modalData.value.positionSalaryAmount
modalData.value.positionSalaryAmount = 0; ? modalData.value.positionSalaryAmount
} : (modalData.value.positionSalaryAmount = 0);
if (modalData.value.monthSalaryAmount === null) { modalData.value.monthSalaryAmount
modalData.value.monthSalaryAmount = 0; ? modalData.value.monthSalaryAmount
} : (modalData.value.monthSalaryAmount = 0);
await http await http
.put(config.API.salaryOrder(personalId.value), modalData.value) .put(config.API.salaryOrder(personalId.value), modalData.value)
.then(async () => { .then(async () => {

27
src/modules/13_salary/components/Command/step02.vue
View file

@ -308,15 +308,24 @@ const fetchSalary = async (personalId: string) => {
const putSalary = async (salary: any) => { const putSalary = async (salary: any) => {
dialogConfirm($q, async () => { dialogConfirm($q, async () => {
showLoader(); showLoader();
if (modalData.value.salaryAmount === null) { modalData.value.salaryAmount
modalData.value.salaryAmount = 0; ? modalData.value.salaryAmount
} : (modalData.value.salaryAmount = 0);
if (modalData.value.positionSalaryAmount === null) { modalData.value.positionSalaryAmount
modalData.value.positionSalaryAmount = 0; ? modalData.value.positionSalaryAmount
} : (modalData.value.positionSalaryAmount = 0);
if (modalData.value.monthSalaryAmount === null) { modalData.value.monthSalaryAmount
modalData.value.monthSalaryAmount = 0; ? modalData.value.monthSalaryAmount
} : (modalData.value.monthSalaryAmount = 0);
// if (modalData.value.salaryAmount === null) {
// modalData.value.salaryAmount = 0;
// }
// if (modalData.value.positionSalaryAmount === null) {
// modalData.value.positionSalaryAmount = 0;
// }
// if (modalData.value.monthSalaryAmount === null) {
// modalData.value.monthSalaryAmount = 0;
// }
await http await http
.put(config.API.salaryOrder(personalId.value), modalData.value) .put(config.API.salaryOrder(personalId.value), modalData.value)
.then(async () => { .then(async () => {