报价单调整

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

@@ -1615,9 +1615,13 @@ export const obj = {
   wan: 'Late',
   waibixj: 'Foreign currency subtotal',
   jiudianxj: 'Hotel Subtotal',
+  jiudianchangxj:'Total Hotel Changes',
   chezhixj: 'Fare subtotal',
+  chezhichangexj:'Total fare changes',
   canxj: 'Meal Subtotal',
+  canchangexj:"Total meal changes",
   menpiaoxj: 'Ticket subtotal',
+  menpiaochangexj:"Total ticket changes",
   zazhixj: 'Miscellaneous subtotals',
   renmingbxj: 'RMB Subtotal',
   qitacbrmb: 'Other costs (RMB)',

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

@@ -1613,9 +1613,13 @@ export const obj = {
     wan: '遅い',
     waibixj: '外為小計',
     jiudianxj: '酒店小計',
+    jiudianchangxj:'ホテル変更合計',
     chezhixj: '車資小計',
+    chezhichangexj:'運賃変更合計',
     canxj: '食小計',
+    canchangexj:"食事変更合計",
     menpiaoxj: '入場券小計',
+    menpiaochangexj:"チケット変更合計",
     zazhixj: '私はあなたを愛しています',
     renmingbxj: '人民元の小計',
     qitacbrmb: 'その他のコスト(人民元)',

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

@@ -1615,9 +1615,13 @@ export const obj = {
     wan: '晚',
     waibixj: '外币小计',
     jiudianxj: '酒店小计',
+    jiudianchangxj:'酒店变更合计',
     chezhixj: '车资小计',
+    chezhichangexj:'车资变更合计',
     canxj: '餐小计',
+    canchangexj:"餐变更合计",
     menpiaoxj: '门票小计',
+    menpiaochangexj:"门票变更合计",
     zazhixj: '杂支小计',
     renmingbxj: '人民币小计',
     qitacbrmb: '其它成本(人民币)',

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

@@ -1615,9 +1615,13 @@ export const obj = {
   wan: '晚',
   waibixj: '外幣小計',
   jiudianxj: '酒店小計',
+  jiudianchangxj:'酒店變更合計',
   chezhixj: '車資小計',
+  chezhichangexj:'車資變更合計',
   canxj: '餐小計',
+  canchangexj:"餐變更合計",
   menpiaoxj: '門票小計',
+  menpiaochangexj:"門票變更合計",
   zazhixj: '雜支小計',
   renmingbxj: '人民幣小計',
   qitacbrmb: '其它成本(人民幣)',

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -173,13 +173,16 @@
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.chetian')}}</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.can')}}</td>
             <td colspan="2" class="CP_ComTitle2 CostcomCenter">{{$t('scen.sc_piao')}}</td>
-            <td colspan="2" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.qitafy')}}<br />({{$t('objFill.baoxiansdzfd')}})</td>
+            <td colspan="2" class="CP_ComTitle2 CostcomCenter">
+              {{$t('objFill.qitafy')}}<br />({{$t('objFill.baoxiansdzfd')}})</td>
           </tr>
           <tr>
             <td class="CP_ComTitle2 CostcomCenter" style="width:180px">{{$t('hotel.table_hotelname')}}</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('objFill.v101.jiageren')}}</td>
-            <td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('objFill.chezi')}}/{{$t('hotel.hotel_day')}}</td>
-            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">{{$t('objFill.guolufei')}}<br />{{$t('objFill.v101.tingcheft')}}</td>
+            <td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('objFill.chezi')}}/{{$t('hotel.hotel_day')}}
+            </td>
+            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">
+              {{$t('objFill.guolufei')}}<br />{{$t('objFill.v101.tingcheft')}}</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:110px">{{$t('restaurant.res_resName')}}</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('objFill.v101.jiagecan')}}</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:150px">{{$t('visaT.jdname')}}</td>
@@ -243,12 +246,12 @@
               </td>
               <td style="width:250px;">
                 <template v-if="subItem.BreakfastName&&subItem.BreakfastName!=''">
