From 828e83e25c438661428ce699c0031cccfeb9b422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 27 Jan 2023 20:28:04 +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/rpt/testPlan/testCaseToPlanCalc.vue    | 15 ++++++--------
 .../xm/rpt/testPlan/testDayTimesCalc.vue      | 20 +++++++++++--------
 .../testPlan/testPlanCaseExecStatusDist.vue   | 13 +++++-------
 .../xm/rpt/testPlan/testPlanCaseUserDist.vue  | 13 +++++-------
 4 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
index a33720f6..458a65ad 100644
--- a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
+++ b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
@@ -11,9 +11,11 @@
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding">   
-						
-						
+					<el-form  :model="filters" class="padding">    
+						<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 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>
@@ -24,13 +26,8 @@
 							</span> 
 						</el-form-item>  
 						<el-form-item label="测试计划" v-else-if="filters.product && filters.product.id">
-							<span v-if="filters.testPlan">{{ filters.testPlan.name }}</span><el-button type="primary" @click="$refs['xmTestPlanSelectRef'].open()">选择计划</el-button>
+							<span v-if="filters.testPlan">{{ filters.testPlan.name }}</span><el-button type="primary" @click="$refs['xmTestPlanSelectRef'].open()" plain>选择计划</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>  
diff --git a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
index 2540f0ef..f7d49144 100644
--- a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
+++ b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
@@ -12,18 +12,22 @@
 				</el-col>
 				<el-col :span="6" class="border">
 					<el-form :model="filters" class="padding"> 
-						
+						    
+						<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 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="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
 							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
 						</el-form-item>
-					<el-form-item label="日期区间">
-						<br>
-							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startExecDate" end-key="endExecDate"></mdp-date-range>
-  					</el-form-item>    
-					<el-form-item>
-						 <el-button type="primary" icon="el-icon-search" @click="getXmTestDayTimesList">查询</el-button>
-					</el-form-item>  
+						<el-form-item label="日期区间">
+							<br>
+								<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startExecDate" end-key="endExecDate"></mdp-date-range>
+						</el-form-item>    
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="getXmTestDayTimesList">查询</el-button>
+						</el-form-item>  
 					</el-form>
 				</el-col>
 			</el-row>
diff --git a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
index 3a545958..33d3cc86 100644
--- a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
+++ b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
@@ -11,9 +11,11 @@
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding">   
-						
-						
+					<el-form  :model="filters" class="padding">    
+						<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 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,11 +28,6 @@
 						<el-form-item label="测试计划" v-else-if="filters.product && filters.product.id">
 							<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>  
diff --git a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
index d0d1087c..e92f8f7b 100644
--- a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
+++ b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
@@ -11,8 +11,11 @@
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding">   
-						
+					<el-form  :model="filters" class="padding">    
+						<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 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>
@@ -25,12 +28,6 @@
 						<el-form-item label="测试计划" v-else-if="filters.product && filters.product.id">
 							<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>