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

@@ -108,7 +108,7 @@ export default {
 .ls-mask {
 .ls-mask {
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
-  z-index: 2000;
+  z-index: 500;
   position: fixed;
   position: fixed;
   left: 0;
   left: 0;
   top: 0;
   top: 0;

@@ -157,7 +157,7 @@ export default {
       this.selectTaskId = element.id
       this.selectTaskId = element.id
       this.dlgTitle = element.businessObject ? element.businessObject.name : undefined
       this.dlgTitle = element.businessObject ? element.businessObject.name : undefined
       // 计算当前悬浮任务审批记录，如果记录为空不显示弹窗
       // 计算当前悬浮任务审批记录，如果记录为空不显示弹窗
-      this.taskCommentList = (this.allCommentList || []).filter(item => {
+      this.taskCommentList = (this.formData.allCommentList || []).filter(item => {
         return item.taskDefKey === this.selectTaskId
         return item.taskDefKey === this.selectTaskId
       })
       })
       this.dialogVisible = true
       this.dialogVisible = true