From c7a91bec1833d13c62368848b2afb29d3924ac4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 10 Jun 2022 19:06:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/mdp.scss                    |  9 +++++++++
 src/views/xm/core/xmTask/XmPhase.vue   | 18 ++++++++----------
 src/views/xm/core/xmTask/XmTaskMng.vue |  6 +++---
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss
index de8f29ff..006e561a 100644
--- a/src/styles/mdp.scss
+++ b/src/styles/mdp.scss
@@ -257,6 +257,15 @@ table tr.hover-row{
     display:none;
   }
 }
+ /**
+ *解决表格固定列无法滚动问题
+ */
+.el-table {
+  .el-table__fixed {
+    height:auto !important; 
+    bottom:17px !important;  
+  }
+}
 
 .icon {
   color: #fff;
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 15139d94..793bbb2f 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -177,15 +177,13 @@
               <el-table-column
                 label="全选"
                 type="selection"
-                width="50"
-                fixed="left"
+                width="50" 
               >
               </el-table-column> 
               <el-table-column
                 sortable
                 prop="name"
-                class-name="title"
-                fixed="left"
+                class-name="title" 
                 label="计划名称"
                 min-width="300"
               >
@@ -211,14 +209,14 @@
                      </span>
 									</div>
                 </template>
-              </el-table-column>
-              
-              <el-table-column
+              </el-table-column>  
+              <el-table-column 
                 label="状态"
                 type="taskState"
-                width="100"
+                width="100" 
               >  
-								<template slot-scope="scope">
+								<template slot-scope="scope" 
+               >
 									<div class="cell-text">
 										<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'taskState',scope.row.taskState)" :key="index" :type="item.className">{{item.name}}</el-tag>
    
@@ -229,7 +227,7 @@
 										 </el-select>
 									</span>
 								</template>
-              </el-table-column> 
+              </el-table-column>   
             </el-table>
             <el-pagination
               ref="pagination"
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index a97463e0..60c90952 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -9,7 +9,7 @@
         <el-row> 
             <xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="isTaskCenter?false:true"  :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select>
 
-					<el-select style="width: 100px" v-model="filters.taskState" placeholder="状态" clearable>
+					<el-select style="width: 100px" v-model="filters.taskState" placeholder="状态" clearable class="hidden-md-and-down">
 									<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.taskState" :key="index"></el-option> 
           </el-select>
           <el-select
@@ -39,7 +39,7 @@
             >
           </el-select>
           <el-select
-            class="hidden-md-and-down"
+            class="hidden-lg-and-down"
             v-model="filters.taskType"
             placeholder="类型"
             style="width: 100px"
@@ -58,7 +58,7 @@
             >
           </el-select>
           <el-checkbox
-            class="hidden-md-and-down"
+            class="hidden-lg-and-down"
             v-model="filters.taskOut"
             true-label="1"
             false-label=""