From 8f3fd4a6cd684a865a7c01234bc564b77bb12968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 16 Jan 2023 01:23:20 +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

---
 .../xm/core/components/XmProjectSelect.vue    |   8 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue        |   2 +-
 src/views/xm/core/xmTask/XmPhase.vue          | 174 +++++++++---------
 src/views/xm/core/xmTask/XmTaskMng.vue        |   4 +-
 4 files changed, 97 insertions(+), 91 deletions(-)

diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index d95759c1..c7e1a500 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -193,7 +193,7 @@
             > 
              <span class="title">
             <slot name="title">{{
-                editForm && editForm.id ? editForm.name : "选择项目"
+                editForm && editForm.id ? editForm.name: "选择项目"
               }}</slot></span>
               </el-link>
         </slot>
@@ -531,6 +531,10 @@ export default {
   line-height: 32px;
   text-align: left;
   float: left; 
-  min-width: 100px;
+  min-width: 100px; 
+  max-width: 300px; 
+  overflow:hidden;  
+  text-overflow:ellipsis;  
+  white-space:nowrap; 
 }
 </style>
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index daab35e0..af1b14ac 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -11,7 +11,7 @@
 						<el-select v-model="filters.status" placeholder="需求状态" clearable style="width: 100px;">
 							<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option>
 						</el-select>
-						<el-input v-model="filters.key" style="width: 220px;" placeholder="需求名称查询" clearable>
+						<el-input v-model="filters.key" style="max-width: 200px;" placeholder="需求名称查询" clearable>
 						</el-input>
 						<el-button   type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search"></el-button>
 
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 9512af18..47f25001 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -6,97 +6,99 @@
       >
         <el-row>     
           
-          <span style="float:left;"> 
+          <span> 
            <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:60%;" v-model="filters.key" placeholder="名称 按回车"  class="hidden-md-and-down" clearable @keyup.enter.native="searchXmTasks()"></el-input>
-           <el-popover
-            placement="top-start"
-            title="选择创建计划/任务的方式"
-            width="300"
-            trigger="click"
-          >
-            <el-row>
+           <el-input style="width:150px;" v-model="filters.key" placeholder="名称 按回车"  class="hidden-md-and-down" clearable @keyup.enter.native="searchXmTasks()"></el-input>
+           <span style="float:right;">
+            <el-popover
+              placement="top-start"
+              title="选择创建计划/任务的方式"
+              width="300"
+              trigger="click"
+            >
               <el-row>
-                
-                <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
-                  <i :class=" 'el-icon-time' " ></i>
-                </div>  
-                <el-button 
-                  @click="showEpicFeaturesForCreateTask" 
-                  icon="el-icon-plus"
-                  >由史诗特性快速创建计划 (推荐)</el-button
-                >
+                <el-row>
+                  
+                  <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
+                    <i :class=" 'el-icon-time' " ></i>
+                  </div>  
+                  <el-button 
+                    @click="showEpicFeaturesForCreateTask" 
+                    icon="el-icon-plus"
+                    >由史诗特性快速创建计划 (推荐)</el-button
+                  >
+                </el-row>
+                <el-row>
+                  
+                  <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
+                    <i :class=" 'el-icon-time' " ></i>
+                  </div>  
+                  <el-button 
+                    @click="showTaskTemplate"
+                    icon="el-icon-plus"
+                    >从模板快速导入计划 </el-button
+                  >
+                </el-row>
+                <el-row>
+                  
+                  <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
+                    <i :class=" 'el-icon-time' " ></i>
+                  </div>  
+                  <el-button 
+                    @click="showAdd('1')"
+                    icon="el-icon-plus"
+                    >直接创建计划</el-button
+                  >
               </el-row>
-              <el-row>
-                
-                <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
-                  <i :class=" 'el-icon-time' " ></i>
-                </div>  
-                <el-button 
-                  @click="showTaskTemplate"
-                  icon="el-icon-plus"
-                  >从模板快速导入计划 </el-button
-                >
               </el-row>
-              <el-row>
-                
-                <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
-                  <i :class=" 'el-icon-time' " ></i>
-                </div>  
-                <el-button 
-                  @click="showAdd('1')"
-                  icon="el-icon-plus"
-                  >直接创建计划</el-button
-                >
-             </el-row>
-            </el-row>
-            <el-button
-              slot="reference" 
-              type="primary"
-              round
-              icon="el-icon-plus"
-              title="新建计划"
-            ></el-button>
-          </el-popover>  
-          <el-popover
-            placement="top-start"
-            title="更多条件、操作"
-            width="400"
-            trigger="manual"
-            v-model="moreVisible"
-          > 
-									<el-button  style="float:right;margin-top:-40px;"
-									icon="el-icon-close"
-									@click="moreVisible=false"
-									type="text"
-									>关闭</el-button
-									>  
-               <el-divider></el-divider>
-               <el-row>  
-                 <el-button type="danger" 
-                    @click="batchDel"
-                    v-loading="load.del"
-                    icon="el-icon-delete"
-                    title="批量删除"
-                    >批量删除</el-button
+              <el-button
+                slot="reference" 
+                type="primary"
+                round
+                icon="el-icon-plus"
+                title="新建计划"
+              ></el-button>
+            </el-popover>  
+            <el-popover
+              placement="top-start"
+              title="更多条件、操作"
+              width="400"
+              trigger="manual"
+              v-model="moreVisible"
+            > 
+                    <el-button  style="float:right;margin-top:-40px;"
+                    icon="el-icon-close"
+                    @click="moreVisible=false"
+                    type="text"
+                    >关闭</el-button
+                    >  
+                <el-divider></el-divider>
+                <el-row>  
+                  <el-button type="danger" 
+                      @click="batchDel"
+                      v-loading="load.del"
+                      icon="el-icon-delete"
+                      title="批量删除"
+                      >批量删除</el-button
+                    >
+                  <el-button 
+                    @click="showParentTaskList"  
+                    title="更换任务的上级，实现任务搬家功能"
+                    icon="el-icon-upload2"
+                    v-loading="load.edit"
+                  > 更换上级</el-button>    
+                  <span style="float:right;"> 
+                  <el-button 
+                    type="primary"
+                    icon="el-icon-search"
+                    @click="searchXmTasks"
+                    >查询</el-button
                   >
-                <el-button 
-                  @click="showParentTaskList"  
-                  title="更换任务的上级，实现任务搬家功能"
-                  icon="el-icon-upload2"
-                  v-loading="load.edit"
-                > 更换上级</el-button>    
-                <span style="float:right;"> 
-                 <el-button 
-                  type="primary"
-                  icon="el-icon-search"
-                  @click="searchXmTasks"
-                  >查询</el-button
-                >
-                </span>
-              </el-row> 
-            <el-button slot="reference" @click="moreVisible=!moreVisible">更多</el-button>
-          </el-popover> 
+                  </span>
+                </el-row> 
+              <el-button slot="reference" @click="moreVisible=!moreVisible">更多</el-button>
+            </el-popover> 
+          </span>
           </span>
         </el-row>
 
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 9fd80917..bf8d6892 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -58,7 +58,7 @@
             >
           </el-select>
           <el-input
-            style="width: 120px"
+            style="max-width: 200px"
             v-model="filters.key" clearable
             placeholder="计划/任务名称"
           >
@@ -948,7 +948,7 @@ export default {
   watch: {
     selProject: function (oval, val) {
       this.filters.selProject = this.selProject;
-      this.changeSelKey("all");
+      this.changeSelKey("");
     },
     menuId: function (menuId) {
       this.getXmTasks();