Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
4db760c6 by xiaomiao
Options

--no commit message

1 parent 87d653a9
Expand all
Inline Side-by-side
Showing 3 changed files with 29 additions and 10 deletions
...@@ -59,16 +59,16 @@ ...@@ -59,16 +59,16 @@
59 <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" /> 59 <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
60 <el-table-column label="流程状态" header-align="center" align="center"> 60 <el-table-column label="流程状态" header-align="center" align="center">
61 <template slot-scope="scope"> 61 <template slot-scope="scope">
62 <div v-if="scope.row.finishTime == null">正在办理</div> 62 <div v-if="scope.row.endTime">已完结</div>
63 <div v-else>已完结</div> 63 <div v-else>正在办理</div>
64 </template> 64 </template>
65 </el-table-column> 65 </el-table-column>
66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" /> 66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" /> 67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
68 <el-table-column label="处理时间" prop="createTime" width="160" align="center" /> 68 <el-table-column label="创建时间" prop="createTime" width="160" align="center" />
69 <el-table-column label="办结时间" prop="finishTime" width="160" align="center" /> 69 <el-table-column label="办结时间" prop="endTime" width="160" align="center" />
70 <el-table-column label="操作方式" align="center"> 70 <el-table-column label="操作方式" prop="businessName" align="center"/>
71 </el-table-column> 71 <el-table-column label="意见" prop="idea" align="center"/>
72 </el-table> 72 </el-table>
73 </div> 73 </div>
74 </div> 74 </div>
...@@ -237,13 +237,31 @@ ...@@ -237,13 +237,31 @@
237 // 获取流程记录 237 // 获取流程记录
238 getCommentList() { 238 getCommentList() {
239 this.formData.allCommentList.forEach(async (item,index) => { 239 this.formData.allCommentList.forEach(async (item,index) => {
240 this.formData.allCommentList[index].agent=item.assignee.name 240 item.comments.forEach(element => {
241 if(element.type=="COMPLETE"){
242 this.formData.allCommentList[index].idea=element.message
243 }
244 });
245 this.formData.allCommentList[index].agent=item.assignee.name
241 }) 246 })
242 setTimeout(() => { 247 this.formData.handlinglist.forEach(async (item,index) => {
243 this.taskList =this.formData.allCommentList; 248 if(item.assignee.name){
249 this.formData.handlinglist[index].agent=item.assignee.name
250 }else{
251 let str=""
252 item.countersign.forEach((item) => {
253 str+=item.name+","
254 })
255 str=str.slice(0, -1);
256 this.formData.allCommentList[index].agent=str
257 }
258
259 })
260 this.taskList =[...this.formData.allCommentList,...this.formData.handlinglist];
261 // this.taskList =this.formData.allCommentList;
244 // 处理数据之后赋值 262 // 处理数据之后赋值
245 this.taskCommentList=this.taskList 263 this.taskCommentList=this.taskList
246 }, 100) 264
247 }, 265 },
248 266
249 // 设置流程图元素状态 267 // 设置流程图元素状态
......
...@@ -76,6 +76,7 @@ export default { ...@@ -76,6 +76,7 @@ export default {
76 rejectedTaskSet: {}, 76 rejectedTaskSet: {},
77 finishedSequenceFlowSet: result.finishedSequenceFlowIds 77 finishedSequenceFlowSet: result.finishedSequenceFlowIds
78 }, 78 },
79 handlinglist:result.runningTasks,
79 allCommentList: result.finishedTasks 80 allCommentList: result.finishedTasks
80 }, '80%', true) 81 }, '80%', true)
81 }) 82 })
......