From 33ae85e98c9b33ab9fa5beacfbc136d90044b234 Mon Sep 17 00:00:00 2001
From: lihenian <2629534615@qq.com>
Date: Fri, 22 Nov 2019 19:00:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E8=BF=9B?=
 =?UTF-8?q?=E5=B1=95=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/events/item-close-detail-view.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/events/item-close-detail-view.vue b/src/views/modules/events/item-close-detail-view.vue
index 557a66bb..714313e4 100644
--- a/src/views/modules/events/item-close-detail-view.vue
+++ b/src/views/modules/events/item-close-detail-view.vue
@@ -74,9 +74,9 @@
                         </div> -->
                         <div :id="`content${index}`" style="line-height:25px; ">
                           <div
-                            :style="{ marginBottom: '10px', width: '35px', height: '20px', fontSize: '12px', borderRadius: '4px', background: item.type === 'project' ? '#009688': item.type === 'issue' ? '#ffa546' : '', color: '#fff', textAlign: 'center', lineHeight: '20px'}"
+                            :style="{ marginBottom: '10px', width: '35px', height: '20px', fontSize: '12px', borderRadius: '4px', background: item.type === 'project' ? '#009688': item.type === 'issue' || item.type === 'issue-project' ? '#ffa546' : '', color: '#fff', textAlign: 'center', lineHeight: '20px'}"
                             v-if="item.type !== 'init'">
-                            {{item.type === 'project' ? '项目': item.type === 'issue' ? '议题' : ''}}
+                            {{item.type === 'project' ? '项目': item.type === 'issue' || item.type === 'issue-project' ? '议题' : ''}}
                           </div>
                           <div><span style="font-weight: bold; color: rgb(96, 98, 102);">[{{item | formatState}}]</span> {{item.createdTime}}</div>
                           <div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理部门：</span>{{item.handlerDept}}</div>
@@ -164,7 +164,7 @@ export default {
   filters: {
     formatState (item) {
       console.log(item)
-      if (item.type === 'project') {
+      if (item.type === 'project' || item.type === 'issue-project') {
         if (item.state === '0' && item.itemDeptDTOS.length > 0) {
           return '吹哨'
         } else if (item.state === '0' && item.itemDeptDTOS.length === 0) {
@@ -236,7 +236,7 @@ export default {
         }
         this.dataForm.handleProgressResultDTOS.forEach((item, index, arr) => {
           if (index === arr.length - 1) {
-            item.type = 'issue'
+            item.type = 'issue-project'
           } else {
             item.type = 'project'
           }