diff --git a/src/api/xm/core/xmTestCase.js b/src/api/xm/core/xmTestCase.js index f8f02f9c..62aad4c7 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'];//在此添加要加载的字典 如['sex','grade','lvl'] + var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority','testCaseStatus'];//在此添加要加载的字典 如['sex','grade','lvl'] if(itemCodes.length>0){ initSimpleDicts('all',itemCodes).then(res=>{ Object.assign(that.dicts,res.data.data) diff --git a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue deleted file mode 100644 index bf79850f..00000000 --- a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue +++ /dev/null @@ -1,185 +0,0 @@ - - - - - diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue index df2bec01..a5689213 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue @@ -4,70 +4,38 @@ - - - - + - - - - + + + + + + + + {{editForm.menuName?editForm.menuName:'暂无关联需求'}} 选择需求 - - - - - - - - + + {{editForm.funcName?editForm.funcName:'暂无关联模块'}} 选择模块 - - - - + - - - - - - - - - - + - - - - + - - - - - - - - - - - - - + @@ -75,6 +43,12 @@ 取消 提交 + + + + + + @@ -83,11 +57,12 @@ import config from "@/common/config"; //全局公共库import import { initDicts, addXmTestCase,editXmTestCase,editSomeFieldsXmTestCase } from '@/api/xm/core/xmTestCase'; import { mapGetters } from 'vuex' - + import XmMenuSelect from '../xmMenu/XmMenuSelect' + import XmFuncSelect from '../xmFunc/XmFuncSelect' export default { name:'xmTestCaseEdit', components: { - + XmMenuSelect,XmFuncSelect, }, computed: { ...mapGetters([ 'userInfo' ]), @@ -122,6 +97,8 @@ id:'',caseName:'',caseRemark:'',testStep:'',expectResult:'',menuId:'',menuName:'',ctime:'',ltime:'',luserid:'',lusername:'',cbranchId:'',moduleId:'',moduleName:'',caseStatus:'',cuserid:'',cusername:'',productId:'',verNum:'',casedbId:'',casedbName:'' }, maxTableHeight:300, + menuVisible:false, + funcVisible:false, }//end return },//end data methods: { @@ -170,7 +147,13 @@ if(this.opType=='edit'){ }else{ - + if(this.xmTestCasedb && this.xmTestCasedb.id){ + this.editForm.productId=this.xmTestCasedb.productId + this.editForm.productName=this.xmTestCasedb.productName + this.editForm.casedbId=this.xmTestCasedb.id + this.editForm.casedbName=this.xmTestCasedb.name + } + } this.editFormBak={...this.editForm} }, @@ -193,6 +176,14 @@ } }).catch((e)=>Object.assign(this.editForm,this.editFormBak)) }, + onMenuSelected(row){ + this.editForm.menuId=row.menuId + this.editForm.menuName=row.menuName + }, + onFuncSelected(row){ + this.editForm.funcId=row.id + this.editForm.funcName=row.name + } },//end method mounted() { this.$nextTick(() => { diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue index 589ab7da..17c64b49 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue @@ -18,120 +18,36 @@ - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + - - - - + @@ -147,7 +63,7 @@ - + @@ -167,7 +83,7 @@ export default { components: { XmTestCaseEdit,XmFuncSelect }, - props:['visible'], + props:['visible','xmTestCasedb'], computed: { ...mapGetters(['userInfo']), @@ -198,6 +114,7 @@ export default { load:{ list: false, edit: false, del: false, add: false },//查询中... sels: [],//列表选中数据 dicts:{ + testCaseStatus:[] //sex: [{id:'1',name:'男'},{id:'2',name:'女'}] },//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]} addFormVisible: false,//新增xmTestCase界面是否显示