提交代码

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -882,10 +882,32 @@
           </tr>
           <tr>
             <td colspan="12"></td>
+          </tr>
+                    <tr>
+            <td colspan="12" class="CP_ComTitle2">成本回扣
+               <span style="color:red;padding-left:5px;">
+                成本回扣，请直接输入人民币
+              </span>
+            </td>
+          </tr>
+          <tr>
+          <td>导游回补</td>
+<td colspan="11"> <el-form-item>
+                <el-input type='text' class="w70" v-model="OtherPrice.GuideComplement" @keyup.native="checkPrice(OtherPrice,'GuideComplement'),getchange()">></el-input>
+              </el-form-item></td>
+          </tr>
+           <tr>
+          <td>小费回补</td>
+<td colspan="11"> <el-form-item>
+                <el-input type='text' class="w70" v-model="OtherPrice.TipComplement"  @keyup.native="checkPrice(OtherPrice,'TipComplement'),getchange()"></el-input>
+              </el-form-item></td>
+          </tr>
+           <tr>
+            <td colspan="12"></td>
           </tr>
           <tr>
             <td colspan="12" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br />
-              计算规则: (房+餐+车+景点)*汇率+内陆段交通*汇率+杂支部分*汇率+其他资产+机票票+收入-团负费+领队分摊+地接报价*汇率
+              计算规则: (房+餐+车+景点)*汇率+内陆段交通*汇率+杂支部分*汇率+其他资产+机票票+收入-团负费+领队分摊+地接报价*汇率-导游回补-小费回补
             </td>
           </tr>
           <tr>
@@ -1229,7 +1251,7 @@
           this.getConvertMoney(this.OtherPrice.KBMoney) +
           this.getConvertMoney(this.OtherPrice.VisaMoney) * this.getCurrencyMoney(
             this.OtherPrice.VisaMoneyCurrencyId
-          );
+          )- this.getConvertMoney(this.OtherPrice.TipComplement) - this.getConvertMoney(this.OtherPrice.GuideComplement) ;
         //KBMoney[团负费用减法]
         // this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
         return totalMoney;

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -641,9 +641,28 @@
           <tr>
             <td colspan="13"></td>
           </tr>
+            <tr>
+            <td colspan="13" class="CP_ComTitle2">成本回扣
+               
+            </td>
+          </tr>
+          <tr>
+          <td>导游回补</td>
+<td colspan="12">
+  {{OtherPrice.GuideComplement}} 
+                </td>
+          </tr>
+           <tr>
+          <td>小费回补</td>
+<td colspan="12"> {{OtherPrice.TipComplement}}</td>
+          </tr>
+           <tr>
+            <td colspan="13"></td>
+          </tr>
+
           <tr>
             <td colspan="13" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br />
-              计算规则: (房+餐+车+景点)*汇率+内陆段交通*汇率+杂支部分*汇率+其他资产+机票票+收入-团负费+领队分摊+地接报价*汇率
+              计算规则: (房+餐+车+景点)*汇率+内陆段交通*汇率+杂支部分*汇率+其他资产+机票票+收入-团负费+领队分摊+地接报价*汇率-导游回补-小费回补
             </td>
           </tr>
           <tr>
@@ -953,7 +972,7 @@
           this.getConvertMoney(this.OtherPrice.KBMoney) +
           this.getConvertMoney(this.OtherPrice.VisaMoney) * this.getCurrencyMoney(
             this.OtherPrice.VisaMoneyCurrencyId
-          );
+          )- this.getConvertMoney(this.OtherPrice.GuideComplement)- this.getConvertMoney(this.OtherPrice.TipComplement);
         //KBMoney[团负费用减法]
         return totalMoney;
       },

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -304,6 +304,8 @@
                   for="IsShowCost">成本统计</label></td>
             </tr>
             <tr height="36">
+              <td><input id="IsCostRebate" type="checkbox" v-model="downLoadMsg.IsCostRebate" /><label
+                  for="IsCostRebate">成本回扣</label></td>
               <td><input id="IsShowOtherPrice" type="checkbox" v-model="downLoadMsg.IsShowOtherPrice" /><label
                   for="IsShowOtherPrice">其他定价</label></td>
             </tr>
@@ -397,6 +399,7 @@
           IsShowLeaderFenTan: false, //领队分摊
           IsShowCost: false, //成本统计
           IsShowOtherPrice: false, //其他定价
+          IsCostRebate:false,//成本回扣
         },
       };
     },

src/plug/index.js

@@ -120,7 +120,7 @@ export default {
                 let locationName = window.location.hostname;
                 domainUrl = "http://192.168.10.128";
                 domainUrl = "http://192.168.10.11:8083" // 刘东电脑
-                // domainUrl = "http://192.168.10.123:8002";
+                 domainUrl = "http://192.168.10.206";
                 // domainUrl = "http://reborn.oytour.com";
                 let crmLocalFileStreamDownLoadUrl = "";
                 crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";