From 7b75012de9a4101b42904e8840c007d17eb8fad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 18 Feb 2023 02:04: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/xmQuestion/XmQuestionMng.vue      |  45 +++---
 src/views/xm/core/xmTask/XmTaskMng.vue        | 143 ++++++++----------
 2 files changed, 86 insertions(+), 102 deletions(-)

diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 6d4532a1..78b51164 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -24,11 +24,12 @@
 					width="800"
 					v-model="moreVisible"
 					trigger="manual" > 
+						<el-button @click="moreVisible=false" type="text" style="float:right;margin-top:-40px;"  icon="el-icon-close">关闭</el-button>
+
 						<el-descriptions class="margin-top"  :column="2" border>
-							<template slot="extra">
-								<el-button @click="moreVisible=false" type="text" style="float:right;margin-top:-40px;"  icon="el-icon-close">关闭</el-button>
+							<template slot="extra"> 
 								<el-button @click="handleExport"   icon="el-icon-download">导出</el-button>
-								<el-button   type="primary" style="float:right;" icon="el-icon-search" @click="searchXmQuestions">查询</el-button> 							</template>
+							</template>
 							<el-descriptions-item>
 								<template slot="label">
 									<i class="el-icon-user"></i>
@@ -49,7 +50,7 @@
 									需求
 								</template>
 								<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>
+									<el-tag  closable  @close="clearFiltersMenu()">{{filters.menus[0].menuName.substr(0,10)+'等('+filters.menus.length+')个'}}</el-tag>
 								</font>
 								<el-button v-else    @click="showMenu" type="plian" icon="el-icon-search">选需求</el-button>
 							</el-descriptions-item>
@@ -58,14 +59,14 @@
 									<i class="el-icon-question"></i>
 									缺陷编号
 								</template> 
-								<el-input v-model="filters.id" style="width:200px;" clearable></el-input>
+								<el-input v-model="filters.id"  clearable></el-input>
 							</el-descriptions-item>
 							<el-descriptions-item>
 								<template slot="label">
 									<i class="el-icon-top"></i>
 									优先级
 								</template>								
-								<mdp-select-dict   v-model="filters.priority" placeholder="请选择优先级" clearable style="width:200px;" :dict="dicts['priority']"/> 
+								<mdp-select-dict   v-model="filters.priority" placeholder="请选择优先级" clearable  :dict="dicts['priority']"/> 
 
 							</el-descriptions-item>
 							<el-descriptions-item>
@@ -73,7 +74,7 @@
 									<i class="el-icon-document-checked"></i>
 									解决方案
 								</template>
-								<mdp-select-dict  v-model="filters.solution" placeholder="请选择解决方案" clearable style="width:200px;" :dict="dicts['bugSolution']"/> 
+								<mdp-select-dict  v-model="filters.solution" placeholder="请选择解决方案" clearable  :dict="dicts['bugSolution']"/> 
 							</el-descriptions-item>
 							<el-descriptions-item>
 								<template slot="label">
@@ -111,6 +112,12 @@
 									:picker-options="pickerOptions"
 								></el-date-picker>
 							</el-descriptions-item>
+
+							<el-descriptions-item>
+								<el-button   type="primary" style="float:right;" icon="el-icon-search" @click="searchXmQuestions">查询</el-button>
+
+							</el-descriptions-item>
+
 						</el-descriptions>
 
 					<el-button  slot="reference" icon="el-icon-more" @click="moreVisible=!moreVisible"></el-button>
@@ -127,6 +134,7 @@
 				<!--列表 XmQuestion xm_question-->
 				<el-table  element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"  ref="table" :height="maxTableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  					<el-table-column  label="全选" type="selection" min-width="50"  fixed="left"></el-table-column>
+ 					
 					  <el-table-column prop="id" label="缺陷编号" width="120" show-overflow-tooltip fixed="left">
 						<template slot-scope="scope">  
 							{{scope.row.id}} 
@@ -279,6 +287,7 @@
 			const endDate = new Date();
 			beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
 			return {
+				batchOper:false,
 				filters: {
 					key: '',
 					bugStatus:'',
@@ -558,19 +567,14 @@
 					this.menuVisible=false
 					return;
 				}
-				this.menuVisible=false
-
-				this.filters.menus=menus;
-				this.searchXmQuestions();
+				this.menuVisible=false 
+				this.filters.menus=JSON.parse(JSON.stringify(menus)); 
 			},
