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

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -294,8 +294,8 @@
         <th>订单号</th>
         <th>第三方订单号</th>
         <th>房间数</th>
-        <th>总价</th>
-        <th>已收</th>
+        <th>总额</th>
+        <th>实收</th>
         <th>大红包</th>
         <th>优惠金额</th>
         <th>待收金额</th>

src/components/TravelManager/TravelList/OpHotelOrder.vue

@@ -73,8 +73,8 @@
         <th>订单号</th>
         <th>客户信息</th>
         <th>房间数</th>
-        <th>总价格</th>
-        <th>总收入</th>
+        <th>总额</th>
+        <th>实收</th>
         <th>抵扣金额</th>
         <th>优惠金额</th>
         <th>待收金额</th>

src/components/dmc/manager/dmcTotalTable.vue

@@ -330,6 +330,7 @@
                   <span style="color: #4BCA81;" v-if="item.FoodsResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span>
                 </div>
+                 <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单" @click="DownLoadDinner(item)">餐配下载</a>
               </td>
 
               <td>
@@ -1058,7 +1059,26 @@
             tab: "手配依赖书"
           }
         })
+      },
+      DownLoadDinner(item)
+      {
+        this.loading = true;
+        //导出报表
+        let msg = {
+          TCID: item.TCID,
+          StartDate:item.StartDateStr,
+          DayNum:item.DayNum
+        };
+        var fileName = "餐配下载.xls";
+        if (item.TCNUMS != null) {
+          fileName =
+            "【" + item.TCNUMS + "】餐配下载.xls";
         }
+        this.GetLocalFile("travel_get_GetTravelDinnerDownLoad", msg, fileName,
+          res => {
+            this.loading = false;
+          });
+      },
     },
     mounted() {
       let myDate = new Date();
@@ -1069,7 +1089,6 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
-      //this.msg.CombinationNum = 'JVS0727OTC-MUA';
       this.getLineList();
       this.getList();
       this.getCompanyList();