From 3b7826d6660daf27c5492846b906ecb9ff4ed24d Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 10 Jul 2024 16:20:51 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3?= =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=20=3D>=20fix=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../10_order/components/step/step02.vue | 19 ++++++------- .../13_salary/components/Command/step02.vue | 27 ++++++++++++------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/modules/10_order/components/step/step02.vue b/src/modules/10_order/components/step/step02.vue index 3a9650eba..6dfd517cd 100644 --- a/src/modules/10_order/components/step/step02.vue +++ b/src/modules/10_order/components/step/step02.vue @@ -312,15 +312,16 @@ const fetchSalary = async (personalId: string) => { const putSalary = async () => { dialogConfirm($q, async () => { showLoader(); - 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; - } + modalData.value.salaryAmount + ? modalData.value.salaryAmount + : (modalData.value.salaryAmount = 0); + modalData.value.positionSalaryAmount + ? modalData.value.positionSalaryAmount + : (modalData.value.positionSalaryAmount = 0); + modalData.value.monthSalaryAmount + ? modalData.value.monthSalaryAmount + : (modalData.value.monthSalaryAmount = 0); + await http .put(config.API.salaryOrder(personalId.value), modalData.value) .then(async () => { diff --git a/src/modules/13_salary/components/Command/step02.vue b/src/modules/13_salary/components/Command/step02.vue index 66ab30c30..065841732 100644 --- a/src/modules/13_salary/components/Command/step02.vue +++ b/src/modules/13_salary/components/Command/step02.vue @@ -308,15 +308,24 @@ const fetchSalary = async (personalId: string) => { const putSalary = async (salary: any) => { dialogConfirm($q, async () => { showLoader(); - 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; - } + modalData.value.salaryAmount + ? modalData.value.salaryAmount + : (modalData.value.salaryAmount = 0); + modalData.value.positionSalaryAmount + ? modalData.value.positionSalaryAmount + : (modalData.value.positionSalaryAmount = 0); + modalData.value.monthSalaryAmount + ? 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 .put(config.API.salaryOrder(personalId.value), modalData.value) .then(async () => {