0488dd30 by xiaomiao

流程图

1 parent bdcafaba
...@@ -65,9 +65,10 @@ ...@@ -65,9 +65,10 @@
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" :formatter="formatDate" width="160" align="center" />
69 <el-table-column label="办结时间" prop="endTime" width="160" align="center" /> 69 <el-table-column label="认领时间" prop="claimTime" :formatter="formatDate" width="160" align="center" />
70 <el-table-column label="操作方式" prop="businessName" align="center"/> 70 <el-table-column label="转出时间" prop="endTime" :formatter="formatDate" width="160" align="center" />
71 <el-table-column label="操作方式" prop="controls" align="center"/>
71 <el-table-column label="意见" prop="idea" align="center"/> 72 <el-table-column label="意见" prop="idea" align="center"/>
72 </el-table> 73 </el-table>
73 </div> 74 </div>
...@@ -118,6 +119,14 @@ ...@@ -118,6 +119,14 @@
118 this.clearViewer() 119 this.clearViewer()
119 }, 120 },
120 methods: { 121 methods: {
122 formatDate(row, column) {
123 let data = row[column.property]
124 if(data == null) {
125 return null
126 }
127 let dt = new Date(data)
128 return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' ' + dt.getHours() + ':' + dt.getMinutes() + ':' + dt.getSeconds()
129 },
121 processReZoom () { 130 processReZoom () {
122 this.defaultZoom = 1 131 this.defaultZoom = 1
123 this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto') 132 this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto')
...@@ -240,6 +249,7 @@ ...@@ -240,6 +249,7 @@
240 item.comments.forEach(element => { 249 item.comments.forEach(element => {
241 if(element.type=="COMPLETE"){ 250 if(element.type=="COMPLETE"){
242 this.formData.allCommentList[index].idea=element.message 251 this.formData.allCommentList[index].idea=element.message
252 this.formData.allCommentList[index].controls="完成"
243 } 253 }
244 }); 254 });
245 this.formData.allCommentList[index].agent=item.assignee.name 255 this.formData.allCommentList[index].agent=item.assignee.name
......