From 9c5ab9ec2dcf389679253661a4213c36dfee57f9 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, 20 Jul 2022 13:18:17 +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/views/xm/core/xmTestCase/XmTestCaseMng.vue      | 13 ++++++++++---
 src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue |  3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 3e869831..e5cfcfc3 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -9,7 +9,7 @@
                 <el-row>
                     <el-input v-model="filters.key" style="width: 20%;" placeholder="名称 按回车" @keyup.enter.native="searchXmTestCases"></el-input>
                     
-                    <el-select v-model="filters.caseStatus" style="width:100px;">
+                    <el-select v-model="filters.caseStatus" style="width:120px;" clearable>
                         <el-option v-for="(item,index) in dicts['testCaseStatus']" :key="index" :value="item.id" :label="item.name"></el-option>
                     </el-select>
                     <el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTestCases" icon="el-icon-search">查询</el-button>
@@ -91,7 +91,7 @@ export default {
     components: {
         XmTestCaseEdit,XmFuncSelect
     },
-    props:['visible','xmTestCasedb'],
+    props:['visible','xmTestCasedb','scene'],
     computed: {
         ...mapGetters(['userInfo']),
 
@@ -109,6 +109,7 @@ export default {
             filters: {
                 key: '',
                 xmFunc:null,
+                caseStatus:'',
             },
             xmTestCases: [],//查询结果
             pageInfo:{//分页数据
@@ -190,6 +191,9 @@ export default {
                 params.key=this.filters.key
             } 
 
+            if(this.filters.caseStatus){
+                params.caseStatus=this.filters.caseStatus
+            }
             if(this.filters.xmFunc && this.filters.xmFunc.id){
                 params.funcPidPathsLike=this.filters.xmFunc.pidPaths
             }
@@ -305,7 +309,10 @@ export default {
             this.$emit('row-click',row, event, column);//  @row-click="rowClick"
         },
         initData: function(){
-
+            
+            if(this.scene){
+                this.filters.caseStatus='1'
+            }
         },
         onXmFuncRowClick(row){
             this.filters.xmFunc=row
diff --git a/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue b/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue
index 7f021088..01515ecd 100644
--- a/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue
+++ b/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue
@@ -33,7 +33,8 @@
             </el-menu>
         </el-row>
 		<el-row ref="xmTestCasedbTable">
-            <xm-test-case-mng  v-if="activeIndex=='testCase'" :xm-test-casedb="xmTestCasedb"></xm-test-case-mng>
+            <xm-test-case-mng  v-if="activeIndex=='testCase'" :xm-test-casedb="xmTestCasedb" key="1"></xm-test-case-mng>  
+            <xm-test-case-mng  v-if="activeIndex=='caseFlow'" :xm-test-casedb="xmTestCasedb" scene="caseFlow" key="2"></xm-test-case-mng>  
             <xm-test-plan-info v-else-if="activeIndex=='testPlan'" :xm-test-casedb="xmTestCasedb" ref="testPlan"> </xm-test-plan-info>
         </el-row>     
 	</section>