-                  早: {{subItem.BreakfastName}}<br />
+                  {{$t('objFill.v101.zaocanmc')}}: {{subItem.BreakfastName}}<br />
                 </template>
                 <template v-if="subItem.LunchName&&subItem.LunchName!=''">
-                  午: {{subItem.LunchName}}<br />
+                  {{$t('objFill.v101.wucanmc')}}: {{subItem.LunchName}}<br />
                   <template v-if="subItem.LunchRealName&&subItem.LunchRealName!=''">
-                    <font style="color:#106BAF;"> 真实名称:
+                    <font style="color:#106BAF;">{{$t('ground.zhenshimingcheng')}}:
                       <template v-if="subItem.LunchUrl&&subItem.LunchUrl!=''">
                         <a @click="OpenNewUrl(subItem.LunchUrl)" target="_blank"
                           style="cursor:pointer;text-decoration: underline;color:#106BAF;">{{subItem.LunchRealName}}</a>
@@ -259,9 +262,9 @@
                   </template>
                 </template>
                 <template v-if="subItem.DinnerName&&subItem.DinnerName!=''">
-                  晚: {{subItem.DinnerName}}<br />
+                  {{$t('objFill.v101.wancaimc')}}: {{subItem.DinnerName}}<br />
                   <template v-if="subItem.DinnerRealName&&subItem.DinnerRealName!=''">
-                    <font style="color:#106BAF;">真实名称:
+                    <font style="color:#106BAF;">{{$t('ground.zhenshimingcheng')}}:
                       <template v-if="subItem.DinnerUrl&&subItem.DinnerUrl!=''">
                         <a @click="OpenNewUrl(subItem.DinnerUrl)" target="_blank"
                           style="cursor:pointer;text-decoration: underline;color:#106BAF;">{{subItem.DinnerRealName}}</a>
@@ -274,18 +277,18 @@
               </td>
               <td>
                 <template v-if="subItem.BreakfastName&&subItem.BreakfastName!=''">
-                  早: {{subItem.BreakfastCostPrice}}<br />
+                  {{$t('objFill.v101.zaocanmc')}}: {{subItem.BreakfastCostPrice}}<br />
                 </template>
                 <template v-if="subItem.LunchName&&subItem.LunchName!=''">
-                  午: {{subItem.LunchCostPrice}}<br />
+                  {{$t('objFill.v101.wucanmc')}}: {{subItem.LunchCostPrice}}<br />
                 </template>
                 <template v-if="subItem.DinnerName&&subItem.DinnerName!=''">
-                  晚: {{subItem.DinnerCostPrice}}<br />
+                  {{$t('objFill.v101.wancaimc')}}: {{subItem.DinnerCostPrice}}<br />
                 </template>
                 <template v-if="subItem.IsLunchChange">
                   <br />
                   <font style="color:red;">
-                    午:
+                    {{$t('objFill.v101.wucanmc')}}:
                     <template v-if="subItem.LunchChangeValue>0">
                       +
                     </template>
@@ -295,7 +298,7 @@
                 <template v-if="subItem.IsDinnerChange">
                   <br />
                   <font style="color:red;">
-                    晚:
+                    {{$t('objFill.v101.wancaimc')}}:
                     <template v-if="subItem.DinnerChangeValue>0">
                       +
                     </template>
@@ -342,72 +345,72 @@
           </template>
           <tr>
             <td colspan="3" class="CP_ComTitle2 CostcomCenter">
-              外币小计
+              {{$t('objFill.waibixj')}}
             </td>
             <!--酒店小计-->
             <td colspan="2">
-              酒店小计: {{getDayXiaoJi(1,1)}}
+              {{$t('objFill.jiudianxj')}}: {{getDayXiaoJi(1,1)}}
               <template v-if="getDayChangeXiaoJi(1,1)!=0">
                 <br />
-                <font style="color:red">酒店变更合计:{{getDayChangeXiaoJi(1,1)}}</font>
+                <font style="color:red">{{$t('objFill.jiudianchangxj')}} :{{getDayChangeXiaoJi(1,1)}}</font>
               </template>
             </td>
             <!--车资小计-->
             <td colspan="2">
