--no commit message

@@ -59,16 +59,17 @@
         <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
         <el-table-column label="流程状态" header-align="center" align="center">
           <template slot-scope="scope">
-            <div v-if="scope.row.finishTime == null">正在办理</div>
-            <div v-else>已完结</div>
+            <div v-if="scope.row.endTime">已完结</div>
+            <div v-else>正在办理</div>
           </template>
         </el-table-column>
         <el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
         <el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
-        <el-table-column label="处理时间" prop="createTime" width="160" align="center" />
-        <el-table-column label="办结时间" prop="finishTime" width="160" align="center" />
-        <el-table-column label="操作方式" align="center">
-        </el-table-column>
+        <el-table-column label="转入时间" prop="createTime" :formatter="formatDate" width="160" align="center" />
+        <el-table-column label="认领时间" prop="claimTime" :formatter="formatDate" width="160" align="center" />
+        <el-table-column label="转出时间" prop="endTime" :formatter="formatDate" width="160" align="center" />
+        <el-table-column label="操作方式" prop="controls" align="center"/>
+        <el-table-column label="意见" prop="idea" align="center"/>
       </el-table>
     </div>
   </div>
@@ -118,6 +119,14 @@
       this.clearViewer()
     },
     methods: {
+      formatDate(row, column) {
+          let data = row[column.property]
+          if(data == null) {
+              return null
+          }
+          let dt = new Date(data)
+           return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' ' + dt.getHours() + ':' + dt.getMinutes() + ':' + dt.getSeconds()
+        },
       processReZoom () {
         this.defaultZoom = 1
         this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto')
@@ -237,13 +246,32 @@
        // 获取流程记录
       getCommentList() {
         this.formData.allCommentList.forEach(async (item,index) => {
+          item.comments.forEach(element => {
+            if(element.type=="COMPLETE"){
+              this.formData.allCommentList[index].idea=element.message
+               this.formData.allCommentList[index].controls="完成"
+            }
+          });
             this.formData.allCommentList[index].agent=item.assignee.name
         })
-        setTimeout(() => {
-           this.taskList =this.formData.allCommentList;
+        this.formData.handlinglist.forEach(async (item,index) => {
+          if(item.assignee.name){
+            this.formData.handlinglist[index].agent=item.assignee.name
+          }else{
+            let str=""
+            item.countersign.forEach((item) => {
+               str+=item.name+","
+            })
+            str=str.slice(0, -1);
+            this.formData.allCommentList[index].agent=str
+          }
+
+        })
+           this.taskList =[...this.formData.allCommentList,...this.formData.handlinglist];
+          //  this.taskList =this.formData.allCommentList;
           //  处理数据之后赋值
             this.taskCommentList=this.taskList
-        }, 100)
+
       },
 
       // 设置流程图元素状态

@@ -75,10 +75,11 @@ export default {
                 finishedInfo: {
                   finishedTaskSet: result.finishedActivityIds,
                   unfinishedTaskSet: result.runningActivityIds,
-                rejectedTaskSet: result.rejectedTaskSet,
+                  rejectedTaskSet: {},
                   finishedSequenceFlowSet: result.finishedSequenceFlowIds
                 },
-              allCommentList: result.historyTaskList
+                handlinglist:result.runningTasks,
+                allCommentList: result.finishedTasks
               }, '80%', true)
             })
             break;