From 837aa3b8fe454620677ea09ffca9f9817c420011 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 29 Apr 2022 10:18:11 +0800
Subject: [PATCH] 29417

---
 src/apps/AppMonitoringObject/Detail.vue                |  4 ++--
 src/apps/AppMonitoringObject/LogList.vue               |  2 +-
 .../AppMonitoringObject/MonitorAddFamilyMember.vue     | 10 +++++-----
 .../AppMonitoringObject/MonitorFamilySituation.vue     |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index a59cede0..d519fc63 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -104,11 +104,11 @@
           </div>
           <div class="item-info">
             <label>家庭纯收入</label>
-            <span>{{ info.fxxcIncome8 }}元</span>
+            <span>{{ info.familyIncome }}元</span>
           </div>
           <div class="item-info">
             <label>家庭人均纯收入</label>
-            <span>{{ info.fxxcIncome9 }}元</span>
+            <span>{{ info.perCapitaIncome }}元</span>
           </div>
         </div>
         <!-- 风险解除 -->
diff --git a/src/apps/AppMonitoringObject/LogList.vue b/src/apps/AppMonitoringObject/LogList.vue
index 419510d5..1d0f37f3 100644
--- a/src/apps/AppMonitoringObject/LogList.vue
+++ b/src/apps/AppMonitoringObject/LogList.vue
@@ -114,7 +114,7 @@ export default {
 
 <style lang="scss">
 .detail {
-  padding-top: 16px;
+  // padding-top: 16px;
 
   &.active {
     padding-top: 0;
diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
index 39f6ea2b..5585f3da 100644
--- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
+++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
@@ -301,11 +301,11 @@ export default {
         labourStatus: '',
         workArea: '',
         workeMonths: '',
-        basicMedicalTreatment: '',
-        seriousIllnessInsurance: '',
-        endowmentInsurance: '',
-        subsistenceAllowance: '',
-        specialPovertySupport: '',
+        basicMedicalTreatment: '02',
+        seriousIllnessInsurance: '02',
+        endowmentInsurance: '02',
+        subsistenceAllowance: '02',
+        specialPovertySupport: '02',
         girdId: '',
         girdName: '',
         healthyStatus: '',
diff --git a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
index 3e681ea7..be27c3f0 100644
--- a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
+++ b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
@@ -9,7 +9,7 @@
             <span>户类型</span>
           </div>
           <div class="right">
-            <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
+            <AiSelect dict="fpHouseType" v-model="form.houseType"></AiSelect>
           </div>
         </div>
       </div>
@@ -280,7 +280,7 @@ export default {
   data() {
     return {
       form: {
-        objectType: '',
+        houseType: '',
         dilapidatedHousehold: '02',
         drinkingWaterSafety: '02',
         move: '02',
@@ -313,7 +313,7 @@ export default {
 
 
   onLoad(query) {
-    this.$dict.load(['fpYesOrNo', 'fpRiskType','fpHouseRoadType','fpFuelType']).then(() => {
+    this.$dict.load(['fpYesOrNo', 'fpRiskType','fpHouseRoadType','fpFuelType','fpHouseType']).then(() => {
       this.getInfo(query.id)
     })
     this.id = query.id