diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
index 651b2fc4..a3c19c4e 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
@@ -43,11 +43,11 @@
-
+
-
+
@@ -147,10 +147,12 @@ export default {
this.xmTestPlan=row
},
showRptConfig(){
- this.$refs['rpt'].rptConfigVisible=true
+ this.$refs['rpt'].isRptCfg=true
},
print(){
+ this.$refs['rpt'].isRptShow=true
this.$refs['rpt'].showPrint()
+
},
calcRptData(){
var row=this.xmTestPlan
@@ -168,8 +170,7 @@ export default {
},//end methods
mounted() {
this.$nextTick(() => {
- initDicts(this)
-
+ initDicts(this)
});
}
}
diff --git a/src/views/xm/rpt/CompsCard.vue b/src/views/xm/rpt/CompsCard.vue
index 0369c908..d11a179c 100644
--- a/src/views/xm/rpt/CompsCard.vue
+++ b/src/views/xm/rpt/CompsCard.vue
@@ -124,7 +124,7 @@ export default {
xmBranchMenuDayAccumulate:()=>import('./branch/menuDayAccumulate.vue'),
},
- props:['xmTestCasedb','xmTestPlan','xmProduct','xmProject','xmIteration','showToolBar','category','showParams','isRptCfg','printVisible'],
+ props:['xmTestCasedb','xmTestPlan','xmProduct','xmProject','xmIteration','showToolBar','category','showParams','isRptCfg','printVisible','isRptShow'],
computed: {
...mapGetters(['userInfo']),
compIds(){
@@ -165,6 +165,9 @@ export default {
return params;
}
return params;
+ },
+ toLoadXmRptConfigCpd(){
+ return this.isRptCfg || this.isRptShow
}
},
@@ -176,18 +179,16 @@ export default {
},
deep:true,
},
- isRptCfg(){
- if(this.isRptCfg==true){
- this.$nextTick(()=>{
- this.compCfgList.forEach(k=>{
- this.sizeAutoChange(k);
- })
+ toLoadXmRptConfigCpd(){
+ this.getXmRptConfig();
+ this.$nextTick(()=>{
+ this.compCfgList.forEach(k=>{
+ this.sizeAutoChange(k);
})
-
- }
+ })
},
rptConfigParamsCpd(){
- if(this.isRptCfg){
+ if(this.isRptCfg ||this.isRptShow){
this.getXmRptConfig()
}
}
@@ -226,11 +227,12 @@ export default {
initData(){
this.getXmRptConfig();
},
- getXmRptConfig(){
- if(!this.isRptCfg){
+ getXmRptConfig(){
+ if(!this.toLoadXmRptConfigCpd){
return;
}
- listXmRptConfig(this.rptConfigParamsCpd).then(res=>{
+ var params={bizType:this.rptConfigParamsCpd.bizType,bizId:this.rptConfigParamsCpd.bizId}
+ listXmRptConfig(params).then(res=>{
this.xmRptConfig=res.data.data[0]
})
},
diff --git a/src/views/xm/rpt/index.vue b/src/views/xm/rpt/index.vue
index b7ae8247..38a8da84 100644
--- a/src/views/xm/rpt/index.vue
+++ b/src/views/xm/rpt/index.vue
@@ -1,10 +1,10 @@
-
- 取消配置保存配置
+
+ 取消配置保存配置
-
+
@@ -18,7 +18,7 @@ import { mapGetters } from 'vuex'
import dayjs from 'dayjs'
export default {
- props:['xmProduct','xmIteration','xmProject','xmTestCasedb','xmTestPlan','category'],
+ props:['xmProduct','xmIteration','xmProject','xmTestCasedb','xmTestPlan','category','isRptShow'],
components: {compsSet, compsCard},
computed: {
...mapGetters([
@@ -31,14 +31,14 @@ export default {
data() {
return {
- rptConfigVisible:false,
+ isRptCfg:false,
}
},
methods: {
saveXmRptConfig(){
var callback=()=>{
- this.rptConfigVisible=false;
+ this.isRptCfg=false;
}
this.$refs['compsCard'].submitXmPrtConfig(callback)
},