From bf11c60d8660eebddb0c9fe9361a7ad6884e794c 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, 19 Jul 2022 20:28:07 +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/XmTestCaseEdit.vue     | 9 ++++-----
 src/views/xm/core/xmTestCase/XmTestCaseMng.vue      | 5 ++++-
 src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue | 6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
index bb970e2f..3fadf42e 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
@@ -65,7 +65,7 @@ TestStepConfig,
 		    ...mapGetters([ 'userInfo'  ]),
 
 		},
-		props:['xmTestCase','visible','opType'],
+		props:['xmTestCase','visible','opType','xmTestCasedb'],
 
 		watch: {
 	      'xmTestCase':function( xmTestCase ) {
@@ -172,8 +172,7 @@ TestStepConfig,
 					 params['cusername']=$event.username 
 				}else{
 					 params[fieldName]=$event
-				}
-                params[fieldName]=$event
+				} 
                 var func = editSomeFieldsXmTestCase
                 func(params).then(res=>{
                   let tips = res.data.tips;
@@ -191,7 +190,7 @@ TestStepConfig,
 				this.editForm.menuName=row.menuName
 				this.menuVisible=false;
 				if(this.opType!=='add'){
-					this.editSomeFieldsXmTestCase(this.editForm,'menuId',row)
+					this.editSomeFields(this.editForm,'menuId',row)
 				}
 			},
 			onFuncSelected(row){
@@ -199,7 +198,7 @@ TestStepConfig,
 				this.editForm.funcName=row.name
 				this.funcVisible=false;
 				if(this.opType!=='add'){
-					this.editSomeFieldsXmTestCase(this.editForm,'funcId',row)
+					this.editSomeFields(this.editForm,'funcId',row)
 				}
 			}
 		},//end method
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index c519fe3c..8c1a55d5 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -2,7 +2,7 @@
 	<section>
         <el-row>
             <el-col :span="6">
-                <xm-func-select class="padding-right padding-left" :xm-product="{id:'xxxxx',name:'xxxxxxx'}" @row-click="onXmFuncRowClick"> 
+                <xm-func-select v-if="xmTestCasedb && xmTestCasedb.productId" class="padding-right padding-left" :xm-product="{id:xmTestCasedb.productId,productName:xmTestCasedb.productName}" @row-click="onXmFuncRowClick"> 
                 </xm-func-select>
             </el-col>
             <el-col :span="18">
@@ -185,6 +185,9 @@ export default {
             if(this.filters.xmFunc && this.filters.xmFunc.id){
                 params.funcPidPathsLike=this.filters.xmFunc.pidPaths
             }
+            if(this.xmTestCasedb && this.xmTestCasedb.id){
+                params.casedbId=this.xmTestCasedb.id
+            }
 
             this.load.list = true;
             listXmTestCase(params).then((res) => {
diff --git a/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue b/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue
index cf47385b..32171a3e 100644
--- a/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue
+++ b/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue
@@ -9,8 +9,8 @@
             </el-menu>
         </el-row>
 		<el-row ref="xmTestCasedbTable">
-            <xm-test-case-mng v-if="activeIndex=='testCase'"></xm-test-case-mng>
-            <xm-test-plan-info v-else-if="activeIndex=='testPlan'"> </xm-test-plan-info>
+            <xm-test-case-mng  v-if="activeIndex=='testCase'" :xm-test-casedb="xmTestCasedb"></xm-test-case-mng>
+            <xm-test-plan-info v-else-if="activeIndex=='testPlan'" :xm-test-casedb="xmTestCasedb"> </xm-test-plan-info>
         </el-row>     
 	</section>
 </template>
@@ -31,7 +31,7 @@ export default {
     components: {
         XmTestCasedbEdit,XmProductSelect,XmTestCaseMng,XmTestPlanInfo,
     },
-    props:['visible','xmProduct','selProject'],
+    props:['visible','xmTestCasedb'],
     computed: {
         ...mapGetters(['userInfo']),