-			clearFiltersMenu(menu){
-				var index=this.filters.menus.findIndex(i=>i.menuId==menu.menuId)
-				this.filters.menus.splice(index,1); 
+			clearFiltersMenu(){
+ 				this.filters.menus=[]
 			},
-			clearFiltersTag(tag){
-				var index=this.filters.tags.findIndex(i=>i.tagId==tag.tagId)
-				this.filters.tags.splice(index,1);
-				this.searchXmQuestions();
+			clearFiltersTag(){
+ 				this.filters.tags=[]
 			},
 			//显示编辑界面 XmQuestion xm_question
 			showEdit: function ( row,index ) {
@@ -979,9 +983,8 @@
 					if (!tags || tags.length == 0) { 
 						this.filters.tags=[]
 					}else{
-						this.filters.tags=tags
-					}
-					this.searchXmQuestions();
+						this.filters.tags=JSON.parse(JSON.stringify(tags))
+					} 
 				}
 				
 			}, 
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 075a7a4a..f3536d1b 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -65,11 +65,11 @@
 									type="text"
 									>关闭</el-button
 									> 
-							</el-row>
-              <el-divider></el-divider>
-              <el-row>
-                <font class="more-label-font">显示方式:</font
-                >   
+							</el-row> 
+              <el-descriptions class="margin-top"  :column="2" size="mini" border>
+
+              <el-descriptions-item :span="2">
+                <template slot="label">显示方式</template>   
                 <span class="more-label-font">
                     <el-radio v-model="displayType" label="grant" >甘特图</el-radio>
                     <el-radio v-model="displayType" label="agile">故事分组</el-radio>
@@ -77,27 +77,23 @@
                     <el-radio v-model="displayType" label="agileWeek">按周分组</el-radio>
                     <el-radio v-model="displayType" label="table">列表</el-radio> 
                 </span>
-              </el-row>
-              <el-divider></el-divider>
-              <el-row>
-                <el-col :span="12"> 
-                  <font class="more-label-font">责任人:</font> 
-                  <mdp-select-user-xm label="选择责任人" v-model="filters.createUser" :clearable="true"></mdp-select-user-xm> 
-                </el-col>
-                <el-col :span="12"> 
-                  <font class="more-label-font">执行人:</font> 
-                  <mdp-select-user-xm label="选择执行人" v-model="filters.executor" :clearable="true"></mdp-select-user-xm> 
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="12">
+              </el-descriptions-item> 
+              <el-descriptions-item> 
+                  <template slot="label">责任人</template> 
+                  <mdp-select-user-xm label="选择责任人" v-model="filters.createUser" :clearable="true"></mdp-select-user-xm>  
+                </el-descriptions-item>  
+                <el-descriptions-item>
+                  <template slot="label">执行人</template> 
+                  <mdp-select-user-xm label="选择执行人" v-model="filters.executor" :clearable="true"></mdp-select-user-xm>  
+              </el-descriptions-item>
+              <el-descriptions-item>  
+                <template slot="label">产品</template>
+                <xm-product-select :auto-select="false" :link-project-id="filters.selProject && filters.selProject.id?filters.selProject.id:null" @row-click="onProductSelected" @clear="onProductClearSelect"></xm-product-select>
+
+              </el-descriptions-item>  
+              <el-descriptions-item>
                   
-                <font class="more-label-font">产品:</font
-                > <xm-product-select :auto-select="false" :link-project-id="filters.selProject && filters.selProject.id?filters.selProject.id:null" @row-click="onProductSelected" @clear="onProductClearSelect"></xm-product-select>
-                </el-col>
-                <el-col :span="12">
-                  
-                <font class="more-label-font">需求:</font>
+                <template slot="label">需求</template>
                 <font v-if="filters.menus && filters.menus.length > 0">
                   <el-tag
                     v-for="(item, index) in filters.menus"
@@ -109,12 +105,10 @@
                 </font>
                 <el-button v-else @click="showMenuStory" type="plian" icon="el-icon-search"
                   >选需求</el-button
-                >
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="12">
-                  <font class="more-label-font">技能:</font>
+                > 
+              </el-descriptions-item>
+              <el-descriptions-item> 
+                  <template slot="label">技能</template>
                 <el-button
                   v-if="!filters.skillTags || filters.skillTags.length == 0"
                   icon="el-icon-search"
@@ -130,9 +124,9 @@
                   @close="skillTagClear(skill)"
                   >{{ skill.skillName }}</el-tag
                 >
-                </el-col>
-                <el-col :span="12">
-                    <font class="more-label-font">标签:</font>
+                </el-descriptions-item>  
+                <el-descriptions-item>
+                    <template slot="label">标签</template>
                   <el-button
                     v-if="!filters.tags || filters.tags.length == 0"
                     @click.native="$refs.tagDialog.open()" icon="el-icon-search"
@@ -142,31 +136,25 @@
                     v-else
                     @click="$refs.tagDialog.open()"
                     closable
-                    @close="clearFiltersTag(filters.tags[0])"
+                    @close="clearFiltersTag()"
                     >{{ filters.tags[0].tagName.substr(0, 5) }}等({{
                       filters.tags.length
                     }})个</el-tag
