From bc26e355bee670743f8184b0818f68a74efd57e2 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 29 Apr 2022 17:07:01 +0800
Subject: [PATCH] 29431

---
 src/apps/AppMonitoringObject/Detail.vue | 30 +++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index f9e40ee2..6d9ee480 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -81,7 +81,7 @@
           <div class="item-header">
             <div class="left">
               <h2>家庭风险情况</h2>
-              <i :style="{color: isIncome ? '#2EA222' : '#FF4466'}">({{ isIncome ? '已填写' : '未填写' }})</i>
+              <i :style="{color: isFamilyRisk ? '#2EA222' : '#FF4466'}">({{ isFamilyRisk ? '已填写' : '未填写' }})</i>
             </div>
             <span @click="linkTo(`./familyRisk?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
           </div>
@@ -98,7 +98,7 @@
           <div class="item-header">
             <div class="left">
               <h2>家庭收支情况</h2>
-              <i :style="{color: isIncome ? '#2EA222' : '#FF4466'}">({{ isIncome ? '已填写' : '未填写' }})</i>
+              <i :style="{color: familyIncome ? '#2EA222' : '#FF4466'}">({{ familyIncome ? '已填写' : '未填写' }})</i>
             </div>
             <span @click="linkTo(`./MonitorIncome?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
           </div>
@@ -117,7 +117,7 @@
           <div class="item-header">
             <div class="left">
               <h2>风险解除跟踪</h2>
-              <i :style="{color: isPoorStatus ? '#2EA222' : '#FF4466'}">({{ isPoorStatus ? '已填写' : '未填写' }})</i>
+              <i :style="{color: moveRisk ? '#2EA222' : '#FF4466'}">({{ moveRisk ? '已填写' : '未填写' }})</i>
             </div>
             <span @click="linkTo(`./MonitorPoorStatus?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
           </div>
@@ -238,11 +238,33 @@ export default {
       if (!this.info.id) {
         return false
       }
-
       return (this.info.drinkingWaterSafety || this.info.dilapidatedHouse && this.info.move);
+    },
+    isFamilyRisk() {
+      if (!this.info.id) {
+        return false
+      }
+      return (this.info.objectType || this.info.riskType || this.info.militaryMartyrs || this.info.dropOutOfSchool)
+    },
 
+    familyIncome() {
+      if (!this.info.id) {
+        return false
+      }
+      return (this.info.income1 || this.info.income2 || this.info.income3 || this.info.income4
+       || this.info.income5|| this.info.income6|| this.info.income7|| this.info.income8 || this.info.income9 || 
+       this.info.income10 || this.info.income11 || this.info.income12 || 
+       this.info.income13 || this.info.income14 || this.info.income15)
+    },
 
+    moveRisk() {
+      if (!this.info.id) {
+        return false
+      }
+      return (this.info.fxxcIncome1 || this.info.fxxcIncome2 || this.info.fxxcIncome3 || this.info.fxxcIncome4
+       || this.info.fxxcIncome5 || this.info.fxxcIncome6 || this.info.fxxcIncome7)
     }
+
   },
 
   onLoad(query) {