From 72496b30e52dc942a8ca5cffbf3270a4c89b777b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 26 Jan 2023 18:41:45 +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

---
 .../testPlan/testPlanCaseExecStatusDist.vue    | 18 ++++++++++++++++--
 .../xm/rpt/testPlan/testPlanCaseUserDist.vue   | 17 +++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
index 3613ba0a..04e5d7dd 100644
--- a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
+++ b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
@@ -13,6 +13,7 @@
 				<el-col :span="6" class="border padding">
 					<el-form  :model="filters">   
 						
+						
 						<el-form-item label="归属产品"  >
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmTestPlan?xmTestPlan.id:null"  @clear="onProductClear"></xm-product-select>
 							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
@@ -26,6 +27,10 @@
 							<span v-if="filters.testPlan">{{ filters.testPlan.name }}</span><el-button type="primary" @click="$refs['xmTestPlanSelectRef'].open()">选择计划</el-button>
 						</el-form-item> 
 						 
+						<el-form-item label="归属项目"  >
+							<xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-product-id="xmProductCpd?xmProductCpd.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
+							<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span>
+						</el-form-item>
 					<el-form-item>
 						 <el-button type="primary" icon="el-icon-search" @click="searchXmTestPlanCaseExecStatusDist">查询</el-button>
 					</el-form-item>  
@@ -46,13 +51,14 @@
 	  
 	import { getXmTestPlanCaseExecStatusDist } from '@/api/xm/core/xmTestPlanCase';
 	
-	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//新增界面
+	import  XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//项目
+	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品
 	import  xmTestPlanSelect from '@/views/xm/core/xmTestPlan/XmTestPlanSelect';//计划选择器
 
 	export default { 
         
 		components: {   
-			XmProductSelect,xmTestPlanSelect,
+			XmProjectSelect,XmProductSelect,xmTestPlanSelect,
 		},
         props:['xmProject','xmProduct','xmTestCasedb','xmTestPlan'],
 		computed: {
@@ -208,6 +214,14 @@
 				
 			},
 			
+			onProjectSelected(project){
+				this.filters.project=project
+			},
+			
+			onProjectClear(){
+				this.filters.project=null
+				
+			},
 			onXmTestPlanSelected(xmTestPlan){
 				this.filters.testPlan=xmTestPlan
 			},
diff --git a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
index b042b455..7dd7df2e 100644
--- a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
+++ b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
@@ -26,6 +26,11 @@
 							<span v-if="filters.testPlan">{{ filters.testPlan.name }}</span><el-button type="primary" @click="$refs['xmTestPlanSelectRef'].open()">选择计划</el-button>
 						</el-form-item> 
 						 
+						 
+						<el-form-item label="归属项目"  >
+							<xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-product-id="xmProductCpd?xmProductCpd.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
+							<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span>
+						</el-form-item>
 					<el-form-item>
 						 <el-button type="primary" icon="el-icon-search" @click="searchXmTestPlanCaseUserDist">查询</el-button>
 					</el-form-item>  
@@ -45,14 +50,15 @@
 	import { mapGetters } from 'vuex'	 
 	  
 	import { getXmTestPlanCaseUserDist } from '@/api/xm/core/xmTestPlanCase';
-	
+
+	import  XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//项目 
  	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//新增界面
 	import  xmTestPlanSelect from '@/views/xm/core/xmTestPlan/XmTestPlanSelect';//计划选择器
 
 	export default { 
         
 		components: {   
-			XmProductSelect,xmTestPlanSelect,
+			XmProjectSelect,XmProductSelect,xmTestPlanSelect,
 		},
         props:['xmProject','xmProduct','xmTestCasedb','xmTestPlan'],
 		computed: {
@@ -219,8 +225,15 @@
 			onProductClear(){
 				this.filters.product=null
 				
+			}, 
+			onProjectSelected(project){
+				this.filters.project=project
 			},
 			
+			onProjectClear(){
+				this.filters.project=null
+				
+			},
 			onXmTestPlanSelected(xmTestPlan){
 				this.filters.testPlan=xmTestPlan
 			},