From 81f7f0afe1933b3baf9d536470a4607ffb5f8966 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 25 Mar 2022 18:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMonitoringObject/Detail.vue | 8 ++++----
 src/apps/AppMonitoringObject/List.vue   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index 5b5e4a85..c40d3f60 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -32,7 +32,7 @@
             </div>
             <div class="item-info">
               <label>政治面貌</label>
-              <span>{{ info.politicsStatus }}</span>
+              <span>{{ $dict.getLabel('fpPoliticalOutlook', info.politicsStatus) }}</span>
             </div>
             <div class="item-info">
               <label>文化程度</label>
@@ -161,7 +161,7 @@
             <span>{{ info.income7 }}元</span>
           </div>
         </div>
-        <div class="item-wrapper">
+        <!-- <div class="item-wrapper">
           <div class="item-header">
             <div class="left">
               <h2>结对帮扶</h2>
@@ -177,7 +177,7 @@
             <label>消除风险</label>
             <span>{{ info.riskEliminationMethod ? '是' : '-' }}</span>
           </div>
-        </div>
+        </div> -->
       </div>
       <div class="tab-content__item" v-show="currIndex === 1">
         <div class="log-item" v-for="(item, index) in list" :key="index">
@@ -277,7 +277,7 @@ export default {
       this.isFrom = true
     }
     this.$dict.load(['fpType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo', 'fpNation', 'fpEducation', 'fpStudentsInSchool', 'fpHealth',
-    'fpLaborSkills', ]).then(() => {
+    'fpLaborSkills', 'fpPoliticalOutlook']).then(() => {
       this.isGirdUser()
       this.getInfo()
     })
diff --git a/src/apps/AppMonitoringObject/List.vue b/src/apps/AppMonitoringObject/List.vue
index 303adee3..ffbda197 100644
--- a/src/apps/AppMonitoringObject/List.vue
+++ b/src/apps/AppMonitoringObject/List.vue
@@ -116,7 +116,7 @@ export default {
         params: {
           current: this.current,
           size: 15,
-          status: this.currIndex == 1 ? '3' : '1',
+          status: this.currentTabs == 1 ? '3' : '1',
           // addressAreaId: this.areaId,
           name: this.keyword
         },