Commit 3a3b4305 authored by Mac's avatar Mac

1

parent d7d34a77
...@@ -178,6 +178,7 @@ ...@@ -178,6 +178,7 @@
<el-table-column label="实付" prop="PayMoney" width="70"></el-table-column> <el-table-column label="实付" prop="PayMoney" width="70"></el-table-column>
</el-table-column> --> </el-table-column> -->
<el-table-column prop="TotalDepositMoney" label="储值卡抵扣" ></el-table-column>
<el-table-column prop="CompanyName" label="公司名称" width="120"></el-table-column> <el-table-column prop="CompanyName" label="公司名称" width="120"></el-table-column>
<el-table-column prop="GrossProfit" label="毛利" ></el-table-column> <el-table-column prop="GrossProfit" label="毛利" ></el-table-column>
...@@ -270,10 +271,10 @@ ...@@ -270,10 +271,10 @@
if(this.$route.query.year && this.$route.query.month) if(this.$route.query.year && this.$route.query.month)
{ {
this.msg.StartDate=this.$route.query.year+"-"+this.$route.query.month+"-01"; this.msg.StartDate=this.$route.query.year+"-"+this.$route.query.month+"-01";
var d1=new Date(this.msg.StartDate); var d1=new Date(this.msg.StartDate);
var d2=new Date(d1); var d2=new Date(d1);
d2.setMonth(d2.getMonth()+1); d2.setMonth(d2.getMonth()+1);
d2.setDate(d2.getDate()-1); d2.setDate(d2.getDate()-1);
var month = d2.getMonth()+1; var month = d2.getMonth()+1;
var day = d2.getDate(); var day = d2.getDate();
this.msg.EndDate= d2.getFullYear()+'-'+month+'-'+day; this.msg.EndDate= d2.getFullYear()+'-'+month+'-'+day;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment