diff --git a/src/views/modules/base/residentManagement/oldPeople/addForm.vue b/src/views/modules/base/residentManagement/oldPeople/addForm.vue index 089c61ccc..95dae0134 100644 --- a/src/views/modules/base/residentManagement/oldPeople/addForm.vue +++ b/src/views/modules/base/residentManagement/oldPeople/addForm.vue @@ -181,7 +181,7 @@
与户主关系: - {{ formData.disabilityCategoryName || "--" }} + {{ formData.houseHolderRelName || "--" }}
@@ -205,7 +205,18 @@
- + + +
+ 月收入: + {{ formData.monthIncome || "--" }} +
+ + + +
+
@@ -243,7 +254,7 @@
+ @blur="checkRetirementAmountNumberInput">
@@ -253,7 +264,7 @@ + @blur="checkOldSubsidyInput" >
@@ -364,8 +375,9 @@ export default { marriage: "",//婚姻状况 disabilityNum:"", spouseSituation: "",//配偶情况 - retirementAmount: "", - oldSubsidy: "",//高龄补助 + retirementAmount: null, + oldSubsidy: null,//高龄补助 + monthIncome:null, elderlyFlag: "",//有无赡养老人 elderlyRelation: "",//与赡养老人关系 dependantMobile: "",//赡养人电话 @@ -436,16 +448,26 @@ export default { this.$message.error(msg); } }, - checkNumberInput() { + checkRetirementAmountNumberInput() { if (isNaN(this.formData.retirementAmount)) { this.$message.error("请输入数字"); - this.formData.retirementAmount = ""; + this.formData.retirementAmount = null; } else { this.formData.retirementAmount = parseFloat( this.formData.retirementAmount ); } }, + checkOldSubsidyInput() { + if (isNaN(this.formData.oldSubsidy)) { + this.$message.error("请输入数字"); + this.formData.oldSubsidy = null; + } else { + this.formData.oldSubsidy = parseFloat( + this.formData.oldSubsidy + ); + } + }, monthIncomeNumberInput() { if (isNaN(this.formData.monthIncome)) { this.$message.error("请输入数字"); diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index edc4470a6..1cfb2f0e6 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -370,7 +370,7 @@ export default { async getApiData() { await this.getOrgData(); this.getWarningList(); - this.getZnycList(); + // this.getZnycList(); this.getPandectData(); this.getNoticeData(); },