diff --git a/src/views/xm/rpt/branch/branchWorkItemDayList.vue b/src/views/xm/rpt/branch/branchWorkItemDayList.vue index 7e073aab..19d184bd 100644 --- a/src/views/xm/rpt/branch/branchWorkItemDayList.vue +++ b/src/views/xm/rpt/branch/branchWorkItemDayList.vue @@ -2,16 +2,32 @@
+
+
+

{{title?title:'请输入标题'}}

+
+ + {{remark?remark:'请输入说明'}} + +
+
+ +

{{title}}

+
+ + {{remark}} + +
-
+
- +
- +
查询 @@ -35,7 +51,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['xmProduct','xmProject','xmIteration'], + props:['xmProduct','xmProject','xmIteration','cfg','category','isRptCfg'], computed: { ...mapGetters([ 'userInfo','roles' @@ -62,6 +78,9 @@ if(this.xmProduct && this.xmProduct.id){ return this.xmProduct } + if(this.cfg && this.cfg.params && this.cfg.params.productId){ + return {id:this.cfg.params.productId} + } return null; } @@ -89,8 +108,8 @@ params:{ }, - title:'', - remark:'', + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... @@ -103,11 +122,7 @@ },//end data methods: { listXmBranchStateHis(){ - var params={orderBy:'biz_date asc'} - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params=this.params listXmBranchStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) @@ -118,7 +133,36 @@ this.filters.product=this.xmProduct this.filters.project=this.xmProject this.filters.iteration=this.xmIteration - this.filters.testCasedb=this.xmTestCasedb + this.filters.testCasedb=this.xmTestCasedb + + if( this.filters.testPlan && this.filters.testPlan.id){ + this.params.planId= this.filters.testPlan.id + } + + if( this.filters.product && this.filters.product.id){ + this.params.productId= this.filters.product.id + } + + if( this.filters.project && this.filters.project.id){ + this.params.projectId= this.filters.project.id + } + + if( this.filters.iteration && this.filters.iteration.id){ + this.params.iterationId= this.filters.iteration.id + } + + + if( this.filters.testCasedb && this.filters.testCasedb.id){ + this.params.casedbId= this.filters.testCasedb.id + } + if(this.cfg && this.cfg.id){ + this.params=this.cfg.params + this.title=this.cfg.title + this.remark=this.cfg.remark + } + if(this.isRptCfg && !this.title){ + this.title="企业工作项每日趋势图" + } this.xmProductStateHiss=[] if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect(); @@ -279,9 +323,39 @@ - \ No newline at end of file