bugs

src/views/modules/base/residentManagement/oldPeople/addForm.vue

@@ -181,7 +181,7 @@
                     <el-col :span="12">
                         <div class="info-prop" v-if="formType == 'detail'">
                             <span class="info-title-2">与户主关系: </span>
-                            <span>{{ formData.disabilityCategoryName || "--" }}</span>
+                            <span>{{ formData.houseHolderRelName || "--" }}</span>
                         </div>
                         <el-form-item label-width="104px" label="与户主关系" v-else>
                             <el-select v-model="formData.houseHolderRel" clearable>
@@ -205,7 +205,18 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-
+                  <el-row type="flex" justify="" >
+                    <el-col :span="12">
+                        <div class="info-prop" v-if="formType == 'detail'">
+                            <span class="info-title-2">月收入: </span>
+                            <span>{{ formData.monthIncome || "--" }}</span>
+                        </div>
+                        <el-form-item label-width="104px" label="月收入" v-else>
+                            <el-input v-model="formData.monthIncome" placeholder="请输入" clearable
+                                @blur="monthIncomeNumberInput"></el-input>
+                        </el-form-item>
+                    </el-col>
+                  </el-row>
                   <el-row type="flex" justify="" >
                     <el-col :span="12">
                         <div class="info-prop" v-if="formType == 'detail'">
@@ -243,7 +254,7 @@
                         </div>
                         <el-form-item label-width="104px" label="退休金额" v-else>
                             <el-input v-model="formData.retirementAmount" placeholder="请输入" clearable
-                                @blur="checkNumberInput"></el-input>
+                                @blur="checkRetirementAmountNumberInput"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -253,7 +264,7 @@
                         </div>
                         <el-form-item label-width="104px" label="高龄补助" v-else>
                             <el-input v-model="formData.oldSubsidy" placeholder="请输入" clearable
-                                ></el-input>
+                            @blur="checkOldSubsidyInput" ></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -364,8 +375,9 @@ export default {
                 marriage: "",//婚姻状况
                 disabilityNum:"",
                 spouseSituation: "",//配偶情况
-                retirementAmount: "",
+                retirementAmount: null,
-                oldSubsidy: "",//高龄补助
+                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("请输入数字");

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();
     },