From 115780968729981d6a9127d481fed28a7a5e53d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 1 Feb 2023 16:11:52 +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

---
 src/api/xm/core/xmTestCase.js                 |  2 +-
 src/api/xm/core/xmTestPlan.js                 |  2 +-
 src/api/xm/core/xmTestPlanCase.js             |  2 +-
 src/components/MdpSelectDict/index.vue        |  3 ++-
 src/styles/mdp.scss                           |  2 +-
 src/views/xm/core/xmFunc/XmFuncSelect.vue     | 12 ++++-----
 .../xm/core/xmQuestion/XmQuestionEdit.vue     |  9 +++++--
 .../xm/core/xmTestCase/XmTestCaseMng.vue      | 15 ++++++++---
 .../xm/core/xmTestCase/XmTestCaseSelect.vue   | 19 +++++++++++++-
 .../xm/core/xmTestPlan/XmTestPlanEdit.vue     |  2 +-
 .../xm/core/xmTestPlan/XmTestPlanMng.vue      | 15 +++++++++--
 .../core/xmTestPlanCase/XmTestPlanCaseMng.vue | 12 +++++++++
 .../xmTestPlanCase/XmTestPlanCaseSelect.vue   | 26 +++++++++++++++----
 13 files changed, 95 insertions(+), 26 deletions(-)

