From 197bbbf5a2a2da399d1a24cae1f2eb4f4421b7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 31 Jan 2023 00:01:47 +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/XmQuestionEdit.vue     |  2 +-
 .../xm/core/xmTestPlan/XmTestPlanEdit.vue     |  3 +++
 .../xm/core/xmTestPlan/XmTestPlanMng.vue      |  4 ++++
 .../xmTestPlanCase/XmTestPlanCaseSelect.vue   | 21 ++++++++++++-------
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index b8c739c4..d8665ae5 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -197,7 +197,7 @@
 			</el-dialog>
 			
 			<el-dialog append-to-body title="执行用例选择"  :visible.sync="caseVisible" width="80%" top="20px"  :close-on-click-modal="false">
-				<xm-test-plan-case-mng  v-if="caseVisible" :select="true" :visible="caseVisible" :xm-test-plan="xmTestPlan" :xm-product="editForm.productId?{id:editForm.productId,productName:editForm.productName}:xmProductCpd" @select="onTestPlanCaseSelected" ></xm-test-plan-case-mng>
+				<xm-test-plan-case-mng  v-if="caseVisible" :select="true" :visible="caseVisible" :xm-project="selProject&&selProject.id?selProject:(editForm.projectId?{id:editForm.projectId}:null)" :xm-test-plan="xmTestPlan" :xm-product="editForm.productId?{id:editForm.productId,productName:editForm.productName}:xmProductCpd" @select="onTestPlanCaseSelected" ></xm-test-plan-case-mng>
 			</el-dialog>
 	</section>
 </template>
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue b/src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue
index 31bb5dea..e3dbb2bd 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue
@@ -16,6 +16,9 @@
 				 <el-form-item prop="name" label-width="0px">
 				  <el-row class="padding-bottom">
 					<my-input v-model="editForm.name" placeholder="计划名称" :maxlength="255" @change="editSomeFields(editForm,'name',$event)"></my-input>
+ 				  </el-row>
+				   <el-row >
+					 <span class="label-font-color padding-left">测试计划编号:{{ editForm.id }}</span>
  				  </el-row>
 				  </el-form-item>
 				<el-row class="padding">
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
index 27c628fb..11eddd2b 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
@@ -27,6 +27,8 @@
                          <el-button type="primary" @click="showEdit( scope.row,scope.$index)" icon="el-icon-edit"  circle title="编辑用例"></el-button> 
                         </span>
                     </template>
+				</el-table-column>  
+                <el-table-column prop="projectName" label="项目" min-width="120" show-overflow-tooltip> 
 				</el-table-column> 
                 <el-table-column prop="cusername" label="负责人" min-width="120" show-overflow-tooltip>
 				    <template slot-scope="scope"> 
@@ -34,6 +36,8 @@
                                     </mdp-select-user-xm>
                     </template>
 				</el-table-column> 
+                <el-table-column prop="totalCases" label="用例数" width="120" show-overflow-tooltip> 
+				</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> 
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue
index 5c933a99..45cc7e6d 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue
@@ -7,7 +7,8 @@
             </el-col>
             <el-col :span="(xmTestCase&&xmTestCase.id)?24:18">
                 <el-row>
-                    <el-input v-model="filters.key" style="width:40%;" placeholder="模糊查询"  clearable></el-input>
+                    <el-input v-model="filters.key" style="width:30%;" placeholder="模糊查询"  clearable></el-input>
+                    <el-input v-model="filters.caseId" style="width:20%;" placeholder="用例编号"  clearable></el-input>
                     <el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTestPlanCases" icon="el-icon-search">查询</el-button> 
                 </el-row>
                 <el-row>
@@ -18,16 +19,19 @@
                             <span class="cell-text">  {{scope.row.username}}}  </span>
                             <span class="cell-bar"><el-input style="display:inline;" v-model="scope.row.username" placeholder="" @change="editSomeFields(scope.row,'username',$event)" :maxlength="22"></el-input></span>
                         </el-table-column>
-                        -->                         
-                        <el-table-column prop="caseName" label="用例名称" min-width="350"> 
-                        </el-table-column>	
+                        -->       
+                        
+                        <el-table-column prop="planId" label="测试计划" width="150" sortable> 
+                        </el-table-column>	                  
+                        <el-table-column prop="caseName" label="用例名称" min-width="250"> 
+                        </el-table-column>	    
                         <el-table-column prop="caseStatus" label="用例状态" width="100" show-overflow-tooltip>
                             <template slot-scope="scope"> 
                                 <mdp-select-dict-tag :dict="dicts['testCaseStatus']" v-model="scope.row.caseStatus" effect="dark" :disabled="true"></mdp-select-dict-tag> 
                             </template>
                         </el-table-column>    
                         
-                        <el-table-column prop="execStatus" label="执行结果" width="120" show-overflow-tooltip>
+                        <el-table-column prop="execStatus" label="执行结果" width="100" show-overflow-tooltip>
                             <template slot-scope="scope"> 
                                 <mdp-select-dict-tag :dict="dicts['testStepTcode']" v-model="scope.row.execStatus" effect="dark" :disabled="true"></mdp-select-dict-tag> 
                             </template>
@@ -43,7 +47,7 @@
                                 <mdp-select-dict-tag :dict="dicts['priority']" v-model="scope.row.priority" :disabled="true"></mdp-select-dict-tag>  
                             </template>
                         </el-table-column>
-                        <el-table-column  label="操作" width="150" fixed="right">
+                        <el-table-column  label="操作" width="100" fixed="right">
                             <template slot-scope="scope">
                                 <el-button type="primary" @click="$emit('select',scope.row)">选择</el-button>
                             </template>
@@ -70,7 +74,7 @@ export default {
     components: {
         XmFuncSelect,MdpSelectUserXm,
     },
-    props:['visible','xmTestPlan','xmTestCasedb','xmTestCase','xmProduct','select'],
+    props:['visible','xmTestPlan','xmTestCasedb','xmTestCase','xmProduct','select','xmProject'],
     computed: {
         ...mapGetters(['userInfo']),
         xmProductCpd(){ 
@@ -199,6 +203,9 @@ export default {
             if(this.xmProductCpd && this.xmProductCpd.id){
                 params.productId=this.xmProductCpd.id
             }
+            if(this.xmProject && this.xmProject.id){
+                params.projectId=this.xmProject.id
+            }
             params.caseStatus="2"
             this.load.list = true;
             listXmTestPlanCase(params).then((res) => {