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

src/components/Restaurant/RestaurantSalesBoard.vue

@@ -212,6 +212,7 @@
         </li>
         <li style="margin-right:50px;">
           <button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
+          <button class="normalBtn" type="button" @click="DownLoadDinnerSalesBoard()" style="display:none;">下载</button>
         </li>
       </ul>
     </div>
@@ -385,7 +386,23 @@
           err => {}
         );
       },
-     
+      //下载餐厅统计
+      DownLoadDinnerSalesBoard() {
+        if (this.msg.DiningID <= 0) {
+          this.Info("请选择餐厅!");
+          return;
+        }
+        this.msg.loading = true;
+        let qMsg = {
+          queryMsg: this.msg,
+          uid: this.getLocalStorage().EmployeeId
+        };
+        let fileName = "餐厅下载" + this.$commonUtils.getCurrentDate() + ".xls";
+        this.GetLocalFile("dinner_get_downloadDinnerSalesBoard", qMsg, fileName,
+          res => {
+            this.msg.loading = false;
+          });
+      }
     },
     mounted() {
       //初始化日历

src/components/dmc/manager/dmcTotalTable.vue

@@ -283,7 +283,7 @@
               </td>
               <td>
                 <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单"
-                  @click="DownLoadGuestList(item,outItem,index)">旅客名单</a>
+                  @click="DownLoadGuestList(item,outItem,index)">出境名单</a>
               </td>
               <td>
                 <div class="fz16 fbold linkspan">