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

@@ -6,12 +6,9 @@
             <option value="3">月报</option>
         </select>
     </div>
-    <div class="panel-col" v-show="params.type==1">
+    <div class="panel-col" v-show="params.type!=2">
         <com-calendar :type="type" :value.sync="params.reqTime" :placeholder="'选择时间'"></com-calendar>
     </div>
-    <div class="panel-col" v-show="params.type==3">
-        <com-calendar :type="type" :value.sync="params.reqTime.substring(0,7)" :placeholder="'选择时间'"></com-calendar>
-    </div>
     <div class="panel-col" v-show="params.type==2">
         <com-calendar :type="type" :value.sync="params.beginTime" :placeholder="'开始时间'"></com-calendar>
     </div>

@@ -106,6 +106,17 @@
         },
         methods: {
             submit() {
+                if(this.params.type==3){
+                    //月报：reqTime截取月份，开始结束时间不传
+                    this.params.reqTime=this.params.reqTime.substring(0,7);
+                    this.params.beginTime=this.params.endTime="";
+                }else if(this.params.type==1){
+                    //日报：开始结束时间不传
+                    this.params.beginTime=this.params.endTime="";
+                }else{
+                    //周报：reqTime时间不传
+                    this.params.reqTime="";
+                }
                 var data = {
                     type: this.params.type,
                     reqTime: this.getTime(this.params.reqTime),

@@ -105,6 +105,17 @@
         },
         methods: {
             submit() {
+                if(this.params.type==3){
+                    //月报：reqTime截取月份，开始结束时间不传
+                    this.params.reqTime=this.params.reqTime.substring(0,7);
+                    this.params.beginTime=this.params.endTime="";
+                }else if(this.params.type==1){
+                    //日报：开始结束时间不传
+                    this.params.beginTime=this.params.endTime="";
+                }else{
+                    //周报：reqTime时间不传
+                    this.params.reqTime="";
+                }
                 var data = {
                     type: this.params.type,
                     reqTime: this.getTime(this.params.reqTime),