From a317fa43193d1caa85abc7357c5d885a22e8190a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 10 Aug 2022 15:35:17 +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

---
 .../core/components/MdpSelectUserXm/index.vue |  8 +++---
 src/views/xm/core/xmMenu/XmEpicFeatures.vue   | 23 ++++++++-------
 src/views/xm/core/xmMenu/XmMenuMng.vue        | 28 +++++++++----------
 .../xm/core/xmQuestion/XmQuestionMng.vue      |  8 +++---
 src/views/xm/core/xmTask/XmTaskEdit.vue       |  2 +-
 src/views/xm/core/xmTask/XmTaskMng.vue        |  8 +++---
 6 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/src/views/xm/core/components/MdpSelectUserXm/index.vue b/src/views/xm/core/components/MdpSelectUserXm/index.vue
index 716346bd..9898ebc7 100644
--- a/src/views/xm/core/components/MdpSelectUserXm/index.vue
+++ b/src/views/xm/core/components/MdpSelectUserXm/index.vue
@@ -163,7 +163,7 @@
     methods: {    
         
       
-        isEmpty(v) { 
+        isEmpty(v) {  
           switch (typeof v) {
           case 'undefined':
               return true;
@@ -172,9 +172,9 @@
               break; 
           case 'object':
               if (null === v || v.length === 0) return true;
-              for (var i in v) {
-                  return false;
-              }
+               if(v.userid){
+                return false;
+               }
               return true;
           }
           return false;
diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index 599798c6..48d84a04 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -42,7 +42,7 @@
 						<el-popover
 							placement="top-start"
 							title="更多操作"
-							width="500"
+							width="400"
 							trigger="manual"
 							v-model="moreVisible"
 						>
@@ -53,8 +53,8 @@
 									type="text"
 									>关闭</el-button
 									> 
-							</el-row> 
-							<el-row> 
+							</el-row>  
+							<el-divider></el-divider>
 							<el-row> 
 							
 								<el-button type="primary"  @click="showParentMenu" icon="el-icon-top" title="更换上级">更换上级</el-button> 
@@ -66,9 +66,13 @@
 									>批量删除</el-button
 								>
 								<el-button          @click="loadTasksToXmMenuState" icon="el-icon-s-marketing" title="汇总进度">汇总进度</el-button> 
- 
-							</el-row> 
-							</el-row> 
+							</el-row>
+							<el-divider></el-divider>
+
+							<el-row> 
+								<el-input style="width:250px;" v-model="filters.key" placeholder="名称模糊查询"  clearable></el-input> 
+								<el-button    type="primary"      @click="searchXmMenus" icon="el-icon-search" title="查询" style="float:right;">查询</el-button> 
+							</el-row>  
 							<el-button slot="reference" @click="moreVisible=!moreVisible" icon="el-icon-more"></el-button>
 						</el-popover> 
 						</span>
@@ -1026,12 +1030,7 @@
 </script>
 
 <style lang="scss" scoped>
-
-.more-label-font{
-	text-align:center;
-	float:left;
-	padding-top:5px;
-}
+ 
 .align-right{
 	float: right;
 }
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 137da9a9..8e49412c 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -49,12 +49,18 @@
 									</font>
 									<xm-iteration-select v-if="!xmIteration || !xmIteration.id" style="display:inline;" :auto-select="false"  :product-id="filters.product?filters.product.id:null" :link-project-id="selProject?selProject.id:null"   placeholder="迭代"  @row-click="onIterationSelected" @clear="onIterationClearSelect">
 					    			</xm-iteration-select> 
+								</el-row> 
+								<el-row>
+									<font class="more-label-font">标签条件:</font>
+									<el-button  v-if="!filters.tags||filters.tags.length==0" @click.native="$refs.tagDialog.open()" icon="el-icon-search">标签</el-button>
+									<el-tag v-else @click="$refs.tagDialog.open()"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
+
 								</el-row>
 								<el-row>
 									<font class="more-label-font">
 										是否加入迭代:
 									</font>
-									<el-select   v-model="filters.iterationFilterType" placeholder="加入过迭代？" clearable   >
+									<el-select   v-model="filters.iterationFilterType" placeholder="加入过迭代？" clearable  style="width: 200px;" >
 										<el-option   value="not-join-any-iteration"  label="未加入过迭代"></el-option>
 										<el-option   value="join-any-iteration"  label="已加入过迭代"></el-option>
 										<el-option   value="not-join-curr-iteration"  :label="'未加入迭代【'+filters.iteration.iterationName+'】'"  v-if="filters.iteration && filters.iteration.id"></el-option>
@@ -65,24 +71,18 @@
 									<font class="more-label-font">
 										是否分配任务:
 									</font>
-									<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable >
+									<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable style="width: 200px;">
 										<el-option   value="not-join-any-project"  label="未分配过任务的需求"></el-option>
 										<el-option   value="join-any-project"  label="已分配过任务的需求"></el-option>
 										<el-option   value="not-join-curr-project"  :label="'未分配任务到项目【'+selProject.name+'】'" v-if="selProject && selProject.id"></el-option>
 										<el-option   value="join-curr-project"  :label="'已分配任务到项目【'+selProject.name+'】'"  v-if="selProject && selProject.id"></el-option>
 									</el-select>
 								</el-row> 
-								<el-row>
-									<font class="more-label-font">标签条件:</font>
-									<el-button  v-if="!filters.tags||filters.tags.length==0" @click.native="$refs.tagDialog.open()">标签</el-button>
-									<el-tag v-else @click="$refs.tagDialog.open()"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
-
-								</el-row>
 								<el-row>
 									<font class="more-label-font">
 										需求类型:
 									</font>
-									<el-select  v-model="filters.dtype" clearable placeholder="需求类型" style="width: 120px;">
+									<el-select  v-model="filters.dtype" clearable placeholder="需求类型" style="width: 200px;">
 										<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 									</el-select>
 								</el-row>
@@ -90,7 +90,7 @@
 									<font class="more-label-font">
 										需求来源:
 									</font>
-									<el-select v-model="filters.source" placeholder="需求来源"  clearable style="width: 120px;">
+									<el-select v-model="filters.source" placeholder="需求来源"  clearable style="width: 200px;">
 										<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
 									</el-select>
 								</el-row>
@@ -98,7 +98,7 @@
 									<font class="more-label-font">
 										需求层次:
 									</font>
-									<el-select v-model="filters.dlvl" placeholder="需求层次"  clearable style="width: 120px;">
+									<el-select v-model="filters.dlvl" placeholder="需求层次"  clearable style="width: 200px;">
 										<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
 									</el-select>
 								</el-row>
@@ -106,7 +106,7 @@
 									<font class="more-label-font">
 										优先级:
 									</font>
-									<el-select v-model="filters.priority" placeholder="优先级"  clearable style="width: 100px;">
+									<el-select v-model="filters.priority" placeholder="优先级"  clearable style="width: 200px;">
 											<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
 									</el-select>
 								</el-row>
@@ -114,7 +114,7 @@
 									<font class="more-label-font">
 										需求状态:
 									</font>
-									<el-select v-model="filters.status" placeholder="需求状态" clearable style="width: 100px;">
+									<el-select v-model="filters.status" placeholder="需求状态" clearable style="width: 200px;">
 										<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option>
 									</el-select>
 								</el-row>
@@ -122,7 +122,7 @@
 									<font class="more-label-font">
 										需求编号:
 									</font>
-									<el-input v-model="filters.menuId" style="width: 220px;" placeholder="需求编号查询" clearable></el-input>
+									<el-input v-model="filters.menuId" style="width: 200px;" placeholder="需求编号查询" clearable></el-input>
 								</el-row> 
 								<el-row>
 									<font class="more-label-font">开始时间:</font>
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 2f296be3..d65b7642 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -43,14 +43,14 @@
 						</el-row>
 						<el-row>
 							<font class="more-label-font">指派给:</font>
-							<mdp-select-user-xm label="选择创建者" v-model="filters.handlerUser" :clearable="true"></mdp-select-user-xm>   
+							<mdp-select-user-xm label="选择负责人" v-model="filters.handlerUser" :clearable="true"></mdp-select-user-xm>   
 						</el-row> 
 						<el-row>
 								<font class="more-label-font">需求:</font>
 							<font  v-if="  filters.menus && filters.menus.length>0">
 								<el-tag  v-for="(item,index) in filters.menus" :key="index"  closable  @close="clearFiltersMenu(item)">{{item.menuName.substr(0,10)}}</el-tag>
 							</font>
-							<el-button v-else    @click="showMenu" type="plian">选需求</el-button>
+							<el-button v-else    @click="showMenu" type="plian" icon="el-icon-search">选需求</el-button>
 						</el-row> 
 						<el-row>
 								<font class="more-label-font">缺陷编号:</font>  
@@ -58,14 +58,14 @@
 						</el-row>
 						<el-row>
 							<font class="more-label-font">优先级:</font>  
-							<el-select   v-model="filters.priority" placeholder="请选择优先级" clearable>
+							<el-select   v-model="filters.priority" placeholder="请选择优先级" clearable style="width:200px;">
 								<el-option v-for="(b,index) in dicts['priority']" :value="b.id" :key="index" :label="b.name">{{b.name}}
 								</el-option>
 							</el-select>
 						</el-row>
 						<el-row>
 							<font class="more-label-font">解决方案:</font>  
-							<el-select  v-model="filters.solution" placeholder="请选择解决方案" clearable>
+							<el-select  v-model="filters.solution" placeholder="请选择解决方案" clearable style="width:200px;">
 								<el-option v-for="(b,index) in dicts['bugSolution']" :value="b.id" :key="index" :label="b.name">{{b.name}}
 								</el-option>
 							</el-select>
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 058c96d9..a1f29878 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -157,7 +157,7 @@
 							</el-col> 
 							<el-col :span="8">   
 								<mdp-field-x v-model="editForm.rate" label="进度"> 
-									<div slot="value" style="min-width:150px;"><el-progress  :percentage="editForm.rate"></el-progress></div>
+									<div slot="value" style="min-width:150px;"><el-progress  :percentage="editForm.rate?editForm.rate:0"></el-progress></div>
 									<el-button slot="oper" @click="activateTabPaneName='5'" type="primary">去填写工时</el-button>
 								</mdp-field-x>  
 							</el-col> 
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 4e544634..f24c57f3 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -118,7 +118,7 @@
                     >{{ item.menuName.substr(0, 10) }}</el-tag
                   >
                 </font>
-                <el-button v-else @click="showMenuStory" type="plian"
+                <el-button v-else @click="showMenuStory" type="plian" icon="el-icon-search"
                   >选需求</el-button
                 >
               </el-row>
@@ -128,7 +128,7 @@
                   v-if="!filters.skillTags || filters.skillTags.length == 0"
                   icon="el-icon-search"
                   @click="showSkillSelect"
-                  >技能</el-button
+                  >选技能</el-button
                 >
                 <el-tag
                   v-else
@@ -144,8 +144,8 @@
                 <font class="more-label-font">标签:</font>
                 <el-button
                   v-if="!filters.tags || filters.tags.length == 0"
-                  @click.native="$refs.tagDialog.open()"
-                  >标签</el-button
+                  @click.native="$refs.tagDialog.open()" icon="el-icon-search"
+                  >选标签</el-button
                 >
                 <el-tag
                   v-else