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

src/assets/common/lang/EN/fill.js

@@ -1628,7 +1628,7 @@ export const obj = {
   renmingbxj: 'RMB Subtotal',
   qitacbrmb: 'Other costs (RMB)',
   zhongduanjp: 'Mid-course Ticket',
-  xiaojijpzdsjly: 'subtotal (air ticket + mid-course air ticket + tax + combined transport + tour guide allocation + overnight + visa + insurance)',
+  xiaojijpzdsjly: 'Subtotals (airfare+mid flight ticket+taxes+intermodal transportation+tour guide sharing+overnight stay+visa+insurance - KB headcount fee)',
   lingduidyft: 'Lead and guide sharing',
   guoye: 'Stay the night',
   dandijcb: 'Single ground connection (cost)',

src/assets/common/lang/Japan/fill.js

@@ -1628,7 +1628,7 @@ export const obj = {
     renmingbxj: '人民元の小計',
     qitacbrmb: 'その他のコスト(人民元)',
     zhongduanjp: '航空券',
-    xiaojijpzdsjly: '小計(航空券+中段航空券+税金+連絡運輸+添乗員ガイド分担+宿泊ビザ+保険)',
+    xiaojijpzdsjly: '小計（航空券+中段航空券+税金+連絡輸送+添乗員割り当て+宿泊+ビザ+保険-KB頭金）',
     lingduidyft: '添乗ガイド分担',
     guoye: '夜を明かす',
     dandijcb: 'コスト',

src/assets/common/lang/zhCN/fill.js

@@ -1628,7 +1628,7 @@ export const obj = {
     renmingbxj: '人民币小计',
     qitacbrmb: '其它成本(人民币)',
     zhongduanjp: '中段机票',
-    xiaojijpzdsjly: '小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险)',
+    xiaojijpzdsjly: '小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险-KB人头费)',
     lingduidyft: '领队导游分摊',
     guoye: '过夜',
     dandijcb: '单地接(成本)',

src/assets/common/lang/zhTW/fill.js

@@ -1628,7 +1628,7 @@ export const obj = {
   renmingbxj: '人民幣小計',
   qitacbrmb: '其它成本(人民幣)',
   zhongduanjp: '中段機票',
-  xiaojijpzdsjly: '小計(機票+中段機票+稅金+聯運+領隊導遊分攤+過夜+簽證+保險)',
+  xiaojijpzdsjly: '小計(機票+中段機票+稅金+聯運+領隊導遊分攤+過夜+簽證+保險-KB人頭費)',
   lingduidyft: '領隊導遊分攤',
   guoye: '過夜',
   dandijcb: '單地接(成本)',

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -197,7 +197,8 @@
                 <br />
                 {{GetDayStr(subItem.DayNum-1)}}
                 <br />
-                <a v-if="IsEdit==3" style="color:blue;cursor:pointer" @click="showOfferChange(1,subItem)">{{$t('objFill.dayofferchange')}}</a>
+                <a v-if="IsEdit==3" style="color:blue;cursor:pointer"
+                  @click="showOfferChange(1,subItem)">{{$t('objFill.dayofferchange')}}</a>
               </td>
               <td align="center">
                 {{getCurrencyName(subItem.CurrencyId)}}
@@ -292,7 +293,8 @@
                     <template v-if="subItem.BreakfastChangeValue>0">
                       +
                     </template>
-                    {{subItem.BreakfastChangeValue}} <font style="color:#409eff;">({{subItem.BreakfastChangeRemark}})</font>
+                    {{subItem.BreakfastChangeValue}} <font style="color:#409eff;">({{subItem.BreakfastChangeRemark}})
+                    </font>
                   </font>
                 </template>
                 <template v-if="subItem.IsLunchChange">
@@ -443,7 +445,12 @@
                 {{teamPrice.UnionPrice}}
               </el-form-item>
             </td>
-            <td colspan="6" rowspan="2">
+            <td colspan="2">
+              <el-form-item :label="`KB`+$t('objFill.rentoufei')">
+                {{OtherPrice.KBMoney}}
+              </el-form-item>
+            </td>
+            <td colspan="4" rowspan="2">
               {{$t('objFill.xiaojijpzdsjly')}}:
               <br />{{getCostTotalMoney()}}
             </td>
@@ -655,7 +662,7 @@
                     <span style="color:blue;">{{$t('visa.v_tongguo')}}</span>
                   </template>
                   <template v-if="postConfig.TravelState==4">
-                     <span style="color:red;">{{$t('fnc.bohui')}}</span>
+                    <span style="color:red;">{{$t('fnc.bohui')}}</span>
                   </template>
                   {{postConfig.AuditContent}}
                 </p>
@@ -678,10 +685,10 @@
                 <p>
                   {{postConfig.ChangeAuditByName}}：{{postConfig.ChangeAduitDate}}
                   <template v-if="postConfig.TravelState==8">
-                   <span style="color:blue;">{{$t('visa.v_tongguo')}}</span>
+                    <span style="color:blue;">{{$t('visa.v_tongguo')}}</span>
                   </template>
                   <template v-if="postConfig.TravelState==7">
-                     <span style="color:red;">{{$t('fnc.bohui')}}</span>
+                    <span style="color:red;">{{$t('fnc.bohui')}}</span>
                   </template>
                   {{postConfig.ChangeAduitContent}}
                 </p>
@@ -692,7 +699,7 @@
               </template>
             </td>
             <td colspan="3">
-             {{$t('objFill.dangqiantdlx')}}: <template v-if="postConfig.TeamTypeName=='小包团'">
+              {{$t('objFill.dangqiantdlx')}}: <template v-if="postConfig.TeamTypeName=='小包团'">
                 <span style="color:red;font-weight:bold;">{{postConfig.TeamTypeName}}</span>
               </template>
               <template v-else>
@@ -836,7 +843,7 @@
       downloadFile(fileUrl, fileName) {
         const link = document.createElement('a');
         link.href = fileUrl;
-        link.target="_blank";
+        link.target = "_blank";
         link.download = fileName;
         document.body.appendChild(link);
         link.click();
@@ -941,7 +948,8 @@
           this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
           this.getConvertMoney(this.teamPrice.NightPrice) +
           this.getConvertMoney(this.teamPrice.VisaPrice) +
-          this.getConvertMoney(this.OtherPrice.SafeMoney)
+          this.getConvertMoney(this.OtherPrice.SafeMoney)-
+          this.getConvertMoney(this.OtherPrice.KBMoney)
         return totalMoney;
       },
       //获取汇率

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -346,6 +346,11 @@
                 {{teamPrice.UnionPrice}}
               </el-form-item>
             </td>
+            <td colspan="2">
+              <el-form-item :label="`KB`+$t('objFill.rentoufei')">
+                {{OtherPrice.KBMoney}}
+              </el-form-item>
+            </td>
             <td colspan="6" rowspan="2">
               {{$t('objFill.xiaojijpzdsjly')}}:
               <br />{{getCostTotalMoney()}}
@@ -760,7 +765,8 @@
           this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
           this.getConvertMoney(this.teamPrice.NightPrice) +
           this.getConvertMoney(this.teamPrice.VisaPrice) +
-          this.getConvertMoney(this.OtherPrice.SafeMoney)
+          this.getConvertMoney(this.OtherPrice.SafeMoney)-
+          this.getConvertMoney(this.OtherPrice.KBMoney)
         return totalMoney;
       },
       //获取汇率

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -413,7 +413,13 @@
                   @keyup.native="checkPrice(teamPrice,'UnionPrice'),getchange()"></el-input>
               </el-form-item>
             </td>
-            <td colspan="6" rowspan="2">
+            <td colspan="2">
+              <el-form-item :label="`KB`+$t('objFill.rentoufei')">
+                <el-input type="text" v-model='otherPrice.KBMoney' class="w100"
+                  @keyup.native="checkPrice(otherPrice,'KBMoney',true),getchange()"></el-input>
+              </el-form-item>
+            </td>
+            <td colspan="4" rowspan="2">
               {{$t('objFill.xiaojijpzdsjly')}}:
               <br /> {{getCostTotalMoney()}}
             </td>
@@ -1014,7 +1020,8 @@
           this.getConvertMoney(this.otherPrice.AirTicketShareMoney) +
           this.getConvertMoney(this.teamPrice.NightPrice) +
           this.getConvertMoney(this.teamPrice.VisaPrice) +
-          this.getConvertMoney(this.otherPrice.SafeMoney)
+          this.getConvertMoney(this.otherPrice.SafeMoney)-
+          this.getConvertMoney(this.otherPrice.KBMoney)
         return totalMoney;
       },
       //获取币种对应 的人数报价

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -662,7 +662,7 @@
                   <el-form-item prop="OutBranchId" style="margin-top:1px;">
                     <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span>
                     <el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName"
-                      :disabled="CurrentUserInfo.RB_Group_id==2">
+                      :disabled="CurrentUserInfo.RB_Group_id==2 &&PostConfig.OfferId>0">
                       <el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
                       <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
                       </el-option>
@@ -904,7 +904,7 @@
                 </div>
                 <div class="clearfix">
                   <div class="TPright clearfix">
-                    <el-form-item prop="OutBranchId" style="margin-top:1px;">
+                    <el-form-item  style="margin-top:1px;">
                       <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.tuanduilx')}}</span>
                       <el-select class="w180" v-model="priceData.PriceTeamType">
                         <template v-for="item in TeamListArr">

src/components/newTravelmanager/travelLineTrip/HotelTripThree.vue

@@ -387,7 +387,7 @@
       },
       //早餐切换
       changeBreakfastList(breakfastObj) {
-        if (breakfastObj.BreakfastUseType != 0) {
+        if (breakfastObj&&breakfastObj.BreakfastUseType != 0) {
           //获取当前选中的对象
           let obj = {};
           obj = this.breakFirstList.find(item => {