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

src/components/FinancialModule/CapitalAllocation.vue

@@ -144,6 +144,7 @@
         <tr>
           <th>{{$t('fnc.danhao')}}</th>
           <th>{{$t('fnc.jine')}}</th>
+          <th width="350">调拨账户</th>
           <!-- <th>实付</th> -->
           <!-- <th>原币金额</th> -->
           <!-- <th>交易日期</th> -->
@@ -156,6 +157,30 @@
         <tr v-for="(item, index) in dataList">
           <td style="cursor:pointer" @click="goDetail('CapitalAllocationDetail', item.FrID)">{{item.FrID}}</td>
           <td>{{item.Money}}</td>
+          <td>
+              <template v-if="item.TradeWayList&&item.TradeWayList.length>0">
+                <div class="_TradeWayList" v-for="(tw,twIn) in item.TradeWayList"
+                  style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:300px">
+                  <p>
+                    <span style="float: left;">{{(tw.AllotType==1?'收':'支')}}</span>
+                    <span style="font-weight: bold;color:#333333">{{tw.Alias}}</span>
+                    <span class="_bank_name" style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">
+                      {{tw.TypeName}}</span>
+                    <span
+                      style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;"
+                      :style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?'无':tw.AccountType}}</span>
+                  </p>
+                  <p style="color:#333333">{{tw.BankNo}}
+                  <span style="float: right;">{{tw.OriginalMoney}}{{tw.CurrencyName}}</span>
+                  </p>
+                </div>
+              </template>
+              <template v-else>
+                <div class="_pad5">
+                  无
+                </div>
+              </template>
+          </td>
           <!-- <td>{{item.PayMoney}}</td> -->
           <!-- <td>{{item.OriginalMoney}}</td> -->
           <!-- <td>{{item.TradeDate}}</td> -->

src/components/FinancialModule/CapitalAllocationDetail.vue

@@ -778,13 +778,28 @@
                         </div>
                     </div>
                     <div style="padding-left: 75px;">
-                      <button class="hollowFixedBtn" v-if="(bossID===1 || bossID===5) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)" @click="bohui()">{{$t('fnc.bohui')}}</button>
+                      <button class="hollowFixedBtn" v-if="(bossID===1 || bossID===5||bossID===1903 || bossID===2786) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)" 
+                      @click="bohui()">{{$t('fnc.bohui')}}</button>
                       <button class="hollowFixedBtn" @click="AuditOrRefund()">{{$t('pub.returnBack')}}</button>
                     </div>
                 </div>
             </div>
+            <el-dialog custom-class='w400' :title="$t('objFill.tsbh')" :visible.sync="finacialDialog" center>
+      <template>
+        <el-input type="textarea" v-model="AuditOrRefundMsg.Description" rows="3" resize="none"></el-input>
+        <div class="FD_remark_list">
+          <span>{{$t('objFill.zhu')}}：</span>
+          <span>{{$t('objFill.bhtis')}}</span>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <button class="hollowFixedBtn" @click="finacialDialog=false">{{$t('pub.cancelBtn')}}</button>
+          <button class="normalBtn" type="primary" @click="setBoHui()">{{$t('pub.sureBtn')}}</button>
+        </div>
+      </template>
+    </el-dialog>
     </div>
 </template>
+
 <script>
 import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue";
 export default {
@@ -817,6 +832,12 @@ export default {
       },
       endDate: '',
       huijiShow:false,
+      //驳回弹窗
+      finacialDialog: false,
+      AuditOrRefundMsg: {
+          WorkFlowId: '',
+          Description: ''
+        },
     }
   },
   created(){
@@ -1070,6 +1091,22 @@ export default {
         window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Content)
       }
     },
