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

@@ -46,12 +46,11 @@
     </div>
     </div>
     <!-- 已完成节点悬浮弹窗 -->
     <!-- 已完成节点悬浮弹窗 -->
     <div class="information-list">
     <div class="information-list">
-      <!-- <p>{{ dlgTitle ? dlgTitle : '浏览记录' }}</p> -->
       <el-select v-model="selectValue" @change="handleSelect">
       <el-select v-model="selectValue" @change="handleSelect">
         <el-option v-for="item in selectOptions" :key="item.value" :label="item.label" :value="item.value">
         <el-option v-for="item in selectOptions" :key="item.value" :label="item.label" :value="item.value">
         </el-option>
         </el-option>
       </el-select>
       </el-select>
-      <el-table :data="taskCommentList" size="mini" border header-cell-class-name="table-header-gray">
+      <el-table height="190" :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="流程状态" header-align="center" align="center">
         <el-table-column label="流程状态" header-align="center" align="center">
           <template slot-scope="scope">
           <template slot-scope="scope">
@@ -172,9 +171,13 @@
       },
       },
       // 下拉列表切换
       // 下拉列表切换
       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
         })
         })
+        if (val.length > 3) {
+          this.taskCommentList = this.formData.allCommentList;
+        }
       },
       },
       // 显示流程图
       // 显示流程图
       async importXML (xml) {
       async importXML (xml) {
@@ -264,8 +267,8 @@
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
   .information-list {
   .information-list {
-    // height: 150px;
-    // margin-top: 10px;
+    height: 220px;
+    margin-top: 10px;
 
 
     p {
     p {
       font-size: 16px;
       font-size: 16px;
@@ -275,4 +278,8 @@
   /deep/.bjs-powered-by {
   /deep/.bjs-powered-by {
     display: none;
     display: none;
   }
   }
+  // /deep/.information-list {
+  //   height: 170px;
+  //   overflow: visible;
+  // }
 </style>
 </style>