-              车资小计:{{getDayXiaoJi(2,1)}}
+              {{$t('objFill.chezhixj')}}:{{getDayXiaoJi(2,1)}}
               <template v-if="getDayChangeXiaoJi(2,1)!=0">
                 <br />
-                <font style="color:red">车资变更合计:{{getDayChangeXiaoJi(2,1)}}</font>
+                <font style="color:red">{{$t('objFill.chezhichangexj')}}:{{getDayChangeXiaoJi(2,1)}}</font>
               </template>
             </td>
             <!--餐小计-->
             <td colspan="2">
-              餐小计: {{getDayXiaoJi(4,1)}}
+              {{$t('objFill.canxj')}}: {{getDayXiaoJi(4,1)}}
               <template v-if="getDayChangeXiaoJi(4,1)!=0">
                 <br />
-                <font style="color:red">餐变更合计:{{getDayChangeXiaoJi(4,1)}}</font>
+                <font style="color:red">{{$t('objFill.canchangexj')}}:{{getDayChangeXiaoJi(4,1)}}</font>
               </template>
             </td>
             <!--门票小计-->
             <td colspan="2">
-              门票小计: {{getDayXiaoJi(3,1)}}
+              {{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,1)}}
               <template v-if="getDayChangeXiaoJi(3,1)!=0">
                 <br />
-                <font style="color:red">门票变更合计:{{getDayChangeXiaoJi(3,1)}}</font>
+                <font style="color:red">{{$t('objFill.menpiaochangexj')}}:{{getDayChangeXiaoJi(3,1)}}</font>
               </template>
             </td>
             <!--其它费用小计-->
             <td colspan="2">
-              杂支小计: {{getDayXiaoJi(9,1)}}
+              {{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,1)}}
             </td>
           </tr>
           <tr>
             <td colspan="3" class="CP_ComTitle2 CostcomCenter">
-              人民币小计
+              {{$t('objFill.renmingbxj')}}
             </td>
             <!--酒店小计-->
             <td colspan="2">
-              酒店小计: {{getDayXiaoJi(1,2)}}
+              {{$t('objFill.jiudianxj')}}: {{getDayXiaoJi(1,2)}}
             </td>
             <!--车资小计-->
             <td colspan="2">
-              车资小计:{{getDayXiaoJi(2,2)}}
+              {{$t('objFill.chezhixj')}}:{{getDayXiaoJi(2,2)}}
             </td>
             <!--餐小计-->
             <td colspan="2">
-              餐小计: {{getDayXiaoJi(4,2)}}
+              {{$t('objFill.canxj')}}: {{getDayXiaoJi(4,2)}}
             </td>
             <!--门票小计-->
             <td colspan="2">
-              门票小计: {{getDayXiaoJi(3,2)}}
+              {{$t('objFill.menpiaoxj')}}: {{getDayXiaoJi(3,2)}}
             </td>
             <!--其它费用小计-->
             <td colspan="2">
-              杂支小计: {{getDayXiaoJi(9,2)}}
+              {{$t('objFill.zazhixj')}}: {{getDayXiaoJi(9,2)}}
             </td>
           </tr>
           <tr>
-            <td colspan="13">其它成本(人民币)</td>
+            <td colspan="13">{{$t('objFill.qitacbrmb')}}</td>
           </tr>
           <tr>
             <td colspan="2">
@@ -416,33 +419,33 @@
               </el-form-item>
             </td>
             <td>
-              <el-form-item label="中段机票">
+              <el-form-item :label="$t('objFill.zhongduanjp')">
                 {{OtherPrice.InlandAirTicketMoney}}
               </el-form-item>
             </td>
             <td colspan="2">
-              <el-form-item label="税金">
+              <el-form-item :label="$t('objFill.shuijin')">
                 {{teamPrice.TaxPrice}}
               </el-form-item>
             </td>
             <td colspan="2">
-              <el-form-item label="联运">
+              <el-form-item :label="$t('salesModule.Union')">
                 {{teamPrice.UnionPrice}}
               </el-form-item>
             </td>
             <td colspan="6" rowspan="2">
