小费

src/components/SalesModule/enrollTotal.vue

@@ -158,6 +158,7 @@
         <th width="80">成交单价</th>
         <th width="80">应收总额</th>
         <th width="80">实收</th>
+        <th width="60">小费</th>
         <th width="80">退款</th>
         <th width="80">平台税金</th>
         <th width="80">平台在途</th>
@@ -205,6 +206,8 @@
             <span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span>
             <span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>
           </td>
+          <td v-if="item.tipMoney">{{item.tipMoney}}</td>
+          <td v-else>0.00</td>
           <td>{{item.refund}}</td>
           <td>{{item.platformTax}}</td>
           <td>{{item.zaiTuMoney}}</td>
@@ -238,7 +241,7 @@
               </div>
             </div>
           </td>
-          <td colspan="3" class="groupTourOrder_remarks" style="height: 40px;">
+          <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
             <div>
               <div>
                 <span>OP备注:</span>

src/components/SalesModule/enrollTotalTwo.vue

@@ -213,6 +213,7 @@
         <th width="80">成交单价</th>
         <th width="80">应收总额</th>
         <th width="80">实收</th>
+        <th width="60">小费</th>
         <th width="80">退款</th>
         <th width="80">平台税金</th>
         <th width="80">在途</th>
@@ -261,6 +262,8 @@
             <span v-if='item.isEnd==0' style="cursor: pointer;">{{moneyFormat(item.income)}}</span>
             <span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{moneyFormat(item.income)}}</span>
           </td>
+          <td v-if="item.tipMoney">{{item.tipMoney}}</td>
+          <td v-else>0.00</td>
           <td>{{item.refund}}</td>
           <td>{{item.platformTax}}</td>
           <td>{{moneyFormat(item.zaiTuMoney)}}</td>
@@ -291,7 +294,7 @@
               </div>
             </div>
           </td>
-          <td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
+          <td colspan="8" class="groupTourOrder_tickets" style="height: 40px;">
             <div>
               <div>收款单据：</div>
               <div>

src/components/SalesModule/groupTourOrder.vue

@@ -1378,7 +1378,7 @@
               <span class="RL-redType RL-remarkCon" v-else>
                 <span>暂无名单</span>
               </span>
-              <span v-if="item.tipMoney">（小费：{{item.tipMoney}}）</span>
+              <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
             </td>
           </tr>
 				<tr>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1595,6 +1595,7 @@
               <span class="RL-redType RL-remarkCon" v-else>
                 <span>暂无名单</span>
               </span>
+              <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
             </td>
           </tr>
         <tr>
@@ -3549,7 +3550,7 @@ export default {
       console.log(obj)
       this.apipost(
         "Financial_post_GetOrderFinanceList",
-        { OrderId: obj.orderId, OrderResource: 8 },
+        { OrderId: obj.orderId, OrderResource: 8,IsTravelMoney:1 },
         res => {
           if (res.data.resultCode == 1) {
             this.orderList = res.data.data;

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -610,14 +610,14 @@
     font-size: 14px;
   }
 
-  .RL-remarkCon {
+  .RegistrationList .RL-remarkCon {
     float: left;
     display: inline-block;
     width: 94%;
     font-size: 14px;
   }
 
-  .RL-remarkCon span {
+  .RegistrationList .RL-remarkCon span {
     margin-right: 5px;
   }
 
@@ -627,6 +627,7 @@
 
   .RegistrationList .RL_Order .RL-redType {
     cursor: pointer;
+    width: auto !important;
   }
 
   .TMOrderList span {
@@ -1494,6 +1495,7 @@
               <span class="RL-redType RL-remarkCon" v-else>
                 <span>暂无名单</span>
               </span>
+              <span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
             </td>
           </tr>
           <tr>
@@ -1681,6 +1683,7 @@
                 <span class="RL-redType RL-remarkCon" v-else>
                   <span>暂无名单</span>
                 </span>
+                <span v-if="childItem.TipMoney" style="color:red">（小费：{{childItem.TipMoney}}）</span>
               </td>
             </tr>
             <tr>
@@ -1897,6 +1900,7 @@
               <span class="RL-redType RL-remarkCon" v-else>
                 <span>暂无名单</span>
               </span>
+              <span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
             </td>
           </tr>
           <tr>
@@ -1921,8 +1925,8 @@
                 <span v-for="(item2,index2) in item.FinanceList" :key="index2">
                   <span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue" >{{item2.frID}}</span>
                   <span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green" >{{item2.frID}}</span>
-                  <span v-else-if="item2.colorState===3"class="groupTourOrder_tickets_red" >{{item2.frID}}</span>
-                  <span v-else-if="item2.colorState===4"class="groupTourOrder_tickets_black" >{{item2.frID}}</span>
+                  <span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" >{{item2.frID}}</span>
+                  <span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" >{{item2.frID}}</span>
                 </span>
                 <span v-if="item.FinanceList.length===0">暂无数据</span>
               </div>
@@ -3541,7 +3545,8 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
         this.apipost(
           "Financial_post_GetOrderFinanceList", {
             OrderId: obj.OrderId,
-            OrderResource: 8
+            OrderResource: 8,
+            IsTravelMoney:1
           },
           res => {
             if (res.data.resultCode == 1) {

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -182,6 +182,7 @@
         <th width="80">成交单价</th>
         <th width="80">应收总额</th>
         <th width="80">实收</th>
+        <th width="60">小费</th>
         <th width="80">退款</th>
         <th width="80">平台税金</th>
         <th width="80">平台在途</th>
@@ -242,6 +243,8 @@
             <span v-if="item.isEnd==0" >{{item.income}}</span>
             <span v-if="item.isEnd!=0" style="color: #e95252;">{{item.income}}</span>
           </td>
+          <td v-if="item.tipMoney">{{item.tipMoney}}</td>
+          <td v-else>0.00</td>
           <td>{{item.refund}}</td>
           <td>{{item.platformTax}}</td>
           <td>{{item.zaiTuMoney}}</td>
@@ -261,11 +264,11 @@
           </td>
         </tr>
         <tr>
-          <td colspan="6" class="groupTourOrder_remarks" style="height: 20px;">
-            <div v-if="item.platformOrder!==''" style="font-size: 12px;">
+          <td colspan="7" class="groupTourOrder_remarks" style="height: 20px;">
+            <!-- <div v-if="item.platformOrder!==''" style="font-size: 12px;">
               <em>平台订单号：</em>
               <span>{{item.platformOrder}}</span>
-            </div>
+            </div> -->
             <div>
               <div>
                 <span>备注：</span>