diff --git a/src/api/xm/core/xmTestCase.js b/src/api/xm/core/xmTestCase.js
index 1f12b7bc..8784aa75 100644
--- a/src/api/xm/core/xmTestCase.js
+++ b/src/api/xm/core/xmTestCase.js
@@ -35,7 +35,7 @@ export const editSomeFieldsXmTestCase = params => { return axios.post(`${base}/x
 /**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */
 //初始化页面上的字典
 export const initDicts = (that) => {
- var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority','testCaseStatus','caseType'];//在此添加要加载的字典 如['sex','grade','lvl']
+ var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority','testCaseStatus','caseType','testType'];//在此添加要加载的字典 如['sex','grade','lvl']
  if(itemCodes.length>0){
     initSimpleDicts('all',itemCodes).then(res=>{
         Object.assign(that.dicts,res.data.data)
diff --git a/src/api/xm/core/xmTestPlan.js b/src/api/xm/core/xmTestPlan.js
index 239b9b36..539e558e 100644
--- a/src/api/xm/core/xmTestPlan.js
+++ b/src/api/xm/core/xmTestPlan.js
@@ -36,7 +36,7 @@ export const calcXmTestPlan = params => { return axios.post(`${base}/xm/core/xmT
 /**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */
 //初始化页面上的字典
 export const initDicts = (that) => {
- var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority','bizFlowState'];//在此添加要加载的字典 如['sex','grade','lvl']
+ var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority','bizFlowState','testType'];//在此添加要加载的字典 如['sex','grade','lvl']
  if(itemCodes.length>0){
     initSimpleDicts('all',itemCodes).then(res=>{
         Object.assign(that.dicts,res.data.data)
diff --git a/src/api/xm/core/xmTestPlanCase.js b/src/api/xm/core/xmTestPlanCase.js
index c773710e..a8ac2a8b 100644
--- a/src/api/xm/core/xmTestPlanCase.js
+++ b/src/api/xm/core/xmTestPlanCase.js
@@ -51,7 +51,7 @@ export const importFromTestCase = params => { return axios.post(`${base}/xm/core
 /**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */
 //初始化页面上的字典
 export const initDicts = (that) => {
- var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority','testCaseStatus','caseType'];//在此添加要加载的字典 如['sex','grade','lvl']
+ var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority','testCaseStatus','caseType','testType'];//在此添加要加载的字典 如['sex','grade','lvl']
  if(itemCodes.length>0){
     initSimpleDicts('all',itemCodes).then(res=>{
         Object.assign(that.dicts,res.data.data)
diff --git a/src/components/MdpSelectDict/index.vue b/src/components/MdpSelectDict/index.vue
index 69bf2baf..0a164f6b 100644
--- a/src/components/MdpSelectDict/index.vue
+++ b/src/components/MdpSelectDict/index.vue
@@ -1,5 +1,5 @@
 <template>   
-    <el-select class="my-select" ref="selectRef" v-model="myVal" @change="onChange" :clearable="clearable" @visible-change="$emit('visible-change',$event)" @focus="$emit('focus',$event)" @blur="$emit('blur',$event)" @clear="$emit('blur',$event)" @click="$emit('click',$event)">
+    <el-select :placeholder="placeholder" class="my-select" ref="selectRef" v-model="myVal" @change="onChange" :clearable="clearable" @visible-change="$emit('visible-change',$event)" @focus="$emit('focus',$event)" @blur="$emit('blur',$event)" @clear="$emit('blur',$event)" @click="$emit('click',$event)">
         <slot>
             <el-option :style="styleObj" v-for="(item,index) in dict" :key="index" :value="item.id" :label="item.name"> 
              <slot :item="item" :dict="dict"> 
@@ -40,6 +40,7 @@
         }
     },
     props: {
+      placeholder:'请选择',
         clearable:{
             type:Boolean,
             default:false,
diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss
index 72c7d0f2..d5975cc7 100644
--- a/src/styles/mdp.scss
+++ b/src/styles/mdp.scss
@@ -291,7 +291,7 @@ table tr.hover-row{
   white-space: nowrap;  
   max-width:250px;
 }
-.sm-text{  
+.sm-text{   
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap;  
diff --git a/src/views/xm/core/xmFunc/XmFuncSelect.vue b/src/views/xm/core/xmFunc/XmFuncSelect.vue
index 337f7abb..2d356edc 100644
--- a/src/views/xm/core/xmFunc/XmFuncSelect.vue
+++ b/src/views/xm/core/xmFunc/XmFuncSelect.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
 		<el-row>
-			<el-input v-model="filters.key" style="width: 60%;" placeholder="模块名称 按回车" @keyup.enter.native="searchXmFuncs" clearable></el-input> 
+			<el-input v-model="filters.key" style="width: 60%;" placeholder="模块名称"   clearable></el-input> 
 			<span style="float:right;">
                 <el-popover
                     placement="top-start"
@@ -34,7 +34,7 @@
   								</template> 
 							</el-table-column> 
 			</el-table>
-			<el-pagination  layout="total,sizes,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-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-row>
 			<!--编辑 XmFunc 功能模块表界面-->
@@ -71,6 +71,9 @@ export default {
 
         xmFuncsTreeData() {
             let xmFuncs = JSON.parse(JSON.stringify(this.xmFuncs || []));
+            if(this.filters.key){
+                xmFuncs=xmFuncs.filter(k=>k.name.indexOf(this.filters.key)>=0)
+            } 
             let xmFuncsTreeData = treeTool.translateDataToTree(xmFuncs,"pid","id");
                 return xmFuncsTreeData;
         },
@@ -163,10 +166,7 @@ export default {
                     orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
                 }
                 params.orderBy= orderBys.join(",")
-            }
-            if(this.filters.key){
-                params.key=this.filters.key
-            }
+            } 
             if(this.xmProduct && this.xmProduct.id){
                 params.productId=this.xmProduct.id
             }
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index d8665ae5..1e25e9ad 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -671,8 +671,13 @@
 				params.funcName=xmTestPlanCase.funcName 
 				params.menuId=xmTestPlanCase.menuId
 				params.menuName=xmTestPlanCase.menuName  
-				params.opStep=xmTestPlanCase.testStep
-				params.name=xmTestPlanCase.caseName
+				if(!this.editForm.opStep){
+					params.opStep=xmTestPlanCase.testStep
+				}
+				if(!this.editForm.name){
+					params.name=xmTestPlanCase.caseName
+				}
+				
 				params.projectId=xmTestPlanCase.projectId 
 				Object.assign(this.editForm,params)
 				this.editXmQuestionSomeFields(this.editForm,"caseId",params)
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 5807c631..eaedb251 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -9,9 +9,9 @@
                 <el-row>
                     <el-input v-model="filters.key" style="width: 20%;" placeholder="名称 按回车" @keyup.enter.native="searchXmTestCases" clearable></el-input>
                     
-                    <el-select v-model="filters.caseStatus" style="width:120px;" placeholder="审核状态"  clearable>
-                        <el-option v-for="(item,index) in dicts['testCaseStatus']" :key="index" :value="item.id" :label="item.name"></el-option>
-                    </el-select>
+                    <mdp-select-dict placeholder="用例状态" style="width:15%;" clearable :dict="dicts['testCaseStatus']" v-model="filters.caseStatus" effect="dark"></mdp-select-dict> 
+                    <mdp-select-dict placeholder="测试方式" style="width:15%;" clearable :dict="dicts['testType']" v-model="filters.testType" effect="dark"></mdp-select-dict> 
+
                     <el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTestCases" icon="el-icon-search">查询</el-button>
                     <span style="float:right;">
                         <el-button type="primary" @click="showAdd" icon="el-icon-plus">用例</el-button>
@@ -40,7 +40,13 @@
                             <template slot-scope="scope"> 
                                 <mdp-select-dict-tag @visible-change="selectVisible(scope.row,$event)" :dict="dicts['testCaseStatus']" v-model="scope.row.caseStatus" effect="dark" @change="editSomeFields(scope.row,'caseStatus',$event)"></mdp-select-dict-tag> 
                             </template>
-                        </el-table-column>      
+                        </el-table-column>   
+                        
+                        <el-table-column prop="testType" label="测试方式" min-width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">
+                                <mdp-select-dict-tag @visible-change="selectVisible(scope.row,$event)" :dict="dicts['testType']" v-model="scope.row.testType" effect="dark" @change="editSomeFields(scope.row,'testType',$event)"></mdp-select-dict-tag> 
+                            </template>
+                        </el-table-column>    
                         <el-table-column prop="funcName" label="模块" min-width="150" show-overflow-tooltip>
                             <template slot-scope="scope">
                                 <span> {{scope.row.funcName}} </span>
@@ -124,6 +130,7 @@ export default {
                 key: '',
                 xmFunc:null,
                 caseStatus:'',
+                testType:'',
             },
             xmTestCases: [],//查询结果
             pageInfo:{//分页数据
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue b/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
index fa2ce940..25d9dc5e 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
@@ -10,8 +10,11 @@
         
                 <el-row>
                     
-                    <el-checkbox v-if="xmTestPlan && xmTestPlan.id" true-label="1" false-label="" v-model="filters.notJoinPlan">未加入{{xmTestPlan.name}}</el-checkbox>
+                    <el-checkbox v-if="xmTestPlan && xmTestPlan.id" true-label="1" false-label="" v-model="filters.notJoinPlan" :title="'查询未曾加入计划【'+xmTestPlan.name+'】的测试用例'"> 未加入 </el-checkbox>
                     <el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input>
+                    <mdp-select-dict label="状态" style="width:15%;" clearable placeholder="用例状态" :dict="dicts['testCaseStatus']" v-model="filters.caseStatus"></mdp-select-dict> 
+                    <mdp-select-dict placeholder="测试方式" style="width:15%;" clearable  :dict="dicts['testType']" v-model="filters.testType" effect="dark"></mdp-select-dict> 
+
                     <el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTestCases" icon="el-icon-search">查询</el-button>
                     <span style="float:right;">
                         
@@ -39,6 +42,12 @@
                                 <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="testType" label="测试方式" min-width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">
+                                <mdp-select-dict-tag :dict="dicts['testType']" v-model="scope.row.testType" effect="dark" :disabled="true"></mdp-select-dict-tag>                                         
+                            </template>
+                        </el-table-column> 
                         <el-table-column prop="caseRemark" label="备注" min-width="120" show-overflow-tooltip>
                             <template slot-scope="scope">
                                 <span> {{scope.row.caseRemark}} </span>
@@ -106,6 +115,8 @@ export default {
                 key: '',
                 notJoinPlan:'',
                 xmFunc:null,
+                caseStatus:'',
+                testType:'',
             },
             xmTestCases: [],//查询结果
             pageInfo:{//分页数据
@@ -186,6 +197,12 @@ export default {
             if(this.filters.key){
                 params.key=this.filters.key
             }
+            if(this.filters.caseStatus){
+                params.caseStatus=this.filters.caseStatus
+            }
+            if(this.filters.testType){
+                params.testType=this.filters.testType
+            }
             if(this.filters.notJoinPlan && this.xmTestPlan && this.xmTestPlan.id){
                 params.notJoinPlanId=this.xmTestPlan.id
             }
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue b/src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue
index e3dbb2bd..2305b861 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue
@@ -17,7 +17,7 @@
 				  <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 >
+				   <el-row v-if="opType!='add'">
 					 <span class="label-font-color padding-left">测试计划编号:{{ editForm.id }}</span>
  				  </el-row>
 				  </el-form-item>
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
index 8a9aa12c..eb2f9f55 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
@@ -2,6 +2,10 @@
 	<section class="page-container border padding">
 		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"  clearable></el-input>
+            <mdp-select-dict style="width:15%;" clearable placeholder="状态" :dict="dicts['testPlanStatus']" v-model="filters.status" effect="dark"></mdp-select-dict> 
+
+            <mdp-select-dict style="width:15%;" clearable placeholder="结果" :dict="dicts['testPlanTcode']" v-model="filters.tcode" effect="dark" ></mdp-select-dict> 
+
 			<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTestPlans" icon="el-icon-search">查询</el-button>
 			<span style="float:right;">
 			    <el-button type="primary" @click="showAdd" icon="el-icon-plus">测试计划</el-button>
@@ -122,7 +126,9 @@ export default {
     data() {
         return {
             filters: {
-                key: ''
+                key: '',
+                status:'',
+                tcode:'',
             },
             xmTestPlans: [],//查询结果
             pageInfo:{//分页数据
@@ -203,7 +209,12 @@ export default {
             if(this.filters.key){
                 params.key=this.filters.key
             }
-
+            if(this.filters.tcode){
+                params.tcode=this.filters.tcode
+            }
+            if(this.filters.status){
+                params.status=this.filters.status
+            }
             if(this.xmTestCasedb && this.xmTestCasedb.id){
                 params.casedbId=this.xmTestCasedb.id
             }
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
index a2944791..08f27956 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
@@ -8,6 +8,9 @@
             <el-col :span="!xmTestCase||!xmTestCase.id?18:24">
                 <el-row>
                     <el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"  clearable></el-input>
+                    <mdp-select-dict style="width:20%;" placeholder="用例状态" clearable :dict="dicts['testCaseStatus']" v-model="filters.caseStatus" effect="dark"></mdp-select-dict> 
+                    <mdp-select-dict style="width:20%;" placeholder="执行结果" clearable :dict="dicts['testStepTcode']" v-model="filters.execStatus" effect="dark"></mdp-select-dict> 
+
                     <el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTestPlanCases" icon="el-icon-search">查询</el-button>
                     <span style="float:right;" v-if="!xmTestCase||!xmTestCase.id">
                         <el-button type="primary" @click="showAdd" icon="el-icon-plus">将用例纳入计划</el-button>
@@ -135,6 +138,9 @@ export default {
             filters: {
                 key: '',
                 xmFunc:null,
+                
+                caseStatus:'',
+                execStatus:''
             },
             xmTestPlanCases: [],//查询结果
             pageInfo:{//分页数据
@@ -215,6 +221,12 @@ export default {
             if(this.filters.key){
                 params.key=this.filters.key
             }
+            if(this.filters.caseStatus){
+                params.caseStatus=this.filters.caseStatus
+            }
+            if(this.filters.execStatus){
+                params.execStatus=this.filters.execStatus
+            }
             if(this.xmTestCasedb && this.xmTestCasedb.id){
                 params.casedbId=this.xmTestCasedb.id
             }
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue
index 45cc7e6d..d5a03f35 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue
@@ -7,8 +7,10 @@
             </el-col>
             <el-col :span="(xmTestCase&&xmTestCase.id)?24:18">
                 <el-row>
-                    <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-input v-model="filters.key" style="width:20%;" placeholder="模糊查询"  clearable></el-input>
+                     <mdp-select-dict style="width:20%;" placeholder="用例状态" clearable :dict="dicts['testCaseStatus']" v-model="filters.caseStatus" effect="dark"></mdp-select-dict> 
+                    <mdp-select-dict style="width:20%;" placeholder="执行结果" clearable :dict="dicts['testStepTcode']" v-model="filters.execStatus" effect="dark"></mdp-select-dict> 
+
                     <el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTestPlanCases" icon="el-icon-search">查询</el-button> 
                 </el-row>
                 <el-row>
@@ -21,10 +23,14 @@
                         </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>	    
+                            <template slot-scope="scope"> 
+                                <span :title="'归属测试计划'+scope.row.planId">{{ scope.row.caseName }}</span>
+                             </template>
+                        </el-table-column>	
+                        <el-table-column prop="planId" label="测试计划" width="150" sortable> 
+                        </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> 
@@ -107,6 +113,10 @@ export default {
             filters: {
                 key: '',
                 xmFunc:null,
+                caseStatus:'',
+                execStatus:''
+
+
             },
             xmTestPlanCases: [],//查询结果
             pageInfo:{//分页数据
@@ -187,6 +197,12 @@ export default {
             if(this.filters.key){
                 params.key=this.filters.key
             }
+            if(this.filters.caseStatus){
+                params.caseStatus=this.filters.caseStatus
+            }
+            if(this.filters.execStatus){
+                params.execStatus=this.filters.execStatus
+            }
             if(this.xmTestCasedb && this.xmTestCasedb.id){
                 params.casedbId=this.xmTestCasedb.id
             }