From aa6ca0370ce02a3b190fba9b75744b9c3b755518 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 21:54:01 +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/components/XmIterationSelect.vue      |  2 +-
 src/views/xm/core/components/XmProductSelect.vue  |  2 +-
 src/views/xm/core/components/XmProjectSelect.vue  |  2 +-
 src/views/xm/core/xmTestPlan/XmTestPlanSelect.vue | 15 ++++++++++-----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue
index ed83c66d..80d8facf 100644
--- a/src/views/xm/core/components/XmIterationSelect.vue
+++ b/src/views/xm/core/components/XmIterationSelect.vue
@@ -118,7 +118,7 @@
 				<el-pagination  layout="total, prev,  next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>
 
 			</el-row>
-			<el-link title="点击选中迭代" @click="referenceClick"  type="primary" slot="reference" icon="el-icon-connection"><font style="font-size:14px;"><slot name="title">{{editForm&&editForm.id?editForm.iterationName:'选择迭代'}}</slot></font></el-link> 
+			<el-link title="点击选中迭代" @click="referenceClick"  type="primary" slot="reference" icon="el-icon-connection"><font style="font-size:14px;"><slot name="title">{{editForm&&editForm.id?editForm.iterationName:'选择迭代'}} &nbsp;&nbsp;<el-button v-if="editForm&&editForm.id" type="text" plain icon="el-icon-circle-close" @click.stop="clearSelectIteration">清除</el-button></slot></font></el-link> 
 		</el-popover> 
 		
 	
diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index 41c840e0..0e2f9a5f 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -194,7 +194,7 @@
             <slot name="title">
                {{
               editForm && editForm.id ? editForm.productName : "选择产品"
-            }}</slot>
+            }} &nbsp;&nbsp;<el-button v-if="editForm&&editForm.id" type="text" plain icon="el-icon-circle-close" @click.stop="clearSelect">清除</el-button></slot>
             </span>
             </el-link
         >
diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index 376e79aa..dbe65537 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -194,7 +194,7 @@
              <span class="title">
             <slot name="title">{{
                 editForm && editForm.id ? editForm.name: "选择项目"
-              }}</slot></span>
+              }}&nbsp;&nbsp;<el-button v-if="editForm&&editForm.id" type="text" plain icon="el-icon-circle-close" @click.stop="clearSelect">清除</el-button></slot></span>
               </el-link>
         </slot>
       </span>
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanSelect.vue b/src/views/xm/core/xmTestPlan/XmTestPlanSelect.vue
index 2598a2e8..eda2278d 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanSelect.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanSelect.vue
@@ -24,7 +24,7 @@
 				</el-table-column>  
 				<el-table-column prop="status" label="状态" width="120" show-overflow-tooltip>
 				    <template slot-scope="scope"> 
-                        <mdp-select-dict-tag :dict="dicts['testPlanStatus']" v-model="scope.row.status" effect="dark" @change="editSomeFields(scope.row,'status',$event)"></mdp-select-dict-tag> 
+                        <mdp-select-dict-tag :dict="dicts['testPlanStatus']" v-model="scope.row.status" effect="dark" :disabled="true"></mdp-select-dict-tag> 
                    </template>
 				</el-table-column> 
 				<el-table-column prop="stime" label="开始时间"  width="120" show-overflow-tooltip>
@@ -60,7 +60,7 @@ export default {
     name:'xmTestPlanSelect',
     components: { 
     },
-    props:['xmTestCasedb'],
+    props:['casedbId','productId','projectId'],
     computed: {
         ...mapGetters(['userInfo']),
 
@@ -159,10 +159,15 @@ export default {
                 params.key=this.filters.key
             }
 
-            if(this.xmTestCasedb && this.xmTestCasedb.id){
-                params.casedbId=this.xmTestCasedb.id
+            if(this.projectId){
+                params.projectId=this.projectId
+            }
+            if(this.casedbId){
+                params.casedbId=this.casedbId
+            } 
+            if(this.productId){
+                params.productId=this.productId
             }
-
             this.load.list = true;
             listXmTestPlan(params).then((res) => {
                 var tips=res.data.tips;