From 87f7d581253e57aab5a81347dd99df40ab555cdd Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 29 Apr 2022 11:28:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BB=E8=80=81=E4=BF=9D=E9=99=A9=E5=92=8C?=
 =?UTF-8?q?=E5=8C=BB=E7=96=97=E4=BF=9D=E9=99=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMonitoringObject/Detail.vue          | 16 +++++++++++++---
 .../AppMonitoringObject/MonitorFamilyMember.vue  |  1 +
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index d519fc63..413bcc7f 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -36,7 +36,7 @@
           </div>
           <div class="item-info">
             <label>采取措施</label>
-            <span>{{ $dict.getLabel('fpAssistanceMeasures',info.operationDesc) }}</span>
+            <span>{{ $dict.getLabel('fpAssistanceMeasures',info.helpLog.operationDesc) }}</span>
           </div>
         </div>
         <div class="item-wrapper">
@@ -51,11 +51,11 @@
           </div>
           <div class="item-info">
             <label>未参加医疗参保</label>
-            <span>{{ info.ylbxCount }}人</span>
+            <span>{{ basicNum.length }}人</span>
           </div>
           <div class="item-info">
             <label>未参加养老保险</label>
-            <span>{{ info.ylCount }}人</span>
+            <span>{{ endNum.length }}人</span>
           </div>
         </div>
         <div class="item-wrapper">
@@ -212,6 +212,8 @@ export default {
       girdInfo: {},
       userInfo: {},
       id: '',
+      basicNum: [],
+      endNum: [],
     }
   },
 
@@ -358,6 +360,14 @@ export default {
                 ylCount = ylCount + 1
               }
             })
+            this.endNum = res.data.family.filter(item  => 
+              (item.jcbxCxyiliao == '02' || '') && (item.jcbxCzyiliao == '02' || '')
+            )
+            console.log(res.data.family);
+            this.endNum = res.data.family.filter(v=> 
+              (v.jcbxCxyanglao == '02' || '') && (v.jcbxCzyanglao == '02' || '')
+            )
+            console.log(this.endNum ,111);
           }
           
           this.info.ylbxCount = ylbxCount
diff --git a/src/apps/AppMonitoringObject/MonitorFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorFamilyMember.vue
index 46506520..5197d7ec 100644
--- a/src/apps/AppMonitoringObject/MonitorFamilyMember.vue
+++ b/src/apps/AppMonitoringObject/MonitorFamilyMember.vue
@@ -104,6 +104,7 @@ export default {
         if (res.code === 0) {
           this.info = res.data
           if(res.data.family && res.data.family.length) {
+            console.log(res.data.family);
             this.list = res.data.family.map(item => {
               return {
                 ...item,