-                  >
-                </el-col>
-              </el-row>
-              <el-row> 
-                <el-col :span="12" > 
-                  
-                  <font class="more-label-font">众包任务:</font>
+                  > 
+              </el-descriptions-item>
+              <el-descriptions-item>  
+                  <template slot="label">众包任务</template>
 
                   <el-checkbox  class="more-label-font"
                     v-model="filters.taskOut"
                     true-label="1"
                     false-label=""
                     >只查众包</el-checkbox
-                  >
-                </el-col>
-              </el-row> 
+                  > 
+              </el-descriptions-item> 
               
-              <el-row>
-                <el-col :span="12">
-                  
-                  <font class="more-label-font">最后变动日期:</font>
+              <el-descriptions-item> 
+                  <template slot="label">最后变动日期</template>
                   <mdp-date-range
                     v-model="filters"
                     type="daterange" 
@@ -180,12 +168,10 @@
                     :default-time="['00:00:00', '23:59:59']" 
                     :auto-default="false"
                     key="ltime"
-                  ></mdp-date-range>
-                </el-col> 
-              </el-row> 
-              <el-row>
-                <el-col :span="12">
-                  <font class="more-label-font">计划开始时间:</font>
+                  ></mdp-date-range> 
+              </el-descriptions-item> 
+              <el-descriptions-item> 
+                  <template slot="label">计划开始时间</template>
                   <mdp-date-range
                     v-model="filters"
                     type="daterange" 
@@ -200,9 +186,9 @@
                     :auto-default="false"
                     key="planStartTime"
                   ></mdp-date-range>
-                </el-col>
-                <el-col :span="12">
-                  <font class="more-label-font">实际开始时间:</font>
+              </el-descriptions-item>  
+              <el-descriptions-item>
+                  <template slot="label">实际开始时间</template>
                 <mdp-date-range
                   v-model="filters"
                   type="daterange" 
@@ -215,13 +201,10 @@
                   value-format="yyyy-MM-dd HH:mm:ss" 
                   :default-time="['00:00:00', '23:59:59']" 
                   :auto-default="false"
-                ></mdp-date-range>
-                  
-                </el-col>
-              </el-row> 
-              <el-row>
-                <el-col :span="12">
-                  <font class="more-label-font">计划结束时间:</font>
+                ></mdp-date-range> 
+              </el-descriptions-item> 
+              <el-descriptions-item> 
+                  <template slot="label">计划结束时间</template>
                 <mdp-date-range
                   v-model="filters"
                   type="daterange" 
@@ -235,10 +218,11 @@
                   :default-time="['00:00:00', '23:59:59']" 
                   :auto-default="false" 
                   key="planEndTime"
-                ></mdp-date-range>
-                </el-col>
-                <el-col :span="12">
-                  <font class="more-label-font">实际结束时间:</font>
+                ></mdp-date-range> 
+                
+              </el-descriptions-item>  
+              <el-descriptions-item>
+                  <template slot="label">实际结束时间</template>
                 <mdp-date-range
                   v-model="filters"
                   type="daterange" 
@@ -251,17 +235,17 @@
                   value-format="yyyy-MM-dd HH:mm:ss" 
                   :default-time="['00:00:00', '23:59:59']" 
                   :auto-default="false"
-                ></mdp-date-range>
-                </el-col>
-              </el-row>  
-              <el-row>
+                ></mdp-date-range> 
+              </el-descriptions-item>  
+              <el-descriptions-item>
                 <el-button style="float:right;"
                   type="primary"
                   icon="el-icon-search"
                   @click="searchXmTasks"
                   >查询</el-button
                 >
-              </el-row>
+              </el-descriptions-item>
+            </el-descriptions> 
             <el-button   slot="reference" @click="moreVisible=!moreVisible">更多</el-button>
           </el-popover>
           <span style="float:right;">
@@ -1914,10 +1898,8 @@ export default {
       }
       this.editXmTaskSomeFields( row,fieldName,params) 
     },
-    clearFiltersTag(tag){
-      var index=this.filters.tags.findIndex(i=>i.tagId==tag.tagId)
-      this.filters.tags.splice(index,1);
-      this.searchXmTasks();
+    clearFiltersTag(){
+       this.filters.tags=[] 
     },
     onTagSelected(tags,option){
 				if(option && option.action=='editTagIds'){
@@ -1926,9 +1908,8 @@ export default {
 					if (!tags || tags.length == 0) {
 						this.filters.tags=[]
 					}else{
-						this.filters.tags=tags
-					}
-					this.searchXmTasks();
+						this.filters.tags=JSON.parse(JSON.stringify(tags))
+					} 
 				}
 
 			},