fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by weiqingting
Commit 3bb12702051ea2431b14ad888d860f89ccb8e36f 2 parents 4d0cf5d9 eb105da7

Merge branch 'yohobuy-shop-dev-4.6-20160606' of http://git.yoho.cn/fe/yohobuy-sh… 

…op-fe2 into yohobuy-shop-dev-4.6-20160606
Inline Side-by-side
Showing 3 changed files with 23 additions and 4 deletions
@@ -6,12 +6,9 @@ @@ -6,12 +6,9 @@
6 <option value="3">月报</option> 6 <option value="3">月报</option>
7 </select> 7 </select>
8 </div> 8 </div>
9 - <div class="panel-col" v-show="params.type==1"> 9 + <div class="panel-col" v-show="params.type!=2">
10 <com-calendar :type="type" :value.sync="params.reqTime" :placeholder="'选择时间'"></com-calendar> 10 <com-calendar :type="type" :value.sync="params.reqTime" :placeholder="'选择时间'"></com-calendar>
11 </div> 11 </div>
12 - <div class="panel-col" v-show="params.type==3">  
13 - <com-calendar :type="type" :value.sync="params.reqTime.substring(0,7)" :placeholder="'选择时间'"></com-calendar>  
14 - </div>  
15 <div class="panel-col" v-show="params.type==2"> 12 <div class="panel-col" v-show="params.type==2">
16 <com-calendar :type="type" :value.sync="params.beginTime" :placeholder="'开始时间'"></com-calendar> 13 <com-calendar :type="type" :value.sync="params.beginTime" :placeholder="'开始时间'"></com-calendar>
17 </div> 14 </div>
@@ -106,6 +106,17 @@ @@ -106,6 +106,17 @@
106 }, 106 },
107 methods: { 107 methods: {
108 submit() { 108 submit() {
  109 + if(this.params.type==3){
  110 + //月报：reqTime截取月份，开始结束时间不传
  111 + this.params.reqTime=this.params.reqTime.substring(0,7);
  112 + this.params.beginTime=this.params.endTime="";
  113 + }else if(this.params.type==1){
  114 + //日报：开始结束时间不传
  115 + this.params.beginTime=this.params.endTime="";
  116 + }else{
  117 + //周报：reqTime时间不传
  118 + this.params.reqTime="";
  119 + }
109 var data = { 120 var data = {
110 type: this.params.type, 121 type: this.params.type,
111 reqTime: this.getTime(this.params.reqTime), 122 reqTime: this.getTime(this.params.reqTime),
@@ -105,6 +105,17 @@ @@ -105,6 +105,17 @@
105 }, 105 },
106 methods: { 106 methods: {
107 submit() { 107 submit() {
  108 + if(this.params.type==3){
  109 + //月报：reqTime截取月份，开始结束时间不传
  110 + this.params.reqTime=this.params.reqTime.substring(0,7);
  111 + this.params.beginTime=this.params.endTime="";
  112 + }else if(this.params.type==1){
  113 + //日报：开始结束时间不传
  114 + this.params.beginTime=this.params.endTime="";
  115 + }else{
  116 + //周报：reqTime时间不传
  117 + this.params.reqTime="";
  118 + }
108 var data = { 119 var data = {
109 type: this.params.type, 120 type: this.params.type,
110 reqTime: this.getTime(this.params.reqTime), 121 reqTime: this.getTime(this.params.reqTime),