diff --git a/src/views/modules/base/residentManagement/oldPeople/addForm.vue b/src/views/modules/base/residentManagement/oldPeople/addForm.vue index fc4ba5790..66cc060fc 100644 --- a/src/views/modules/base/residentManagement/oldPeople/addForm.vue +++ b/src/views/modules/base/residentManagement/oldPeople/addForm.vue @@ -447,23 +447,23 @@ export default { } }, checkRetirementAmountNumberInput() { - if (isNaN(this.formData.retirementAmount)) { + if (this.formData.retirementAmount === "" || this.formData.retirementAmount === null) { + this.formData.retirementAmount = ""; + } else if (isNaN(this.formData.retirementAmount)) { this.$message.error("请输入数字"); - this.formData.retirementAmount = null; + this.formData.retirementAmount = ""; } else { - this.formData.retirementAmount = parseFloat( - this.formData.retirementAmount - ); + this.formData.retirementAmount = parseFloat(this.formData.retirementAmount); } }, checkOldSubsidyInput() { - if (isNaN(this.formData.oldSubsidy)) { + if (this.formData.oldSubsidy === "" || this.formData.oldSubsidy === null) { + this.formData.oldSubsidy = ""; + } else if (isNaN(this.formData.oldSubsidy)) { this.$message.error("请输入数字"); - this.formData.oldSubsidy = null; + this.formData.oldSubsidy = ""; } else { - this.formData.oldSubsidy = parseFloat( - this.formData.oldSubsidy - ); + this.formData.oldSubsidy = parseFloat(this.formData.oldSubsidy); } }, monthIncomeNumberInput() { diff --git a/src/views/modules/base/residentManagement/resiDisability/addForm.vue b/src/views/modules/base/residentManagement/resiDisability/addForm.vue index 57cdf5d27..de1926e69 100644 --- a/src/views/modules/base/residentManagement/resiDisability/addForm.vue +++ b/src/views/modules/base/residentManagement/resiDisability/addForm.vue @@ -354,17 +354,20 @@ export default { } }, checkNumberInput() { - if (isNaN(this.formData.retirementAmount)) { + if (this.formData.retirementAmount === "" || this.formData.retirementAmount === null) { + this.formData.retirementAmount = ""; + } else if (isNaN(this.formData.retirementAmount)) { this.$message.error("请输入数字"); this.formData.retirementAmount = ""; } else { - this.formData.retirementAmount = parseFloat( - this.formData.retirementAmount - ); + this.formData.retirementAmount = parseFloat(this.formData.retirementAmount); } + }, monthIncomeNumberInput() { - if (isNaN(this.formData.monthIncome)) { + if (this.formData.monthIncome === "" || this.formData.monthIncome === null) { + this.formData.monthIncome = ""; + } else if (isNaN(this.formData.monthIncome)) { this.$message.error("请输入数字"); this.formData.monthIncome = ""; } else { diff --git a/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue b/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue index bb9328cba..8a4d9c603 100644 --- a/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue +++ b/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue @@ -179,7 +179,8 @@ {{ formData.retirementAmount || "--" }} - + + @@ -190,7 +191,8 @@ {{ formData.monthIncome || "--" }} - + + @@ -425,7 +427,26 @@ export default { this.resetData(); this.$emit("handleClose"); }, - + // checkRetirementAmountNumberInput() { + // if (this.formData.retirementAmount === "" || this.formData.retirementAmount === null) { + // this.formData.retirementAmount = ""; + // } else if (isNaN(this.formData.retirementAmount)) { + // this.$message.error("请输入数字"); + // this.formData.retirementAmount = ""; + // } else { + // this.formData.retirementAmount = parseFloat(this.formData.retirementAmount); + // } + // }, + // checkmonthIncomeNumberInput() { + // if (this.formData.monthIncome === "" || this.formData.monthIncome === null) { + // this.formData.monthIncome = ""; + // } else if (isNaN(this.formData.monthIncome)) { + // this.$message.error("请输入数字"); + // this.formData.monthIncome = ""; + // } else { + // this.formData.monthIncome = parseFloat(this.formData.monthIncome); + // } + // }, resetData() { this.formData = {}; },