From 2b036cf75bbcc9c961eae6fab8d5e8cb073c6082 Mon Sep 17 00:00:00 2001
From: lihenian <2629534615@qq.com>
Date: Fri, 22 Nov 2019 19:09:40 +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 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/events/item-close-detail-view.vue b/src/views/modules/events/item-close-detail-view.vue
index c4d0d00c..103be9bc 100644
--- a/src/views/modules/events/item-close-detail-view.vue
+++ b/src/views/modules/events/item-close-detail-view.vue
@@ -164,7 +164,7 @@ export default {
   filters: {
     formatState (item) {
       console.log(item)
-      if (item.type === 'project' || item.type === 'issue-project') {
+      if (item.type === 'project') {
         if (item.state === '0' && item.itemDeptDTOS.length > 0) {
           return '吹哨'
         } else if (item.state === '0' && item.itemDeptDTOS.length === 0) {
@@ -182,6 +182,8 @@ export default {
         } else if (item.state === '2') {
           return '关闭'
         }
+      } else if (item.type === 'issue-project') {
+        return '转项目'
       }
     }
   },
@@ -248,8 +250,7 @@ export default {
             item.type = 'issue'
           }
         })
-        const issueList = this.dataForm.issueProgressResultDTOS.reverse()
-        this.timeLineList = [...this.dataForm.handleProgressResultDTOS, ...issueList]
+        this.timeLineList = [...this.dataForm.handleProgressResultDTOS, ...this.dataForm.issueProgressResultDTOS]
         console.log('timelinelist', this.timeLineList)
         this.$nextTick(() => {
           this.timeLineList.forEach((item, index) => {