From 7fd15eae5c1261b650c978423d38fbbdfbfcc6ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 13 Jun 2021 17:41:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmIteration/XmIterationMng.vue    | 10 +--
 .../xmIterationMenu/XmIterationMenuMng.vue    |  8 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue        |  4 +
 src/views/xm/core/xmMenu/XmMenuSelect.vue     |  4 +-
 src/views/xm/core/xmMenu/XmMenuWithPlan.vue   |  3 +
 src/views/xm/core/xmProduct/XmProductMng.vue  |  5 +-
 .../xm/core/xmProduct/XmProductSelect.vue     | 78 +++++++++++++++++--
 src/views/xm/core/xmProject/XmProjectList.vue |  7 +-
 .../core/xmProjectPhase/XmProjectPhaseMng.vue |  7 +-
 .../xm/core/xmQuestion/XmQuestionCenter.vue   |  7 +-
 .../xm/core/xmQuestion/XmQuestionMng.vue      |  4 +
 src/views/xm/core/xmTask/XmTaskList.vue       |  7 +-
 .../xm/core/xmTask/XmTaskListForMenu.vue      |  7 +-
 .../xm/core/xmTask/XmTaskListForProduct.vue   |  7 +-
 .../xm/core/xmTestCase/XmTestCaseMng.vue      |  4 +
 .../core/xmTestCaseExec/XmTestCaseExecMng.vue |  4 +
 16 files changed, 125 insertions(+), 41 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index 7da52b1d..3320978b 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -62,7 +62,7 @@
 		
 		<el-row v-if="simple "> 
 			<!--列表 XmIteration 迭代定义-->
-			<el-table  :max-height="tableHeight" :data="xmIterationTreeData" row-key="id"  default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :max-height="tableHeight" :data="xmIterationTreeData" row-key="id"  default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
    				<el-table-column prop="iterationName" label="迭代名称" min-width="160" >
 					<template slot="header" slot-scope="scope">
 						迭代名称 <el-tag size="mini" v-if="editForm.iterationName" closable @close="clearSelectIteration()">{{editForm.seqNo}}&nbsp;{{editForm.iterationName}}</el-tag>
@@ -203,11 +203,9 @@
 					}  
 					params.orderBy= orderBys.join(",")
 				}
-				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
-				}
+				if(this.filters.key){
+					params.key= "%"+this.filters.key+"%"
+				} 
 				if(this.productId){
 					params.productId=this.productId
 				}
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index a915625c..fe929baa 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -138,11 +138,9 @@
 						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
 					}  
 					params.orderBy= orderBys.join(",")
