--no commit message

@@ -59,16 +59,16 @@
         <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" width="160" align="center" />
+        <el-table-column label="办结时间" prop="endTime" width="160" align="center" />
+        <el-table-column label="操作方式" prop="businessName" align="center"/>
+        <el-table-column label="意见" prop="idea" align="center"/>
       </el-table>
     </div>
   </div>
@@ -237,13 +237,31 @@
        // 获取流程记录
       getCommentList() {
         this.formData.allCommentList.forEach(async (item,index) => {
-                this.formData.allCommentList[index].agent=item.assignee.name
+          item.comments.forEach(element => {
+            if(element.type=="COMPLETE"){
+              this.formData.allCommentList[index].idea=element.message
+            }
+          });
+            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)
+
       },
 
       // 设置流程图元素状态

@@ -76,6 +76,7 @@ export default {
                 rejectedTaskSet: {},
                 finishedSequenceFlowSet: result.finishedSequenceFlowIds
               },
+              handlinglist:result.runningTasks,
               allCommentList: result.finishedTasks
             }, '80%', true)
           })