diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 2761d907..782900f7 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -181,6 +181,10 @@
+
+
+
+
@@ -308,6 +312,7 @@
activateTabPaneName:'12',
funcVisible:false,
stepConfigVisible:false,
+ caseVisible:false,
/**end 在上面加自定义属性**/
}//end return
},//end data
@@ -518,6 +523,8 @@
params.productId=$event.productId
params.funcId=$event.id
params.funcName=$event.name
+ }else if(fieldName==='caseId'){
+ params=Object.assign(params,$event)
}else{
params[fieldName]=$event
}
@@ -613,12 +620,32 @@
}
this.editFormBak={...this.editForm}
+ },
+ onTestPlanCaseSelected(xmTestPlanCase){
+ var params={};
+ params.planId=xmTestPlanCase.planId
+ params.productId=xmTestPlanCase.productId
+ params.productName=xmTestPlanCase.productName
+ params.caseId=xmTestPlanCase.caseId
+ params.caseName=xmTestPlanCase.caseName
+ params.casedbId=xmTestPlanCase.casedbId
+ params.funcId=xmTestPlanCase.funcId
+ params.funcName=xmTestPlanCase.funcName
+ params.menuId=xmTestPlanCase.menuId
+ params.menuName=xmTestPlanCase.menuName
+ params.opStep=xmTestPlanCase.testStep
+ params.name=xmTestPlanCase.caseName
+ params.projectId=xmTestPlanCase.projectId
+ Object.assign(this.editForm,params)
+ this.editXmQuestionSomeFields(this.editForm,"caseId",params)
+ this.caseVisible=false;
}
},//end method
components: {
//在下面添加其它组件 'xm-question-edit':XmQuestionEdit
'upload': AttachmentUpload,XmGroupMng,VueEditor,XmTaskList,xmMenuSelect,XmQuestionHandleMng,TagMng,XmProjectSelect,
XmMyDoFocus,XmFuncSelect,MdpSelectUserXm,TestStepConfig,TestStepResult,
+ xmTestPlanCaseMng:()=>import('../xmTestPlanCase/XmTestPlanCaseMng')
},
mounted() {
this.initData();
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
index adeaf331..9f798129 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
@@ -26,11 +26,6 @@
-->
-
-
-
-
-
{{scope.row.caseName}}
@@ -38,22 +33,37 @@
-
-
-
- {{scope.row.execUsername}}
-
-
-
-
-
-
-
-
-
- {{scope.row.remark}}
-
-
+
+
+
+
+
+
+
+
+
+ {{scope.row.execUsername}}
+
+
+
+
+
+
+
+
+
+ {{scope.row.remark}}
+
+
+
+
+
+
+
+ 选择
+
+
+
@@ -88,10 +98,13 @@ export default {
components: {
XmTestPlanCaseEdit,XmTestCaseSelect,XmFuncSelect,
},
- props:['visible','xmTestPlan','xmTestCasedb','xmTestCase'],
+ props:['visible','xmTestPlan','xmTestCasedb','xmTestCase','xmProduct','select'],
computed: {
...mapGetters(['userInfo']),
xmProductCpd(){
+ if(this.xmProduct&& this.xmProduct.id){
+ return this.xmProduct
+ }
if(this.xmTestCasedb && this.xmTestCasedb.id){
return {id:this.xmTestCasedb.productId,productName:this.xmTestCasedb.productName}
}