From c3c6f39f2aa15fd1a32643d838ed6554225bbfff 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 Feb 2023 04:54:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/mdp.scss                           |  9 ++--
 .../xm/core/xmMenu/XmEpicFeaturesSelect.vue   | 10 ++---
 src/views/xm/core/xmTask/XmPhaseSelect.vue    | 44 ++++++++++---------
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss
index f6c83289..732099b7 100644
--- a/src/styles/mdp.scss
+++ b/src/styles/mdp.scss
@@ -310,7 +310,7 @@ table tr.hover-row{
   overflow: hidden;
   white-space: nowrap;  
   max-width:15vw;
-}
+} 
  /**
  *解决表格固定列无法滚动问题
  */
@@ -335,9 +335,12 @@ table tr.hover-row{
 .el-dialog__header{
   padding: 20px !important;  
 }
+.el-dialog__footer{
+  padding: 20px !important;  
+}
 .el-dialog__body{
-  padding-top: 0px !important;
-  padding-bottom: 10px !important;
+  padding-top: 0px !important; 
+  padding-bottom: 20px !important; 
   padding-left: 20px !important;
   padding-right: 20px !important;
 }
diff --git a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
index 1049919b..f87f9964 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
@@ -5,8 +5,8 @@
 			<div style="display:flex;">
 			<xm-product-select ref="xmProductSelect1" style="display:inline;" v-if="!xmProduct || !xmProduct.id"   :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClearSelect"></xm-product-select> 
 				
-			<el-input v-else  v-model="filters.key" placeholder="名称模糊查询"  clearable></el-input>
-			<el-button style="margin-left:5px;" icon="el-icon-search" @click="searchXmMenus()"></el-button> 
+			<el-input v-else v-model="filters.key" placeholder="名称模糊查询"  clearable></el-input>
+			<el-button style="margin-left:5px;" icon="el-icon-search" @click="searchXmMenus()">查询</el-button> 
 			<el-button style="margin-left:5px;" v-if="showSelect!==false && multi===true" type="primary" @click="selectConfirm()">确认选择</el-button> 
 			</div>
 		</el-row>
@@ -31,8 +31,7 @@
 						<i class="el-icon-document"></i>
 						</div>
 						<span class="hidden-md-and-down">{{scope.row.seqNo}} &nbsp;</span><span>{{scope.row.menuName}} </span> 
-						<el-button type="text" size="mini" circle plain v-if="editForm&&editForm.menuId==scope.row.menuId" @click.stop="unselectRow()" title="取消选中状态" icon="el-icon-circle-close"></el-button>
-
+ 
 						<span  style="float:right;"
 							:style="{borderRadius: '30px',color:scope.row.finishRate >= 100 ? 'green' : 'blue'}" 
 						>
@@ -41,7 +40,8 @@
 					</template> 
 				</el-table-column>  
 				<template v-if="showSelect!==false && multi!==true">
-				<el-table-column   label="操作"  width="100"  > 
+				<el-table-column   label="操作"  width="100"  
+                align="right" > 
 					<template slot-scope="scope"> 
 						<el-button      @click="select( scope.row,scope.$index)"   title="选择" type="primary"> 选择</el-button>     
 					</template>
diff --git a/src/views/xm/core/xmTask/XmPhaseSelect.vue b/src/views/xm/core/xmTask/XmPhaseSelect.vue
index 193fe6da..679c67f0 100644
--- a/src/views/xm/core/xmTask/XmPhaseSelect.vue
+++ b/src/views/xm/core/xmTask/XmPhaseSelect.vue
@@ -1,13 +1,14 @@
 <template>
-  <section class="padding"> 
-        <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-input style="width:150px;" v-model="filters.key" placeholder="名称模糊查询" clearable></el-input>
-           <el-button icon="el-icon-search" @click="searchXmTasks()" type="primary"></el-button> 
+  <section> 
+        <el-row>   
+          <div style="display:flex;justify-content: space-between;">
+             <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-input v-else v-model="filters.key" placeholder="名称模糊查询" clearable></el-input>
+           <el-button style="margin-left:10px;" icon="el-icon-search" @click="searchXmTasks()">查询</el-button> 
+          </div> 
         </el-row>
 
-        <el-row class="padding-top"> 
-            <el-table class="task-table" :row-style="{height:'46px'}" 
+             <el-table class="task-table" 
              element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"
               :data="tasksTreeData"
               @sort-change="sortChange"
@@ -24,14 +25,7 @@
               :tree-props="{ children: 'children'  }"
               row-key="id"
               ref="table" 
-            >
-              <el-table-column
-                label="全选"
-                type="selection"
-                width="50"
-                fixed="left"
-              >
-              </el-table-column> 
+            > 
               <el-table-column 
                 prop="name"
                 class-name="title"
@@ -40,7 +34,16 @@
                 min-width="300" show-overflow-tooltip
               >
               
-              <template slot="header">计划名称</template>
+              
+              <template slot="header" slot-scope="scope"> 
+									<div style="display:flex;">
+										<div style="width:50%;text-align: left;line-height: 32px;">计划名称</div> 
+                     <div style="line-height: 32px;width:50%;display: flex;justify-content: right;">
+                       <el-input v-if="!selProject||!selProject.id"  v-model="filters.key" size="mini" style="margin-left:5px;"  placeholder="名称模糊查询"  clearable></el-input>  
+                    </div>
+
+                  </div>
+              </template>
                 <template slot-scope="scope">
                   <div    class="icon" :style="{backgroundColor:  scope.row.ntype==='1'?'#E6A23C':'#409EFF'}">
 									<i :class="scope.row.ntype==='1'?'el-icon-time':'el-icon-s-operation'" ></i>
@@ -48,8 +51,7 @@
                   <span>
                     {{ scope.row.sortLevel }}&nbsp;  {{ scope.row.name }}
                     </span> 
-                    <el-button type="text" size="mini" circle plain v-if="editForm&&editForm.id==scope.row.id" @click.stop="unselectRow()" title="取消选中状态" icon="el-icon-circle-close"></el-button>
-                </template>
+                 </template>
               </el-table-column>
               
               <el-table-column
@@ -67,6 +69,7 @@
               <el-table-column
                 label="操作" 
                 width="100"
+                align="right"
               >  
 								<template slot-scope="scope">
 									<div>
@@ -76,8 +79,8 @@
               </el-table-column> 
 
               
-            </el-table>
-        </el-row>
+            </el-table> 
+            <el-row>
             <el-pagination
               ref="pagination"
               layout="total, sizes, prev, pager, next"
@@ -89,6 +92,7 @@
               :total="pageInfo.total"
               style="float: right; margin-top: 10px;"
             ></el-pagination>   
+          </el-row> 
   </section>
 </template>