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

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>
@@ -179,6 +180,7 @@
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
             <p>发团：{{item.startDate}}</p>
             <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
+            <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
           </td>
           <td>
             <p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
@@ -205,6 +207,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 +242,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

@@ -1223,6 +1223,7 @@
             <p style="min-width: 180px;">发团：{{item.startDate}}</p>
             <p>下单时间：{{item.createDate}}</p>
             <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
+            <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
           </td>
           <td>
 						<p class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>
@@ -1378,7 +1379,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

@@ -1415,6 +1415,7 @@
               <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
               <p>下单时间：{{item.createDate}}</p>
               <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
+              <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
             </td>
             <td>
               <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder' class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>
@@ -1572,7 +1573,7 @@
                       <div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div>
                       <div v-if="isUpdateOrder" @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'>OP备注</div>
                       <!-- v-if="item.isUpdateOrderCommission" -->
-                      <div v-if="isUpdateOrderCommission" @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate, TiChengLoading = true'>修改提成</div>
+                      <div v-if="isUpdateOrderCommission" @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate,TCMsg.LatestCommissionMoney=item.latestCommissionMoney, TiChengLoading = true'>修改提成</div>
                       <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')" @click='setChargeLoss(item)'>
                         <span v-if="item.isChargeLossOrders==1">恢复收损单</span>
                         <span v-else>设为收损单</span>
@@ -1595,6 +1596,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>
@@ -1952,10 +1954,14 @@
       <el-dialog custom-class='w350' title="修改提成" :visible.sync="TiChengLoading" center :before-close="initTCMsg">
         <!--zhaunMsg.TCNUM-->
         <el-form label-width="110px">
-          <el-form-item label="扣除提成比例：" class="w280">
+          <!-- <el-form-item label="扣除提成比例：" class="w280">
             <el-input placeholder="请输入" v-model="TCMsg.CommissionMinusRate" @keyup.native="maxCommissionMinusRate">
               <template slot="append">%</template>
             </el-input>
+          </el-form-item> -->
+          <el-form-item label="提成金额：" class="w280">
+            <el-input placeholder="请输入" type="number" v-model="TCMsg.LatestCommissionMoney" >
+            </el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -1983,6 +1989,7 @@ export default {
       TCMsg: {
         OrderId: 0,
         CommissionMinusRate: 0,
+        LatestCommissionMoney: '',
       },
     	checkedObj:{},
     	positionId:0,
@@ -2306,6 +2313,7 @@ export default {
       this.TCMsg = {
         OrderId: 0,
         CommissionMinusRate: 0,
+        LatestCommissionMoney:''
       }
     },
     TransferDocuments: function () {
@@ -3549,7 +3557,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 {
@@ -1475,7 +1476,7 @@
                       <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
-                      <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
+                      <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate,TCMsg.LatestCommissionMoney=item.LatestCommissionMoney, TiChengLoading = true'>修改提成</div>
                       <div @click='deleteItem(item)'>删除</div>
                     </div>
                     <el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
@@ -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>
@@ -1543,6 +1545,7 @@
                 <!-- <p>发团：{{childItem.startDate}}</p> -->
                 <p>下单时间：{{childItem.CreateDate}}</p>
                 <p v-if='childItem.CommissionMoney' style="color:red">提成：{{childItem.CommissionMoney}}</p>
+                <p v-else-if="childItem.LatestCommissionMoney" style="color:red">提成：{{childItem.LatestCommissionMoney}}</p>
               </td>
               <td>
                 <p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;" :title="childItem.ContactName">
@@ -1659,7 +1662,7 @@
                         <div v-if="userId==1" @click="getSalerInfo(childItem)">修改业务员</div>
                         <div @click="transfer(childItem)">订单转团</div>
                         <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId'>OP备注</div>
-                        <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
+                        <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate,TCMsg.LatestCommissionMoney=childItem.LatestCommissionMoney, TiChengLoading = true'>修改提成</div>
                         <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
                           @click='deleteItem(childItem)'>
                           删除
@@ -1681,6 +1684,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>
@@ -1878,7 +1882,7 @@
                       <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
-                      <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'>修改提成</div>
+                      <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate,TCMsg.LatestCommissionMoney=item.LatestCommissionMoney, TiChengLoading = true'>修改提成</div>
                       <div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div>
                     </div>
                     <el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
@@ -1897,6 +1901,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 +1926,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>
@@ -2088,10 +2093,14 @@
     <el-dialog custom-class='w350' title="修改提成" :visible.sync="TiChengLoading" center :before-close="initTCMsg">
         <!--zhaunMsg.TCNUM-->
         <el-form label-width="110px">
-          <el-form-item label="扣除提成比例：" class="w280">
+          <!-- <el-form-item label="扣除提成比例：" class="w280">
             <el-input placeholder="请输入" v-model="TCMsg.CommissionMinusRate" @keyup.native="maxCommissionMinusRate">
               <template slot="append">%</template>
             </el-input>
+          </el-form-item> -->
+          <el-form-item label="提成金额：" class="w280">
+            <el-input placeholder="请输入" type="number" v-model="TCMsg.LatestCommissionMoney">
+            </el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -2128,6 +2137,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
       TCMsg: {
         OrderId: 0,
         CommissionMinusRate: 0,
+        LatestCommissionMoney:''
       },
       zhuanLoading: false,
         notUpdate: true,
@@ -2486,6 +2496,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
         this.TCMsg = {
           OrderId: 0,
           CommissionMinusRate: 0,
+          LatestCommissionMoney:''
         }
       },
       goUrlSFD: function (path, name, item) {
@@ -3541,7 +3552,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>