-				}
-				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
+				} 
+				if(this.filters.key){
+					params.key='%'+this.filters.key+'%'
 				}
 				if(this.iteration){
 					params.iterationId=this.iteration.id
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index a5db21da..1249d417 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -360,6 +360,10 @@
 				if(!params.productId){
 					params.branchId=this.userInfo.branchId
 				}
+				
+				if( this.filters.key){
+					params.key="%"+this.filters.key+"%"
+				}
 				let callback= (res)=>{
 					var tips=res.data.tips;
 					if(tips.isOk){ 
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index e2f68a5e..bc33b257 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -171,7 +171,9 @@
 					return;
 					//params.xxx=xxxxx
 				} 
-				
+				if( this.filters.key){
+					params.key="%"+this.filters.key+"%"
+				}
 				if(this.excludeIterationId){
 					params.excludeIterationId=this.excludeIterationId
 				}
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index 1fc6d33d..94407324 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -292,6 +292,9 @@
 					params.projectId=this.selProject.id
 				}
 				
+				if( this.filters.key){
+					params.key="%"+this.filters.key+"%"
+				}
 				this.load.list = true;
 				listXmMenuWithPlan(params).then((res) => {
 					var tips=res.data.tips;
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 3e906bb5..6c78950e 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -206,10 +206,9 @@
 					}  
 					params.orderBy= orderBys.join(",")
 				}
+				
 				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
+					params.key="%"+this.filters.key+"%"
 				}
 				if(this.selProject){
 					params.projectId=this.selProject.id
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index b8161095..1fb18cc7 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -6,8 +6,54 @@
  				<el-table-column sortable type="index" width="55"></el-table-column>				
 				 <el-table-column prop="productName"  label="产品名称" min-width="150" > 
 					 <template slot="header" slot-scope="scope"> 
-						 产品名称 <el-input size="mini" v-model="filters.key" style="width:60%;"  placeholder="输入文字回车键搜索" @keyup.enter.native="searchXmProducts"> 
-						 </el-input> 
+						 产品名称 
+						 <el-popover
+							placement="top-start"
+							title=""
+							width="200"
+							trigger="click" >
+							<el-row>
+								<el-col :span="24" style="padding-top:5px;">
+									<font class="more-label-font">
+										产品查询范围：
+									</font>
+									<el-select size="mini" v-model="filters.queryScope" style="width:100%;"   placeholder="产品查询范围">
+										<el-option label="全公司" value="branchId"></el-option>
+										<el-option label="我相关" value="compete"></el-option>
+										<el-option label="产品编号" value="productId"></el-option>
+										<el-option label="智能匹配" value=""></el-option>
+									</el-select>
+								</el-col>
+								<el-col  :span="24"  style="padding-top:5px;">
+									<font class="more-label-font" v-if="filters.queryScope=='branchId'">
+										查询{{userInfo.branchName}}机构下所有的产品
+									</font>
+									<font class="more-label-font" v-else-if="filters.queryScope=='productId'">
+										产品编号精确查找：
+									</font>
+									<font class="more-label-font" v-else-if="filters.queryScope=='compete'">
+										自动计算与{{userInfo.username}}有关的产品
+									</font> 
+									<font class="more-label-font" v-else>
+										智能匹配
+									</font>
+									<el-input v-if="filters.queryScope=='productId'" size="mini" v-model="filters.id" style="width:100%;"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">  
+						 			</el-input> 
+								</el-col>
+								
+								<el-col  :span="24"  style="padding-top:5px;">
+									<font class="more-label-font">
+										模糊查询关键字:
+									</font> 
+									<el-input  size="mini" v-model="filters.key" style="width:100%;"  placeholder="输入产品名字关键字">  
+						 			</el-input> 
+								</el-col>
+								<el-col  :span="24"  style="padding-top:5px;">
+									<el-button size="mini" @click="searchXmProducts" >查询</el-button>
+								</el-col>
+							</el-row> 
+							<el-button  slot="reference" size="mini"  icon="el-icon-more" circle></el-button>
+						</el-popover>  
 					 </template>
 					<template slot-scope="scope">
 						{{scope.row.id}}&nbsp;&nbsp;<el-link type="primary">{{scope.row.productName}}</el-link>
@@ -42,7 +88,9 @@
 		data() {
 			return {
 				filters: {
-					key: ''
+					key: '',
+					queryScope:'compete',
+					id:'',//产品编号
 				},
 				xmProducts: [],//查询结果
 				pageInfo:{//分页数据
@@ -71,6 +119,7 @@
 				iterationVisible:false,
 				productStateVisible:false,
 				tableHeight:300,
+				
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -119,14 +168,28 @@
 					params.orderBy= orderBys.join(",")
 				}
 				if(this.filters.key!==""){
-					params.key=this.filters.key
+					params.key="%"+this.filters.key+"%"
 				}else{
 					//params.xxx=xxxxx
 				}
 				if(this.selProject){
 					params.projectId=this.selProject.id
 				}
-				params.branchId=this.userInfo.branchId
+				params.queryScope=this.filters.queryScope
+				if(this.filters.queryScope=='productId'){
+					if(!this.filters.id){
+						this.$message({ message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' });
+						return;
+					}
+					params.id=this.filters.id
+					
+				}
+				if(this.filters.queryScope=="branchId"){
+					params.branchId=this.userInfo.branchId
+					params.projectId=null;
+				}
+				
+
 				this.load.list = true;
 				listXmProductWithState(params).then((res) => {
 					var tips=res.data.tips;
@@ -172,4 +235,9 @@
 
 <style scoped>
 
+.more-label-font{
+	text-align:center;
+	float:left;
+	padding-top:10px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue
index 58e66bb0..bf1e2c5f 100644
--- a/src/views/xm/core/xmProject/XmProjectList.vue
+++ b/src/views/xm/core/xmProject/XmProjectList.vue
@@ -116,10 +116,9 @@
 					total: this.pageInfo.total,
 					count:this.pageInfo.count,
 				};
-				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
+
+				if(this.filters.key){
+					params.key='%'+this.filters.key+'%'
 				}
 				this.load.list = true; 
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index a3904e55..3c9232f4 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -377,10 +377,9 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 					}  
 					params.orderBy= orderBys.join(",")
 				}
-				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
+
+				if(this.filters.key){
+					params.key='%'+this.filters.key+'%'
 				}
 				if(this.selProject!=null && this.selProject!=undefined){
 					params.projectId=this.selProject.id
diff --git a/src/views/xm/core/xmQuestion/XmQuestionCenter.vue b/src/views/xm/core/xmQuestion/XmQuestionCenter.vue
index 0d0f2891..396b68e7 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionCenter.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionCenter.vue
@@ -150,10 +150,9 @@
 					}  
 					params.orderBy= orderBys.join(",")
 				}
-				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
+				
+				if(this.filters.key){
+					params.key='%'+this.filters.key+'%'
 				}
 				this.load.list = true;
 				listXmQuestion(params).then((res) => {
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index e5804759..0e36f2ba 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -350,6 +350,10 @@
 				if(this.xmTestCase){
 					params.caseId=this.xmTestCase.id
 				}
+				
+				if(this.filters.key){
+					params.key='%'+this.filters.key+'%'
+				}
 				params.qtype=this.qtype
 				listXmQuestion(params).then((res) => {
 					var tips=res.data.tips;
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index 9e389959..c109f8ad 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -209,9 +209,10 @@
 					}  
 					params.orderBy= orderBys.join(",")
 				}
-				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				} 
+
+				if(this.filters.key){
+					params.key='%'+this.filters.key+'%'
+				}
 				if(this.filters.taskType!="all" && this.filters.taskType!="" && this.filters.taskType!=null){
 					params.taskType=this.filters.taskType
 				} 
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index e1be6499..1cc4b0b0 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -207,9 +207,10 @@
 					}  
 					params.orderBy= orderBys.join(",")
 				}
-				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				} 
+
+				if(this.filters.key){
+					params.key='%'+this.filters.key+'%'
+				}
 				if(this.filters.taskType!="all" && this.filters.taskType!="" && this.filters.taskType!=null){
 					params.taskType=this.filters.taskType
 				} 
diff --git a/src/views/xm/core/xmTask/XmTaskListForProduct.vue b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
index 2df0b793..a9a2b7ce 100644
--- a/src/views/xm/core/xmTask/XmTaskListForProduct.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
@@ -234,9 +234,10 @@
 					}  
 					params.orderBy= orderBys.join(",")
 				}
-				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				} 
+
+				if(this.filters.key){
+					params.key='%'+this.filters.key+'%'
+				}
 				if(this.filters.taskType!="all" && this.filters.taskType!="" && this.filters.taskType!=null){
 					params.taskType=this.filters.taskType
 				} 
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 7aa64530..c7c7db13 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -169,6 +169,10 @@
  				}else{
 					//params.xxx=xxxxx
 				}
+				
+				if(this.filters.key){
+					params.key='%'+this.filters.key+'%'
+				}
 				this.load.list = true;
 				listXmTestCase(params).then((res) => {
 					var tips=res.data.tips;
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 5f909671..8f56d9c2 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -299,6 +299,10 @@
  				}else{
 					//params.xxx=xxxxx
 				}
+				
+				if(this.filters.key){
+					params.key='%'+this.filters.key+'%'
+				}
 				this.load.list = true;
 				listXmTestCaseExec(params).then((res) => {
 					var tips=res.data.tips;