diff --git a/src/api/xm/core/xmTestCase.js b/src/api/xm/core/xmTestCase.js
index c6c7fe32..f8f02f9c 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=[];//在此添加要加载的字典 如['sex','grade','lvl']
+ var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority'];//在此添加要加载的字典 如['sex','grade','lvl']
if(itemCodes.length>0){
initSimpleDicts('all',itemCodes).then(res=>{
Object.assign(that.dicts,res.data.data)
diff --git a/src/api/xm/core/xmTestCasedb.js b/src/api/xm/core/xmTestCasedb.js
index 434d4a1c..8916e3a9 100644
--- a/src/api/xm/core/xmTestCasedb.js
+++ b/src/api/xm/core/xmTestCasedb.js
@@ -35,7 +35,7 @@ export const editSomeFieldsXmTestCasedb = params => { return axios.post(`${base}
/**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */
//初始化页面上的字典
export const initDicts = (that) => {
- var itemCodes=[];//在此添加要加载的字典 如['sex','grade','lvl']
+ var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority'];//在此添加要加载的字典 如['sex','grade','lvl']
if(itemCodes.length>0){
initSimpleDicts('all',itemCodes).then(res=>{
Object.assign(that.dicts,res.data.data)
diff --git a/src/api/xm/core/xmTestPlan.js b/src/api/xm/core/xmTestPlan.js
index 24b26a2f..958a1686 100644
--- a/src/api/xm/core/xmTestPlan.js
+++ b/src/api/xm/core/xmTestPlan.js
@@ -35,7 +35,7 @@ export const editSomeFieldsXmTestPlan = params => { return axios.post(`${base}/x
/**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */
//初始化页面上的字典
export const initDicts = (that) => {
- var itemCodes=[];//在此添加要加载的字典 如['sex','grade','lvl']
+ var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority','bizFlowState'];//在此添加要加载的字典 如['sex','grade','lvl']
if(itemCodes.length>0){
initSimpleDicts('all',itemCodes).then(res=>{
Object.assign(that.dicts,res.data.data)
diff --git a/src/api/xm/core/xmTestPlanCase.js b/src/api/xm/core/xmTestPlanCase.js
index 8948e213..5d5fe0f2 100644
--- a/src/api/xm/core/xmTestPlanCase.js
+++ b/src/api/xm/core/xmTestPlanCase.js
@@ -31,11 +31,14 @@ export const addXmTestPlanCase = params => { return axios.post(`${base}/xm/core/
export const editSomeFieldsXmTestPlanCase = params => { return axios.post(`${base}/xm/core/xmTestPlanCase/editSomeFields`, params); };
+//批量导入测试用例到测试计划中
+export const importFromTestCase = params => { return axios.post(`${base}/xm/core/xmTestPlanCase/importFromTestCase`, params); };
+
/**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */
//初始化页面上的字典
export const initDicts = (that) => {
- var itemCodes=[];//在此添加要加载的字典 如['sex','grade','lvl']
+ var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority'];//在此添加要加载的字典 如['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/XmTestCaseSelect.vue b/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
new file mode 100644
index 00000000..97584a89
--- /dev/null
+++ b/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
@@ -0,0 +1,385 @@
+
+
+
+
+ 未加入{{xmTestPlan.name}}
+
+ 查询
+
+
+ 确认选择
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.caseName}}
+
+
+
+
+ {{scope.row.caseRemark}}
+
+
+
+
+ {{scope.row.testStep}}
+
+
+
+
+ {{scope.row.expectResult}}
+
+
+
+
+ {{scope.row.menuId}}
+
+
+
+
+ {{scope.row.menuName}}
+
+
+
+
+ {{scope.row.ctime}}
+
+
+
+
+ {{scope.row.ltime}}
+
+
+
+
+ {{scope.row.luserid}}
+
+
+
+
+ {{scope.row.lusername}}
+
+
+
+
+ {{scope.row.cbranchId}}
+
+
+
+
+ {{scope.row.moduleId}}
+
+
+
+
+ {{scope.row.moduleName}}
+
+
+
+
+ {{scope.row.caseStatus}}
+
+
+
+
+ {{scope.row.cuserid}}
+
+
+
+
+ {{scope.row.cusername}}
+
+
+
+
+ {{scope.row.productId}}
+
+
+
+
+ {{scope.row.verNum}}
+
+
+
+
+ {{scope.row.casedbId}}
+
+
+
+
+ {{scope.row.casedbName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue b/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue
index f30749d4..cf47385b 100644
--- a/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue
+++ b/src/views/xm/core/xmTestCasedb/XmTestCasedbInfo.vue
@@ -8,7 +8,7 @@
统计报表
-
+
@@ -264,7 +264,7 @@ export default {
initDicts(this);
this.initData()
this.searchXmTestCasedbs();
- this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTestCasedbTable.$el)
+ //this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTestCasedbTable.$el)
});
}
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
index 2a4d22ad..dd6e695b 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
@@ -19,45 +19,24 @@
-->
-
-
+
{{scope.row.name}}
-
-
-
- {{scope.row.casedbId}}
-
-
-
-
- {{scope.row.casedbName}}
-
-
-
-
- {{scope.row.projectId}}
-
-
-
-
- {{scope.row.projectName}}
-
-
-
+
+
- {{scope.row.cuserid}}
+ {{scope.row.cusername}}
-
-
+
+
- {{scope.row.cusername}}
+ {{item.name}}
-
+
- {{scope.row.ctime}}
+ {{item.name}}
@@ -70,14 +49,9 @@
{{scope.row.etime}}
-
-
- {{scope.row.status}}
-
-
-
+
- {{scope.row.tcode}}
+ {{item.name}}
@@ -104,20 +78,20 @@
{{scope.row.blCases}}
-
-
+
+
+
+ {{scope.row.casedbName}}
+
+
+
- {{scope.row.productId}}
+ {{scope.row.projectName}}
-
+
{{scope.row.productName}}
-
-
-
-
- {{scope.row.flowState}}
@@ -186,6 +160,7 @@ export default {
load:{ list: false, edit: false, del: false, add: false },//查询中...
sels: [],//列表选中数据
dicts:{
+ testPlanStatus:[],testPlanTcode:[],testStepTcode:[],priority:[],bizFlowState:[]
//sex: [{id:'1',name:'男'},{id:'2',name:'女'}]
},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
addFormVisible: false,//新增xmTestPlan界面是否显示
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
index b85ab640..be054325 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
@@ -86,9 +86,9 @@
-
-
-
+
+
+
@@ -97,16 +97,18 @@
import util from '@/common/js/util';//全局公共库
import config from '@/common/config';//全局公共库
-import { initDicts,listXmTestPlanCase, delXmTestPlanCase, batchDelXmTestPlanCase,editSomeFieldsXmTestPlanCase } from '@/api/xm/core/xmTestPlanCase';
+import { initDicts,listXmTestPlanCase, delXmTestPlanCase, batchDelXmTestPlanCase,editSomeFieldsXmTestPlanCase,importFromTestCase } from '@/api/xm/core/xmTestPlanCase';
import XmTestPlanCaseEdit from './XmTestPlanCaseEdit';//新增修改界面
+import XmTestCaseSelect from '../xmTestCase/XmTestCaseSelect';//新增修改界面
+
import { mapGetters } from 'vuex'
export default {
name:'xmTestPlanCaseMng',
components: {
- XmTestPlanCaseEdit,
+ XmTestPlanCaseEdit,XmTestCaseSelect,
},
- props:['visible'],
+ props:['visible','xmTestPlan'],
computed: {
...mapGetters(['userInfo']),
@@ -313,6 +315,17 @@ export default {
initData: function(){
},
+ onXmTestCaseSelect(cases){
+ if(cases==null || cases.length<=0){
+ this.$notify({position:'bottom-left',showClose:true,message:"请至少选择一条用例进行导入",type:'error'})
+ return;
+
+ }
+ this.addFormVisible=false;
+ importFromTestCase({planId:this.xmTestPlan.id,caseIds:cases.map(i=>i.id)}).then(res=>{
+ this.searchXmTestPlanCases();
+ })
+ }
},//end methods
mounted() {