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

src/components/Hotel/roomReservationsDetailsNew.vue

@@ -995,7 +995,6 @@
                   if (subItem.CurrencyId == 0) {
                     subItem.CurrencyId = 3;
                   }
-                  this.calculationPrice(subItem);
                   subItem.OrderDetailsList.forEach((x, index1) => {
                     x.HouseTypeCount = x.HouseTypeCount.toString();
                     x.UnitPrice = x.UnitPrice.toString();
@@ -1005,8 +1004,7 @@
                     subItem.ReserveNo = this.$route.query.NewCombinationNum;
                   }
                   subItem.OrderDetailsList = subItem.OrderDetailsList.filter(item => item.HouseType === 2)
-                  console.log('subItem.OrderDetailsList', subItem.OrderDetailsList, subItem.OrderDetailsList
-                    .filter(item => item.HouseType === 2))
+                  this.calculationPrice(subItem);
                   subItem.isShowPop = false;
                   subItem.ckedHotelName = "";
                   //遍历手配

src/components/SalesModule/enrollTotal.vue

@@ -460,7 +460,8 @@
         <th width="80">{{ $t("fnc.shishou") }}</th>
         <th width="70">{{ $t("fnc.youhui") }}</th>
         <th width="70">{{ $t("salesModule.HappinessPassbook") }}</th>
-        <th width="70">{{ $t("fnc.xiaofei") }}</th>
+        <th width="70">应收小费</th>
+        <th width="70">实收{{ $t("fnc.xiaofei") }}</th>
         <th width="70">{{ $t("fnc.tuikuan") }}</th>
         <th width="70">{{ $t("fnc.ptshuijin") }}</th>
         <th width="80">{{ $t("Operation.Op_platZaitu") }}</th>
@@ -786,6 +787,7 @@
               item.redEnvelopeMoney
             }}</span>
           </td>
+          <td style="color: #ff9c00">{{ item.preferTipAmount }}</td>
           <td v-if="item.tipMoney">{{ item.tipMoney }}</td>
           <td v-else>0.00</td>
 
@@ -824,7 +826,7 @@
         </tr>
         <tr style="height: 20px">
           <td
-            :colspan="isEditOrderCreate == 1 ? 17 : 16"
+            :colspan="isEditOrderCreate == 1 ? 18 : 17"
             class="RL_Order"
             style="height: 20px"
           >
@@ -964,7 +966,7 @@
             </div>
           </td>
           <td
-            colspan="5"
+            colspan="6"
             class="groupTourOrder_tickets"
             style="height: 40px; cursor: pointer"
           >

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -227,6 +227,12 @@
                   countData.DueinMoney !=null ?countData.DueinMoney:'0'
                 }};</span
               >
+              <span>应收小费：
+                {{countData.PreferTipAmount}}
+              </span>
+              <span>实收小费：
+                {{countData.CompensationMoney}}
+              </span>
               <span>{{ $t("fnc.ztjine") }}：{{ countData.ZaiTu!=null ?countData.ZaiTu:'0' }};</span>
             </p>
           </div>
@@ -340,6 +346,12 @@
                 <i style="background-color: #ff0000"></i>
                 <span>{{ $t("fnc.yhcnyshenhe") }}</span>
               </span>
+              <span>应收小费：
+                {{countData.PreferTipAmount}}
+              </span>
+              <span>实收小费：
+                {{countData.CompensationMoney}}
+              </span>
               <span class="groupTourOrderByTuan_ico">
                 <i style="background-color: #000000"></i>
                 <span>{{ $t("fnc.ytongguo") }}</span>
@@ -370,10 +382,11 @@
         
         <th width="80">{{ $t("fnc.yszonge") }}</th>
         <th width="80">{{ $t("fnc.shishou") }}</th>
-        <th width="80">人头小费</th>
+        
         <th width="70">{{ $t("fnc.youhui") }}</th>
         <th width="80">{{ $t("salesModule.HappinessPassbook") }}</th>
-        <th width="70">{{ $t("fnc.xiaofei") }}</th>
+        <th width="80">应收小费</th>
+        <th width="70">实收{{ $t("fnc.xiaofei") }}</th>
         <th width="70">{{ $t("fnc.tuikuan") }}</th>
         <th width="70">{{ $t("fnc.ptshuijin") }}</th>
         <th width="80">{{ $t("Operation.Op_platZaitu") }}</th>
@@ -569,7 +582,7 @@
               item.income
             }}</span>
           </td>
-          <td style="color: #ff9c00">￥{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</td>
+          
           <!-- 优惠 -->
           <td>
             <el-popover style="padding: 0" width="600" trigger="click">
@@ -691,6 +704,7 @@
               >{{ item.redEnvelopeMoney }}</span
             >
           </td>
+          <td style="color: #ff9c00">￥{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</td>
           <td v-if="item.tipMoney">{{ item.tipMoney }}</td>
           <td v-else>0.00</td>
           <td>{{ item.refund }}</td>

src/components/myOrdersAllType/components/allList.vue

@@ -233,6 +233,7 @@
                 </li>
                 <li>
                   <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click.stop="msg.pageIndex=1,currentPage=1,GetList()" />
+                  <input type="button" class="hollowFixedBtn" value="导出" @click="exportExcel">
                 </li>
               </ul>
           </div>
@@ -408,6 +409,13 @@
           }
         },
         methods: {
+          exportExcel() { //导出
+            let msg = JSON.parse(JSON.stringify(this.msg))
+            let userInfo = this.getLocalStorage();
+            msg.uid = userInfo.EmployeeId
+            var fileName = "订单统计表.xls";
+            this.GetLocalFile("GuestOrder_post_GetDownLodGuestOrderStatisticsList", msg, fileName);
+          },
             GetOrderTypeEnumList() {
           this.apipost("CarSingle_post_GetOrderTypeEnumList", {}, (res) => {
             if (res.data.resultCode == 1) {