32c6973c by xiaomiao

流程图显示问题处理

1 parent 67dd16b3
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 </el-select> 53 </el-select>
54 <el-table :data="taskCommentList" size="mini" border header-cell-class-name="table-header-gray"> 54 <el-table :data="taskCommentList" size="mini" border header-cell-class-name="table-header-gray">
55 <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" /> 55 <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
56 <el-table-column label="环节名称" prop="candidate" minWidth="150px" align="center" /> 56 <el-table-column label="环节名称" prop="taskName" minWidth="150px" align="center" />
57 <el-table-column label="办理人" prop="assigneeName" minWidth="100px" align="center" /> 57 <el-table-column label="办理人" prop="assigneeName" minWidth="100px" align="center" />
58 <el-table-column label="处理时间" prop="createTime" width="140px" align="center" /> 58 <el-table-column label="处理时间" prop="createTime" width="140px" align="center" />
59 <el-table-column label="办结时间" prop="finishTime" width="140px" align="center" /> 59 <el-table-column label="办结时间" prop="finishTime" width="140px" align="center" />
...@@ -158,6 +158,7 @@ ...@@ -158,6 +158,7 @@
158 } 158 }
159 159
160 this.selectTaskId = element.id 160 this.selectTaskId = element.id
161 this.selectValue = element.id
161 this.dlgTitle = element.businessObject ? element.businessObject.name : undefined 162 this.dlgTitle = element.businessObject ? element.businessObject.name : undefined
162 // 计算当前悬浮任务审批记录,如果记录为空不显示弹窗 163 // 计算当前悬浮任务审批记录,如果记录为空不显示弹窗
163 this.taskCommentList = (this.formData.allCommentList || []).filter(item => { 164 this.taskCommentList = (this.formData.allCommentList || []).filter(item => {
...@@ -166,6 +167,7 @@ ...@@ -166,6 +167,7 @@
166 }, 167 },
167 // 下拉列表切换 168 // 下拉列表切换
168 handleSelect (val) { 169 handleSelect (val) {
170
169 this.taskCommentList = (this.formData.allCommentList || []).filter(item => { 171 this.taskCommentList = (this.formData.allCommentList || []).filter(item => {
170 return item.taskDefKey === val 172 return item.taskDefKey === val
171 }) 173 })
...@@ -213,6 +215,7 @@ ...@@ -213,6 +215,7 @@
213 }, 215 },
214 // 设置流程图元素状态 216 // 设置流程图元素状态
215 setProcessStatus (processNodeInfo) { 217 setProcessStatus (processNodeInfo) {
218 this.taskCommentList = this.formData.allCommentList;
216 this.processNodeInfo = processNodeInfo 219 this.processNodeInfo = processNodeInfo
217 if (this.isLoading || this.processNodeInfo == null || this.bpmnViewer == null) return 220 if (this.isLoading || this.processNodeInfo == null || this.bpmnViewer == null) return
218 const { finishedTaskSet, rejectedTaskSet, unfinishedTaskSet, finishedSequenceFlowSet } = this.processNodeInfo 221 const { finishedTaskSet, rejectedTaskSet, unfinishedTaskSet, finishedSequenceFlowSet } = this.processNodeInfo
...@@ -255,12 +258,15 @@ ...@@ -255,12 +258,15 @@
255 </script> 258 </script>
256 <style scoped lang="scss"> 259 <style scoped lang="scss">
257 .information-list { 260 .information-list {
258 height: 150px; 261 // height: 150px;
259 margin-top: 10px; 262 // margin-top: 10px;
260 263
261 p { 264 p {
262 font-size: 16px; 265 font-size: 16px;
263 line-height: 24px; 266 line-height: 24px;
264 } 267 }
265 } 268 }
269 /deep/.bjs-powered-by {
270 display: none;
271 }
266 </style> 272 </style>
......