Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/temp/operation.vue

@@ -889,13 +889,13 @@
       this.Year = new Date().getFullYear()
       this.LastMonthTime = new Date().getMonth()
       this.MonthTime = new Date().getMonth() + 1
-      this.msg.Month = this.Year + '-' + (this.MonthTime > 10 ? this.MonthTime : '0' + this.MonthTime)
+      this.msg.Month = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime)
       this.MonthList[0].Name = this.MonthList[0].Name + '(' + this.LastMonthTime + '月)'
       this.MonthList[1].Name = this.MonthList[1].Name + '(' + this.MonthTime + '月)'
 
       this.commissionMsg.DepartSTime = this.getBeforeDate(93, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
       var MonthDayNum = new Date(this.Year, this.MonthTime, 0).getDate(); //计算当月的天数
-      this.commissionMsg.DepartETime = this.Year + '-' + (this.MonthTime > 10 ? this.MonthTime : '0' + this.MonthTime) +
+      this.commissionMsg.DepartETime = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime) +
         '-' + (MonthDayNum > 10 ? MonthDayNum : '0' + MonthDayNum) //出发结束
       this.iWorkbench()
       this.GetOrderPageList()