diff --git a/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue b/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue
index 32171a3e..b9655c5e 100644
--- a/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue
+++ b/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue
@@ -10,7 +10,7 @@
-
+
@@ -257,6 +257,12 @@ export default {
},
handleSelect(index){
this.activeIndex=index
+ if(index=='testPlan'){
+ this.$nextTick(()=>{
+ this.$refs.testPlan.activeIndex='testPlan'
+ })
+
+ }
}
},//end methods
mounted() {
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue b/src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue
index 0c2a1436..7132f238 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanEdit.vue
@@ -1,79 +1,53 @@
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {{editForm.casedbName}}
+
+
+
+ {{editForm.projectName?editForm.projectName:editForm.projectId}}
+
+ 选择项目
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+ {{editForm.productName}}
+
-
+
+
取消
提交
+
@@ -83,11 +57,12 @@
import config from "@/common/config"; //全局公共库import
import { initDicts, addXmTestPlan,editXmTestPlan,editSomeFieldsXmTestPlan } from '@/api/xm/core/xmTestPlan';
import { mapGetters } from 'vuex'
+ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';
export default {
name:'xmTestPlanEdit',
components: {
-
+ XmProjectSelect,
},
computed: {
...mapGetters([ 'userInfo' ]),
@@ -114,8 +89,9 @@
load:{ list: false, edit: false, del: false, add: false },//查询中...
dicts:{},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
editFormRules: {
- id: [
- //{ required: true, message: '测试计划编号不能为空', trigger: 'blur' }
+ name: [
+ { required: true, message: '测试计划名称不能为空', trigger: 'change' },
+ { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'change' },//长度
]
},
editForm: {
@@ -187,12 +163,17 @@
let tips = res.data.tips;
if(tips.isOk){
this.editFormBak=[...this.editForm]
+ this.$emit('edit-fields',params)
}else{
Object.assign(this.editForm,this.editFormBak)
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
}
}).catch((e)=>Object.assign(this.editForm,this.editFormBak))
},
+ onPorjectConfirm(row){
+ this.editForm.projectId=row.id
+ this.editForm.projectName=row.name
+ }
},//end method
mounted() {
this.$nextTick(() => {
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
index 724109a5..fa721665 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
@@ -4,8 +4,8 @@
-
-
+
+
@@ -25,7 +25,7 @@ export default {
components: {
XmProductSelect, XmTestPlanMng,XmTestPlanCaseMng
},
- props:['visible','xmProduct','selProject'],
+ props:['visible','xmTestCasedb'],
computed: {
...mapGetters(['userInfo']),
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
index 31ad25f7..82e278ff 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
@@ -73,12 +73,12 @@
-
+
-
+
@@ -97,7 +97,7 @@ export default {
components: {
XmTestPlanEdit,
},
- props:['visible'],
+ props:['visible','xmTestCasedb'],
computed: {
...mapGetters(['userInfo']),
@@ -216,6 +216,10 @@ export default {
},
//显示新增界面 XmTestPlan 测试计划
showAdd: function () {
+ this.addForm.casedbId=this.xmTestCasedb.id
+ this.addForm.casedbName=this.xmTestCasedb.name
+ this.addForm.productId=this.xmTestCasedb.productId
+ this.addForm.productName=this.xmTestCasedb.productName
this.addFormVisible = true;
//this.addForm=Object.assign({}, this.editForm);
},
@@ -227,6 +231,10 @@ export default {
afterEditSubmit(){
this.editFormVisible=false;
},
+ onEditFields(row){
+ Object.assign(this.editForm,row)
+ this.editFormBak={...this.editForm}
+ },
//选择行xmTestPlan
selsChange: function (sels) {
this.sels = sels;