+    bohui() {
+        this.finacialDialog = true;
+        this.AuditOrRefundMsg.WorkFlowId = this.msg.ID;
+      },
+      //确定驳回
+      setBoHui() {
+        this.apipost('Financial_post_PersonRefund', this.AuditOrRefundMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.Success(res.data.message);
+            this.finacialDialog = false;
+            this.getList();
+          } else {
+            this.Error(res.data.message);
+          }
+        }, err => {})
+      },
   },
   mounted(){
     this.msg.ID = this.$route.query.id;

src/components/SalesModule/enrollTotal.vue

@@ -269,8 +269,7 @@
           {{ $t("advmanager.v_xilie") }}&{{ $t("advmanager.v_line") }}
         </th>
         <th width="100">
-          {{ $t("Airticket.Air_Number") }}/{{ $t("salesModule.AirNum")
-          }}{{ $t("salesModule.AirNum") }}
+          {{ $t("Airticket.Air_Number") }}/{{ $t("salesModule.AirNum")}}
         </th>
         <th width="80">{{ $t("fnc.danjia") }}</th>
         <th width="80">{{ $t("fnc.cjdanjia") }}</th>
@@ -283,6 +282,7 @@
         <th width="70">{{ $t("fnc.tuikuan") }}</th>
         <th width="70">{{ $t("fnc.ptshuijin") }}</th>
         <th width="80">{{ $t("Operation.Op_platZaitu") }}</th>
+        <th width="80">现收在途</th>
         <th width="80">{{ $t("Operation.Op_daishou") }}</th>
         <th width="60">{{ $t("admin.admin_status") }}</th>
         <th v-if="isEditOrderCreate == 1" width="140">
@@ -290,7 +290,7 @@
         </th>
       </tr>
       <tr>
-        <td v-show="list.length == 0" :colspan="isEditOrderCreate == 1 ? 19 : 18" align="center">
+        <td v-show="list.length == 0" :colspan="isEditOrderCreate == 1 ? 20 : 19" align="center">
           {{ $t("system.content_noData") }}
         </td>
       </tr>
@@ -542,6 +542,7 @@
           <td>{{ item.refund }}</td>
           <td>{{ item.platformTax }}</td>
           <td>{{ item.zaiTuMoney }}</td>
+          <td>{{ item.cashReceiptsMoney }}</td>
           <td>
             <span :class="{ color_red_order: item.dueInMoney !== item.preferPrice }">{{ item.dueInMoney }}</span>
           </td>
@@ -558,7 +559,7 @@
           </td>
         </tr>
         <tr style="height: 20px">
-          <td :colspan="isEditOrderCreate == 1 ? 18 : 17" class="RL_Order" style="height: 20px">
+          <td :colspan="isEditOrderCreate == 1 ? 19 : 18" class="RL_Order" style="height: 20px">
             <span style="font-size: 14px; color: #333333">{{ $t("salesModule.MD") }}:</span>
             <span v-for="childItem in item.guestList"
               style="font-size: 14px; color: blue">{{ childItem.userName }}&nbsp;&nbsp;</span>
@@ -650,7 +651,7 @@
                 </template>
               </template>
           </td>
-          <td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
+          <td colspan="5" class="groupTourOrder_remarks" style="height: 40px">
             <div>
               <div>
                 <span>{{ $t("Operation.Op_remark") }}:</span>

src/components/SalesModule/groupTourOrder.vue

@@ -1619,7 +1619,7 @@
     <div style="width: 100%; height: auto; overflow-x: auto" class="ownScrollbarStyle">
       <table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
         <tr>
-          <th width="240">{{ $t("fnc.danhao") }}&{{ $t("visa.v_tuanhao") }}</th>
+          <th width="210">{{ $t("fnc.danhao") }}&{{ $t("visa.v_tuanhao") }}</th>
           <th width="120">{{ $t("fnc.khxinxi") }}</th>
           <th width="70">{{ $t("salesModule.Type") }}</th>
           <th width="150">
@@ -1631,12 +1631,13 @@
 
           <th width="80">{{ $t("fnc.yszonge") }}</th>
           <th width="80">{{ $t("fnc.shishou") }}</th>
-          <th width="80">人头小费</th>
+          <!-- <th width="80">人头小费</th> -->
           <th width="70">{{ $t("fnc.youhui") }}</th>
           <th width="70">{{ $t("salesModule.HappinessPassbook") }}</th>
           <th width="70">{{ $t("fnc.tuikuan") }}</th>
           <th width="70">{{ $t("fnc.ptshuijin") }}</th>
           <th width="80">{{ $t("Operation.Op_platZaitu") }}</th>
+          <th width="80">现收在途</th>
           <th width="80">{{ $t("Operation.Op_daishou") }}</th>
           <th width="80">{{ $t("admin.admin_status") }}</th>
           <th width="120">{{ $t("salesModule.QRH") }}</th>
@@ -1827,7 +1828,7 @@
                   slot="reference">{{ item.income }}</span>
               </el-popover>
             </td>
-            <td style="color: #ff9c00">{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</td>
+            <!-- <td style="color: #ff9c00">{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</td> -->
             <!-- 优惠 -->
             <td>
               <el-popover style="padding: 0" width="600" trigger="click">
@@ -1921,6 +1922,7 @@
             <td>{{ item.refund }}</td>
             <td>{{ item.platformTax }}</td>
             <td>{{ item.zaiTuMoney }}</td>
+            <td>{{ item.cashReceiptsMoney }}</td>
             <td>
               <span :class="{
                   color_red_order: item.dueInMoney !== item.preferPrice,
@@ -1951,7 +1953,6 @@
                   <el-button size="small" type="danger" @click="getItem(item)">{{ $t("adm.adm_content") }}</el-button>
                 </el-upload>
               </template>
-              <br />
               <p style="color:red;font-size:12px;">申请发票需要上传确认函</p>
             </td>
             <td class="groupTourOrderIcon">

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1766,6 +1766,7 @@
           <th width="70">退款</th>
           <th width="70">平台税金</th>
           <th width="80">平台在途</th>
+          <th width="80">现收在途</th>
           <th width="80">待收金额</th>
           <th width="60">状态</th>
           <th width="80">候补</th>
@@ -1773,14 +1774,14 @@
           <th width="200">操作</th>
         </tr>
         <tr>
-          <td v-show="list.length == 0" colspan="18" align="center">
+          <td v-show="list.length == 0" colspan="19" align="center">
             暂无数据
           </td>
         </tr>
         <template v-for="(op,rootIndex) in list">
           <tbody class="not_border" :key="rootIndex+1000000">
             <tr>
-              <td colspan="18">
+              <td colspan="19">
                 类型：<span style="color: #e95252">{{ op.groupName }}</span>
               </td>
             </tr>
@@ -1978,7 +1979,7 @@
                         <td>{{ item2.StatusName }}</td>
                       </tr>
                       <tr v-if="orderList.length == 0">
-                        <td colspan="4" align="center">暂无数据</td>
+                        <td colspan="5" align="center">暂无数据</td>
                       </tr>
                     </table>
                   </div>
@@ -2085,6 +2086,10 @@
                 <span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">{{ item.zaiTuMoney }}</span>
                 <span v-else>******</span>
               </td>
+              <td>
+                <span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">{{ item.cashReceiptsMoney }}</span>
+                <span v-else>******</span>
+              </td>
               <td>
                 <span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder" :class="{
                     color_red_order: item.dueInMoney !== item.preferPrice,
@@ -2327,7 +2332,7 @@
               </td>
             </tr>
             <tr style="height: 20px">
-              <td colspan="17" class="RL_Order" style="height: 20px">
+              <td colspan="18" class="RL_Order" style="height: 20px">
                 <span class="RL-remarkTitle" v-if="
                     item.guestList.length > 0 &&
                     (item.isOwn == 1 ||
@@ -2426,7 +2431,7 @@
               </td>
             </tr>
             <tr>
-              <td colspan="4" class="groupTourOrder_remarksBytuan" style="height: 40px">
+              <td colspan="5" class="groupTourOrder_remarksBytuan" style="height: 40px">
                 <div>
                   <div style="width: 95%; display: inline-block">
                     <div style="color: red">
@@ -2612,7 +2617,7 @@
         <tbody v-show="list.length !== 0">
           <tr>
             <td></td>
-            <td colspan="17" class="groupTourOrderByTuan_seat">
+            <td colspan="18" class="groupTourOrderByTuan_seat">
               <div>
                 <span>本团机位：</span>
                 <span>{{
@@ -2693,7 +2698,7 @@
         </tbody>
         <!-- 取消订单 -->
         <tr v-if="cancelRtData != null && cancelRtData.length > 0">
-          <td colspan="18">
+          <td colspan="19">
             <span class="RL-redType" @click="isShowCancelOrder = !isShowCancelOrder" style="cursor: pointer"
               title="点击查看">取消订单（<span style="color: blue">{{
                 !isShowCancelOrder ? "展开" : "收起"
@@ -2834,7 +2839,7 @@
                       <td>{{ item2.StatusName }}</td>
                     </tr>
                     <tr v-if="orderList.length == 0">
-                      <td colspan="4" align="center">暂无数据</td>
+                      <td colspan="5" align="center">暂无数据</td>
                     </tr>
                   </table>
                 </div>
@@ -2847,6 +2852,7 @@
             </td>
             <!-- 优惠 -->
             <td></td>
+            <td></td>
             <td>
               <span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">{{ item.redEnvelopeMoney }}</span>
               <span v-else>******</span>
@@ -2863,6 +2869,10 @@
               <span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">{{ item.zaiTuMoney }}</span>
               <span v-else>******</span>
             </td>
+            <td>
+              <span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder">{{ item.cashReceiptsMoney }}</span>
+              <span v-else>******</span>
+            </td>
             <td>
               <span v-if="item.isOwn == 1 || IsSupperOrderEdit || isUpdateOrder" :class="{
                   color_red_order: item.dueInMoney !== item.preferPrice,
@@ -2889,7 +2899,7 @@
             <td colspan="2" class="groupTourOrderIcon"></td>
           </tr>
           <tr style="height: 20px">
-            <td colspan="17" class="RL_Order" style="height: 20px">
+            <td colspan="19" class="RL_Order" style="height: 20px">
               <span class="RL-remarkTitle" v-if="
                   item.guestList.length > 0 &&
                   (item.isOwn == 1 ||
@@ -2927,7 +2937,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="5" class="groupTourOrder_remarksBytuan" style="height: 40px">
+            <td colspan="6" class="groupTourOrder_remarksBytuan" style="height: 40px">
               <div>
                 <div style="display: inline-block; width: 95%; color: red">
                   <span>备注：</span>

src/components/SalesModule/groupTourOrderByTuanOne.vue

@@ -1485,6 +1485,7 @@
           <th width="80">退款</th>
           <th width="80">平台税金</th>
           <th width="80">平台在途</th>
+          <th width="80">现收在途</th>
           <th width="80">待收金额</th>
           <th width="60">状态</th>
           <th width="80">候补</th>
@@ -1492,12 +1493,12 @@
           <th width="200">操作</th>
         </tr>
         <tr>
-          <td v-show="list.length==0" colspan="16" align="center">暂无数据</td>
+          <td v-show="list.length==0" colspan="17" align="center">暂无数据</td>
         </tr>
         <template v-for="op in list">
           <tbody class="not_border">
             <tr>
-              <td colspan="16">类型：<span style="color: #e95252;">{{op.groupName}}</span></td>
+              <td colspan="17">类型：<span style="color: #e95252;">{{op.groupName}}</span></td>
             </tr>
           </tbody>
           <tbody v-for="(item,index) in op.list" :key="item.orderId">
@@ -1578,7 +1579,7 @@
                         <td>{{item2.StatusName}}</td>
                       </tr>
                       <tr v-if='orderList.length==0'>
-                        <td colspan="4" align="center">暂无数据</td>
+                        <td colspan="5" align="center">暂无数据</td>
                       </tr>
                     </table>
                   </div>
@@ -1640,6 +1641,10 @@
                 <span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item.zaiTuMoney}}</span>
                 <span v-else>******</span>
               </td>
+              <td>
+                <span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder">{{item.cashReceiptsMoney}}</span>
+                <span v-else>******</span>
+              </td>
               <td>
                 <span v-if="item.isOwn==1 || IsSupperOrderEdit || isUpdateOrder"
                   :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span>
@@ -1755,7 +1760,7 @@
               </td>
             </tr>
             <tr style="height:20px">
-              <td colspan="15" class="RL_Order" style="height:20px">
+              <td colspan="16" class="RL_Order" style="height:20px">
                 <span class="RL-remarkTitle"
                   v-if="item.guestList.length>0  && (item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder) ">名单:</span>
                 <span class="RL-redType RL-remarkCon"
@@ -1768,7 +1773,7 @@
               </td>
             </tr>
             <tr>
-              <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
+              <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
                 <div v-if="item.gatherAddress">
                   <span style="color: rgb(26, 168, 107);">集合地：</span>
                   <span style="color: rgb(26, 168, 107);">{{ item.gatherAddress }}</span>
@@ -1865,7 +1870,7 @@
         <tbody v-show="list.length!==0">
           <tr>
             <td></td>
-            <td colspan="15" class="groupTourOrderByTuan_seat">
+            <td colspan="16" class="groupTourOrderByTuan_seat">
               <!-- <div>
               <span>本团机位：</span>
               <span>{{tuanInfo.config&&tuanInfo.config.YSeat}}Y + {{tuanInfo.config&&tuanInfo.config.CSeat}}E + {{tuanInfo.config&&tuanInfo.config.FSeat}}F</span>
@@ -1910,7 +1915,7 @@
 
         <!-- 取消订单 -->
         <tr v-if="cancelRtData!=null && cancelRtData.length>0">
-          <td colspan="16">
+          <td colspan="17">
             <span class="RL-redType" @click="isShowCancelOrder=!isShowCancelOrder" style="cursor:pointer"
               title="点击查看">取消订单（<span style="color:blue;">{{!isShowCancelOrder?"展开":"收起"}}</span>）</span>
           </td>
@@ -1979,7 +1984,7 @@
                       <td>{{item2.StatusName}}</td>
                     </tr>
                     <tr v-if='orderList.length==0'>
-                      <td colspan="4" align="center">暂无数据</td>
+                      <td colspan="5" align="center">暂无数据</td>
                     </tr>
                   </table>
                 </div>
@@ -1995,6 +2000,7 @@
             </td>
             <td>{{item.refund}}</td>
             <td>{{item.platformTax}}</td>
+            <td>{{item.cashReceiptsMoney}}</td>
             <td>{{item.DueInMoney}}</td>
             <td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
             <td class="fz12">
@@ -2081,7 +2087,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="7" class="groupTourOrder_remarks" style="height: 40px;">
+            <td colspan="8" class="groupTourOrder_remarks" style="height: 40px;">
               <div>
                 <div><span>备注：</span>
                   <p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单

src/components/SalesModule/groupTourOrderOne.vue

@@ -1442,6 +1442,7 @@
           <th width="80">{{$t('fnc.tuikuan')}}</th>
           <th width="80">{{$t('fnc.ptshuijin')}}</th>
           <th width="80">{{$t('Operation.Op_platZaitu')}}</th>
+          <th width="80">现收在途</th>
           <th width="80">{{$t('Operation.Op_daishou')}}</th>
           <th width="80">{{$t('admin.admin_status')}}</th>
           <th width="120">{{$t('salesModule.QRH')}}</th>
@@ -1583,6 +1584,7 @@
             <td>{{item.refund}}</td>
             <td>{{item.platformTax}}</td>
             <td>{{item.zaiTuMoney}}</td>
+            <td>{{item.cashReceiptsMoney}}</td>
             <td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
             <td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">{{$t('fnc.shousun')}}</td>
             <td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
@@ -1683,7 +1685,7 @@
             </td>
           </tr>
           <tr style="height:20px">
-            <td colspan="16" class="RL_Order" style="height:20px">
+            <td colspan="17" class="RL_Order" style="height:20px">
            
               <span class="RL-remarkTitle" v-if="item.guestList.length>0">{{$t('salesModule.MD')}}:</span>
               <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0">
@@ -1719,7 +1721,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
+            <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
               <div v-if="item.gatherAddress">
                 <span style="color: rgb(26, 168, 107);">集合地：</span>
                 <span style="color: rgb(26, 168, 107);">{{ item.gatherAddress }}</span>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1833,7 +1833,8 @@
           <th width="90" class="nowrap"> {{ $t("salesModule.HappinessPassbook") }} </th>
           <th width="90" class="nowrap">{{ $t("fnc.tuikuan") }}</th>
           <th width="90" class="nowrap">{{ $t("fnc.ptshuijin") }}</th>
-          <th width="110" class="nowrap">{{ $t("Operation.Op_platZaitu") }}</th>
+          <th width="90" class="nowrap">{{ $t("Operation.Op_platZaitu") }}</th>
+          <th width="90" class="nowrap">现收在途</th>
           <th width="110" class="nowrap">{{ $t("Operation.Op_daishou") }}</th>
           <th width="100" class="nowrap">{{ $t("admin.admin_status") }}</th>
           <th width="130" class="nowrap">{{ $t("salesModule.QRH") }}</th>
@@ -1845,7 +1846,7 @@
           </td>
         </tr>
         <tr v-if=" OrderDataList.leadetList != null &&OrderDataList.leadetList.length > 0  ">
-          <td colspan="16">
+          <td colspan="17">
             {{ $t("active.cl_orderType") }}：<span class="RL-redType">{{ $t("leader.leader_Leader") }}</span>
           </td>
         </tr>
@@ -2013,6 +2014,7 @@
             <td>{{ item.Refund }}</td>
             <td>{{ item.PlatformTax }}</td>
             <td>{{ item.ZaiTuMoney }}</td>
+            <td>{{ item.CashReceiptsMoney }}</td>
             <td>
               <span :class="{color_red_order: item.DueInMoney && item.DueInMoney > 0, }">{{ item.DueInMoney }}</span>
             </td>
@@ -2491,6 +2493,7 @@
               <td class="nowrap">{{ childItem.Refund }}</td>
               <td class="nowrap">{{ childItem.PlatformTax }}</td>
               <td class="nowrap">{{ childItem.ZaiTuMoney }}</td>
+              <td class="nowrap">{{ childItem.CashReceiptsMoney }}</td>
               <td class="nowrap">
                 <span
                   :class="{color_red_order:childItem.DueInMoney && childItem.DueInMoney > 0,}">{{ childItem.DueInMoney }}</span>
@@ -3182,6 +3185,7 @@
             <td>{{ item.Refund }}</td>
             <td>{{ item.PlatformTax }}</td>
             <td>{{ item.ZaiTuMoney }}</td>
+            <td>{{ item.CashReceiptsMoney }}</td>
             <td>
               <span :class="{color_red_order: item.DueInMoney && item.DueInMoney > 0,}">{{ item.DueInMoney }}</span>
             </td>

src/components/myOrdersAllType/components/OrderList.vue

@@ -30,7 +30,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        width="180"
+        width="160"
         prop="CreateTimeStr"
         label="团号"
         show-overflow-tooltip
@@ -102,25 +102,26 @@
         </template>
       </el-table-column>
       <el-table-column  prop="Income" label="实收"> </el-table-column>
+      <el-table-column  prop="CashReceiptsMoney" label="现收在途"> </el-table-column>
       <el-table-column
 
         prop="PlatformMoney"
         label="在途金额"
-        min-width="130"
+        min-width="80"
       >
       </el-table-column>
       <el-table-column
 
         prop="PreferTipAmount"
         label="人头小费"
-        min-width="100"
+        min-width="80"
       >
       </el-table-column>
       <el-table-column
 
         prop="PlatformTax"
         label="手续费"
-        min-width="90"
+        min-width="70"
       >
       </el-table-column>
       <el-table-column  prop="Refund" label="退款"> </el-table-column>
@@ -136,7 +137,7 @@
       <el-table-column
         prop="OrderProfit"
         label="预期利润"
-        min-width="100"
+        min-width="80"
       >
         <template slot-scope="scope">
           <span :class="{ red: scope.row.OrderProfit > 0 }">{{
@@ -303,6 +304,7 @@
       :sort-by="[
         'Money',
         'Income',
+        'CashReceiptsMoney',
         'PreferTipAmount',
         'PlatformTax',
         'Refund',
@@ -334,7 +336,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        width="180"
+        width="160"
         prop="CreateTimeStr"
         label="团号"
         show-overflow-tooltip
@@ -406,25 +408,26 @@
         </template>
       </el-table-column>
       <el-table-column sortable prop="Income" label="实收"> </el-table-column>
+      <el-table-column sortable prop="CashReceiptsMoney" label="现收在途"> </el-table-column>
       <el-table-column
         sortable
         prop="PlatformMoney"
         label="在途金额"
-        min-width="130"
+        min-width="80"
       >
       </el-table-column>
       <el-table-column
         sortable
         prop="PreferTipAmount"
         label="人头小费"
-        min-width="100"
+        min-width="80"
       >
       </el-table-column>
       <el-table-column
         sortable
         prop="PlatformTax"
         label="手续费"
-        min-width="90"
+        min-width="70"
       >
       </el-table-column>
       <el-table-column sortable prop="Refund" label="退款"> </el-table-column>
@@ -441,7 +444,7 @@
         sortable
         prop="OrderProfit"
         label="预期利润"
-        min-width="100"
+        min-width="80"
       >
         <template slot-scope="scope">
           <span :class="{ red: scope.row.OrderProfit > 0 }">{{

src/components/myOrdersAllType/components/allList.vue

@@ -120,7 +120,7 @@
                   </li>
                   <li v-if="Title!='申请'&&Title!='查看'">
                     <span><em>订单Id</em>
-                    <el-input clearable type="Number" @keyup.native="checkInteger(msg2,'OrderId')" v-model="msg2.OrderId" placeholder="请输入订单Id" class="w200"/>
+                    <el-input clearable type="Number" @keyup.native="checkInteger(msg,'OrderId')" v-model="msg.OrderId" placeholder="请输入订单Id" class="w200"/>
                     </span>
                   </li>
                   <li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
@@ -818,7 +818,7 @@
             var oneDay = 1000 * 24 * 60 * 60;
             var monthLast = new Date(nextMonthFirstDay - oneDay).getDate()
             if(!this.$route.query.DepartSTime&&!this.$route.query.DepartSTime){
-             
+
                 this.msg.DepartSTime = '2023-04-01';
               this.msg.DepartETime = [year,month,monthLast].join('-');
               this.msg2.DepartSTime = '2023-04-01';