Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -53,7 +53,7 @@
       </el-select>
       </el-select>
       <el-table :data="taskCommentList" size="mini" border header-cell-class-name="table-header-gray">
       <el-table :data="taskCommentList" size="mini" border header-cell-class-name="table-header-gray">
         <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
         <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
-        <el-table-column label="环节名称" prop="candidate" minWidth="150px" align="center" />
+        <el-table-column label="环节名称" prop="taskName" minWidth="150px" align="center" />
         <el-table-column label="办理人" prop="assigneeName" minWidth="100px" align="center" />
         <el-table-column label="办理人" prop="assigneeName" minWidth="100px" align="center" />
         <el-table-column label="处理时间" prop="createTime" width="140px" align="center" />
         <el-table-column label="处理时间" prop="createTime" width="140px" align="center" />
         <el-table-column label="办结时间" prop="finishTime" width="140px" align="center" />
         <el-table-column label="办结时间" prop="finishTime" width="140px" align="center" />
@@ -158,6 +158,7 @@
         }
         }
 
 
         this.selectTaskId = element.id
         this.selectTaskId = element.id
+        this.selectValue = element.id
         this.dlgTitle = element.businessObject ? element.businessObject.name : undefined
         this.dlgTitle = element.businessObject ? element.businessObject.name : undefined
         // 计算当前悬浮任务审批记录，如果记录为空不显示弹窗
         // 计算当前悬浮任务审批记录，如果记录为空不显示弹窗
         this.taskCommentList = (this.formData.allCommentList || []).filter(item => {
         this.taskCommentList = (this.formData.allCommentList || []).filter(item => {
@@ -166,6 +167,7 @@
       },
       },
       // 下拉列表切换
       // 下拉列表切换
       handleSelect (val) {
       handleSelect (val) {
+
         this.taskCommentList = (this.formData.allCommentList || []).filter(item => {
         this.taskCommentList = (this.formData.allCommentList || []).filter(item => {
           return item.taskDefKey === val
           return item.taskDefKey === val
         })
         })
@@ -213,6 +215,7 @@
       },
       },
       // 设置流程图元素状态
       // 设置流程图元素状态
       setProcessStatus (processNodeInfo) {
       setProcessStatus (processNodeInfo) {
+        this.taskCommentList = this.formData.allCommentList;
         this.processNodeInfo = processNodeInfo
         this.processNodeInfo = processNodeInfo
         if (this.isLoading || this.processNodeInfo == null || this.bpmnViewer == null) return
         if (this.isLoading || this.processNodeInfo == null || this.bpmnViewer == null) return
         const { finishedTaskSet, rejectedTaskSet, unfinishedTaskSet, finishedSequenceFlowSet } = this.processNodeInfo
         const { finishedTaskSet, rejectedTaskSet, unfinishedTaskSet, finishedSequenceFlowSet } = this.processNodeInfo
@@ -255,12 +258,15 @@
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
   .information-list {
   .information-list {
-    height: 150px;
-    margin-top: 10px;
+    // height: 150px;
+    // margin-top: 10px;
 
 
     p {
     p {
       font-size: 16px;
       font-size: 16px;
       line-height: 24px;
       line-height: 24px;
     }
     }
   }
   }
+  /deep/.bjs-powered-by {
+    display: none;
+  }
 </style>
 </style>