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

src/components/FinancialModule/FinancialDocumentsDetailSPF.vue

@@ -2359,7 +2359,6 @@
             }
             this.chongJudge(data)
             this.GetDetail = data;
-            console.log(this.GetDetail, '======')
             if (this.GetDetail.DetailList) {
               this.GetDetail.DetailList.forEach(item => {
                 if (item.CostTypeName == "领队导游资金池领款") {

src/components/FinancialModule/addFinancialDocumentsSPF.vue

@@ -1603,18 +1603,8 @@ export default {
            this.apipost('Financial_post_Get', {ID:id,TempId:tempId,TCIDList:(this.orderObj&&this.orderObj.TCIDList)?this.orderObj.TCIDList:[]}, res => {
                if(res.data.resultCode == 1) {
                    let data= res.data.data;
-                //    if((data.TemplateId==245
-                //     ||data.TemplateId==246
-                //     ||data.TemplateId==247
-                //     ||data.TemplateId==248)&&!this.isHandFee&&data.KingdeeBranchId&&this.msg.RB_Branch_Id!=1220){
-                //         this.GetHandFeeList()//获取手配费功能权限配置
-                //         this.is_HandFee = true
-                //         this.isHandFee = true
-                //         this.HandFee.BranchId = data.KingdeeBranchId
-                //     }else{
-                //         this.is_HandFee = false
-                //         this.isHandFee = false
-                //     }
+                   
+                    this.$forceUpdate()
                    this.editTemplateId=data.TemplateId;
                    this.getCompany();
 
@@ -1640,8 +1630,6 @@ export default {
                    } else if(this.$route.query.companyID){
                      this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
                    }
-                   
-                
                    this.admin_get_DepartmentGetList(this.msg.RB_Branch_Id);
                    this.msg.PayDate = this.msg.PayDate ;
                    this.msg.detailList=[];
@@ -1771,7 +1759,13 @@ export default {
                     ||this.$route.query.id==248){
                     this.is_HandFee = true
                     this.isHandFee = true
-                }else{
+                }else if((this.msg.TemplateId==245
+                    ||this.msg.TemplateId==246
+                    ||this.msg.TemplateId==247
+                    ||this.msg.TemplateId==248)&&this.msg.HandFeeFrId==0&&this.msg.RB_Branch_Id!=1220){
+                    this.is_HandFee = true
+                    this.isHandFee = true
+                } else{
                     this.is_HandFee=false
                     this.isHandFee = false
                 }
@@ -2027,11 +2021,11 @@ export default {
        ||this.$route.query.id==246
        ||this.$route.query.id==247
        ||this.$route.query.id==248){
-        this.GetHandFeeList()//获取手配费功能权限配置
         this.isHandFee = true
        }else{
         this.is_HandFee = false
        }
+       this.GetHandFeeList()//获取手配费功能权限配置
        let userInfo = this.getLocalStorage();
        this.department = userInfo.DepartName;
        this.EmployeeId=userInfo.EmployeeId;

src/components/SalesModule/groupTourOrder.vue

@@ -1642,6 +1642,7 @@
           <th width="60">{{ $t("Airticket.Air_Number") }}</th>
           <th width="80">{{ $t("fnc.danjia") }}</th>
           <th width="80">{{ $t("fnc.cjdanjia") }}</th>
+          <th width="80">人头小费</th>
           <th width="80">{{ $t("fnc.yszonge") }}</th>
           <th width="80">{{ $t("fnc.shishou") }}</th>
           <th width="70">{{ $t("fnc.youhui") }}</th>
@@ -1792,6 +1793,7 @@
             </td>
             <td style="color: #ff9c00">{{ item.tC_Price }}</td>
             <td style="color: #ff9c00">{{ item.unit_Price }}</td>
+            <td style="color: #ff9c00">{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</td>
             <td>
               <p style="color: #ff9c00">{{ item.preferPrice }}</p>
             </td>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1769,6 +1769,8 @@
           <th width="100">人数/机位数</th>
           <th width="80">单价</th>
           <th width="80">成交单价</th>
+          <th width="80">人头小费</th>
+          <!-- <th width="80">实收小费</th> -->
           <th width="80">应收总额</th>
           <th width="80">实收</th>
           <th width="70">优惠</th>
@@ -1941,6 +1943,8 @@
                   ">{{ item.unit_Price }}</span>
                 <span v-else>*****</span>
               </td>
+              <td style="color: #ff9c00"><span>{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</span></td>
+              <!-- <td><span>{{ item.CompensationMoney }}</span></td> -->
               <td>
                 <p style="color: #ff9c00">
                   <span v-if="

src/components/SalesModule/productQuery.vue

@@ -1402,7 +1402,7 @@
                 <el-popover width="630" trigger="click">
                   <table class="PQ_detail">
                     <tr>
-                      <td colspan="5" style="text-align: left; padding-left: 10px">
+                      <td colspan="6" style="text-align: left; padding-left: 10px">
                         {{ $t("salesModule.BasePrice") }}
                       </td>
                     </tr>
@@ -1411,7 +1411,7 @@
                       <th>{{ $t("salesModule.HYTHJ") }}</th>
                       <th>{{ $t("salesModule.PTTHJ") }}</th>
                       <th>{{ $t("salesModule.ZKHYJ") }}</th>
-                      <th>{{ $t("salesModule.PTZKJ") }}</th>
+                      <th colspan="2">{{ $t("salesModule.PTZKJ") }}</th>
                     </tr>
                     <tr>
                       <td>{{ $t("salesModule.Adult") }}</td>
@@ -1426,7 +1426,7 @@
                           item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
                         }}
                       </td>
-                      <td>{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</td>
+                      <td colspan="2">{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</td>
                     </tr>
                     <tr>
                       <td>{{ $t("salesModule.ChildBed") }}</td>
@@ -1452,7 +1452,7 @@
                             )
                         }}
                       </td>
-                      <td>
+                      <td colspan="2">
                         {{
                           (item.B2CPrice + item.ChildNeedPrice)
                             | priceFormat(item.B2CPrice + item.ChildNeedPrice)
@@ -1483,7 +1483,7 @@
                             )
                         }}
                       </td>
-                      <td>
+                      <td colspan="2">
                         {{
                           (item.B2CPrice - item.ChildNoNeedPrice)
                             | priceFormat(item.B2CPrice - item.ChildNoNeedPrice)
@@ -1492,7 +1492,7 @@
                     </tr>
                     <tr>
                       <td>{{ $t("salesModule.SingleJ") }}</td>
-                      <td colspan="4">
+                      <td colspan="5">
                         {{
                           item.SingleDMCPrice | priceFormat(item.SingleDMCPrice)
                         }}
@@ -1500,12 +1500,12 @@
                     </tr>
                     <tr>
                       <td>{{ $t("Operation.Op_baby") }}</td>
-                      <td colspan="4">
+                      <td colspan="5">
                         {{ item.BabyPrice | priceFormat(item.BabyPrice) }}
                       </td>
                     </tr>
                     <tr>
-                      <td colspan="5" style="text-align: left; padding-left: 10px">
+                      <td colspan="6" style="text-align: left; padding-left: 10px">
                         {{ $t("salesModule.OtherPrice") }}
                       </td>
                     </tr>
@@ -1515,6 +1515,7 @@
                       <th>{{ $t("salesModule.VisaBack") }}</th>
                       <th>{{ $t("Operation.Op_singleRoomcha") }}</th>
                       <th>{{ $t("Operation.Op_zafei") }}</th>
+                      <th>小费</th>
                     </tr>
                     <tr>
                       <td>
@@ -1543,6 +1544,7 @@
                       <td>
                         {{ item.OtherPrice | priceFormat(item.OtherPrice) }}
                       </td>
+                      <td>{{ item.TipAmount?item.TipAmount:'0.00' }}</td>
                     </tr>
                   </table>
                   <span slot="reference" class="price">{{

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1840,6 +1840,7 @@
           </th>
           <th width="110" class="nowrap">{{ $t("fnc.danjia") }}</th>
           <th width="110" class="nowrap">{{ $t("fnc.cjdanjia") }}</th>
+          <th width="110" class="nowrap">人头小费</th>
           <th width="110" class="nowrap">{{ $t("fnc.yszonge") }}</th>
           <th width="110" class="nowrap">{{ $t("fnc.shishou") }}</th>
           <th width="90" class="nowrap">{{ $t("fnc.youhui") }}</th>
@@ -1855,7 +1856,7 @@
           <th width="150" class="nowrap">{{ $t("system.table_operation") }}</th>
         </tr>
         <tr>
-          <td v-show="OrderDataList.length == 0" colspan="16" align="center">
+          <td v-show="OrderDataList.length == 0" colspan="17" align="center">
             {{ $t("system.content_noData") }}
           </td>
         </tr>
@@ -1864,7 +1865,7 @@
             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>
@@ -1923,6 +1924,7 @@
             </td>
             <td>{{ item.TC_Price }}</td>
             <td>{{ item.Unit_Price }}</td>
+            <td>{{ item.PreferTipAmount | priceFormat(item.PreferTipAmount) }}</td>
             <td>
               <p>{{ item.PreferPrice }}</p>
             </td>
@@ -2416,6 +2418,7 @@
               </td>
               <td class="nowrap">{{ childItem.TC_Price }}</td>
               <td>{{ childItem.Unit_Price }}</td>
+              <td>{{ childItem.PreferTipAmount?childItem.PreferTipAmount:'0.00' }}</td>
               <td class="nowrap">
                 <p>{{ childItem.PreferPrice }}</p>
               </td>
@@ -4309,6 +4312,23 @@
       updateSalesMan: updateSalesMan,
       commonShouSun: commonShouSun,
     },
+    filters: {
+        priceFormat(value) {
+          if (value == null) {
+            return 0.0;
+          }
+          let nStr = ""//value.toFixed(2);
+          let x = nStr.split(".");
+          let x1 = x[0];
+          let x2 = x.length > 1 ? "." + x[1] : "";
+          var rgx = /(\d+)(\d{3})/;
+          while (rgx.test(x1)) {
+            x1 = x1.replace(rgx, "$1" + "," + "$2");
+          }
+          return x1 + x2;
+        }
+      },
+      
     methods: {
       setChargeLoss(obj) {
         this.$confirm("确定恢复收损单", "提示", {

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -367,6 +367,7 @@
         <th width="50">{{ $t("admin.admin_personNumber") }}</th>
         <th width="80">{{ $t("fnc.danjia") }}</th>
         <th width="80">{{ $t("fnc.cjdanjia") }}</th>
+        <th width="80">人头小费</th>
         <th width="80">{{ $t("fnc.yszonge") }}</th>
         <th width="80">{{ $t("fnc.shishou") }}</th>
         <th width="70">{{ $t("fnc.youhui") }}</th>
@@ -556,6 +557,7 @@
           </td>
           <td style="color: #ff9c00">{{ item.tC_Price }}</td>
           <td style="color: #ff9c00">￥{{ item.unit_Price }}</td>
+          <td style="color: #ff9c00">￥{{ item.preferTipAmount?item.preferTipAmount:'0.00' }}</td>
           <td>
             <p style="color: #ff9c00">￥{{ item.preferPrice }}</p>
           </td>

src/components/myOrdersAllType/components/OrderList.vue

@@ -6,7 +6,7 @@
         :data="OrderList"
         style="width: 100%"
         :default-sort = "{prop: 'Money', order: 'null'}"
-        :sort-by="['Money','Income','PlatformTax','Refund','CostMoney','DueInMoney']">
+        :sort-by="['Money','Income','PreferTipAmount','PlatformTax','Refund','CostMoney','DueInMoney']">
         <el-table-column 
             width="200"
             prop="CreateTimeStr"
@@ -70,7 +70,7 @@
             sortable
             prop="Money"
             label="总金额"
-            show-overflow-tooltip>
+            show-overflow-tooltip min-width="100">
             <template slot-scope="scope">
               {{scope.row.Money}}&ensp;({{scope.row.CurrencyName}})
             </template>
@@ -81,11 +81,17 @@
             label="实收"
             show-overflow-tooltip>
         </el-table-column>
+        <el-table-column 
+            sortable
+            prop="PreferTipAmount"
+            label="人头小费"
+            show-overflow-tooltip min-width="101">
+        </el-table-column>
         <el-table-column 
             sortable
             prop="PlatformTax"
             label="手续费"
-            show-overflow-tooltip>
+            show-overflow-tooltip min-width="100">
         </el-table-column>
         <el-table-column 
             sortable

src/components/orderCommon/productOrderList.vue

@@ -867,7 +867,7 @@
                       <td>
                         {{ item.OtherPrice | priceFormat(item.OtherPrice) }}
                       </td>
-                      <td>{{ item.TipAmount | priceFormat(item.TipAmount) }}</td>
+                      <td>{{ item.TipAmount?item.TipAmount:'0.00' }}</td>
                     </tr>
                   </table>
                   <span slot="reference" class="price">{{