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

src/components/Restaurant/RestaurantSalesBoard.vue

@@ -264,8 +264,8 @@
     data() {
       return {
         msg: {
-          Year: new Date().Format("yyyy"),
-          Month: new Date().Format("MM"),
+          Year: 0,
+          Month: 0,
           DiningID: 0,
           loading: false
         },
@@ -345,6 +345,8 @@
       GetHoltelInventory() {
         this.msg.loading = true;
         var that = this;
+        this.msg.Year = this.currentYear;
+        this.msg.Month = this.currentMonth;
         this.apipost(
           "order_post_GetDinnerMonthStatistics",
           this.msg,
@@ -409,6 +411,9 @@
       let myDate = new Date();
       this.currentYear = myDate.getFullYear();
       this.currentMonth = myDate.getMonth() + 1;
+      this.msg.Year = this.currentYear;
+      this.msg.Month = this.currentDay;
+
       this.GetDinnerList();
       this.initCalendar();
       this.GetHoltelInventory();