-              小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险):
+              {{$t('objFill.xiaojijpzdsjly')}}:
               <br />{{getCostTotalMoney()}}
             </td>
           </tr>
           <tr>
             <td colspan="2">
-              <el-form-item label="领队导游分摊">
+              <el-form-item :label="$t('objFill.lingduidyft')">
                 {{OtherPrice.AirTicketShareMoney}}
               </el-form-item>
             </td>
             <td>
-              <el-form-item label="过夜">
+              <el-form-item :label="$t('objFill.guoye')">
                 {{teamPrice.NightPrice}}
               </el-form-item>
             </td>
@@ -452,7 +455,7 @@
               </el-form-item>
             </td>
             <td colspan="2">
-              <el-form-item label="保险">
+              <el-form-item :label="$t('Operation.Op_insurance')">
                 {{OtherPrice.SafeMoney}}
               </el-form-item>
             </td>
@@ -462,12 +465,12 @@
           </tr>
           <tr>
             <td colspan="2">
-              <el-form-item label="婴儿">
+              <el-form-item :label="$t('Operation.Op_baby')">
                 {{teamPrice.BabyPrice}}
               </el-form-item>
             </td>
             <td>
-              <el-form-item label="单地接(成本)">
+              <el-form-item :label="$t('objFill.dandijcb')">
                 {{teamPrice.SingleDMCPrice}}
               </el-form-item>
             </td>
@@ -487,19 +490,19 @@
               </el-form-item>
             </td>
             <td colspan="4">
-              <el-form-item label="单地接(价格)">
+              <el-form-item :label="$t('objFill.dandijjg')">
                 {{teamPrice.SingleDMCTCPrice}}
               </el-form-item>
             </td>
           </tr>
           <tr>
             <td colspan="2">
-              <el-form-item label="主OP">
+              <el-form-item :label="$t('Operation.Op_zhu')+`OP`">
                 {{postConfig.OPName}}
               </el-form-item>
             </td>
             <td colspan="3">
-              <el-form-item label="助理OP：">
+              <el-form-item :label="$t('objFill.zhuli')+`OP`">
                 <template v-if="postConfig.Assistantlist&&postConfig.Assistantlist.length>0">
                   <span v-for="(subItem,subIndex) in postConfig.Assistantlist" :key="subIndex"
                     style="padding-left:3px;">{{subItem.Name}}</span>
@@ -509,18 +512,18 @@
             <td colspan="2">
               <el-form-item :label="$t('fnc.fkfangshi')">
                 <template v-if="postConfig.SaleOfferPayType==1">
-                  现金
+                  {{$t('fnc.xianjin')}}
                 </template>
                 <template v-if="postConfig.SaleOfferPayType==2">
-                  汇款
+                  {{$t('objFill.huikuan')}}
                 </template>
                 <template v-if="postConfig.SaleOfferPayType==3">
-                  外站自理
+                  {{$t('objFill.waizhanzili')}}
                 </template>
               </el-form-item>
             </td>
             <td colspan="6">
-              附件: <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
+              {{$t('objFill.fj')}}: <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
                 <template v-for="(subItem,subIndex) in teamPrice.ContractArray">
                   <a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
                     @click="downloadFile(subItem.Url,subItem.Name)">{{subItem.Name}}</a>
@@ -532,36 +535,36 @@
             <td>
             </td>
             <td>
-              人数
+              {{$t('admin.admin_personNumber')}}
             </td>
             <td>
-              酒店+车+餐+门票+杂支
+              {{$t('objFill.v101.jiudccmzji')}}
             </td>
             <td>
-              地接成本<br />(外币)
+              {{$t('objFill.dijiechengben')}}<br />({{$t('fnc.waibi')}})
             </td>
             <td colspan="2">
-              地接成本<br />(人民币)
+              {{$t('objFill.dijiechengben')}}<br />({{$t('fnc.a_rminbi')}})
             </td>
             <td colspan="2">
-              成本<br />[地接成本(人民币)+其它成本(人民币)小计+单地接]
+              {{$t('hotel.hotel_cost')}}<br /> [{{$t('objFill.v101.dandjqtcbrmbxj')}}]
             </td>
             <td>
-              同业销售价格
-              <br />(人民币)
+              {{$t('objFill.tongyexsjg')}}
+              <br />({{$t('fnc.a_rminbi')}})
             </td>
             <td>
-              直客销售价格
-              <br />(人民币)
+              {{$t('objFill.zhikexsjg')}}
+              <br />({{$t('fnc.a_rminbi')}})
             </td>
             <td>
               <template v-if="postConfig.LineId==14||postConfig.LineId==118">
-                销售价格
-                <br />(日币)
+                {{$t('Airticket.Air_salesPrice')}}
+                <br />({{$t('objFill.ribi')}})
               </template>
             </td>
             <td colspan="2">
-              备注
+              {{$t('fnc.beizhu')}}
             </td>
           </tr>
           <!--已填写人数-->
@@ -569,15 +572,15 @@
             <template v-for="(subItem,subIndex) in CostNumberList">
               <tr :key="subIndex">
                 <td v-if="subIndex==0" :rowspan="CostNumberList.length">
-                  合计
+                  {{$t('fnc.a_heji')}}
                 </td>
                 <td>
                   {{subItem.PeopleNumber}}
                 </td>
                 <td>
-                  {{getDayXiaoJi(1,1)}}(酒)+
-                  {{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
-                  +{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
+                  {{getDayXiaoJi(1,1)}}({{$t('objFill.jiu')}})+
+                  {{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}({{$t('objFill.v101.chezczcyrs')}})+{{getDayXiaoJi(4,1)}}({{$t('objFill.can')}})+{{getDayXiaoJi(3,1)}}({{$t('scen.sc_piao')}})
+                  +{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}({{$t('objFill.v101.zazhizzzcyrsK')}})
                 </td>
                 <td>
                   {{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
@@ -620,7 +623,7 @@
             <td colspan="13"></td>
           </tr>
           <tr>
-            <td class="CP_ComTitle2">审核备注</td>
+            <td class="CP_ComTitle2">{{$t('objFill.shenhebz')}}</td>
             <td colspan="5">
               <template
                 v-if="postConfig.ManagerAduitDate&&postConfig.ManagerAduitDate!=''&&postConfig.ManagerAduitName&&postConfig.ManagerAduitName!=''">
@@ -639,10 +642,10 @@
                 <p>
                   {{postConfig.AuditByName}}：{{postConfig.AuditDate}}
                   <template v-if="postConfig.TravelState==3">
-                    <span style="color:blue;">通过</span>
+                    <span style="color:blue;">{{$t('visa.v_tongguo')}}</span>
                   </template>
                   <template v-if="postConfig.TravelState==4">
-                    <span style="color:red;">驳回</span>
+                     <span style="color:red;">{{$t('fnc.bohui')}}</span>
                   </template>
                   {{postConfig.AuditContent}}
                 </p>
@@ -665,10 +668,10 @@
                 <p>
                   {{postConfig.ChangeAuditByName}}：{{postConfig.ChangeAduitDate}}
                   <template v-if="postConfig.TravelState==8">
-                    <span style="color:blue;"> 通过</span>
+                   <span style="color:blue;">{{$t('visa.v_tongguo')}}</span>
                   </template>
                   <template v-if="postConfig.TravelState==7">
-                    <span style="color:red;"> 驳回</span>
+                     <span style="color:red;">{{$t('fnc.bohui')}}</span>
                   </template>
                   {{postConfig.ChangeAduitContent}}
                 </p>
@@ -679,7 +682,7 @@
               </template>
             </td>
             <td colspan="3">
-              当前出团类型: <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>
@@ -687,7 +690,7 @@
               </template>
             </td>
             <td colspan="4">
-              <el-form-item label="更改出团类型">
+              <el-form-item :label="$t('objFill.v101.gengctleix')">
                 <el-select class="multiple_input" v-model="postConfig.TeamType">
                   <el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
                   </el-option>