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

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

@@ -7518,7 +7518,7 @@ export const obj = {
     tianxctmccyjg: '填写餐厅名称才能带出价格',
     tianxjqcaiyjg: '填写景点名称才能带出价格',
     hancan: '含餐',
-    guolfqcfei: '过路费、请车费"',
+    guolfqcfei: '过路费、停车费',
     zaocanmc: '早餐名称',
     wucanmc: '午餐名称',
     wancaimc: '晚餐名称',

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -68,7 +68,7 @@
         <table class="CostNewTable" style="width:1600px;">
           <thead>
             <tr>
-              <td colspan="13" class="CP_ComTitle2 CostcomCenter">报价信息</td>
+              <td colspan="13" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.baojiaxinxi')}}</td>
             </tr>
             <tr>
               <td class="CP_ComTitle2 CostcomCenter" style="width:120px">{{$t('hotel.hotel_Currency')}}</td>
@@ -116,7 +116,8 @@
                     <el-button slot="append" class="iconfont icon-img_haha" @click="addPeoNunber"></el-button>
                   </el-input>
                 </el-form-item>
-                <div colspan="13" style="color: #f12121;font-weigth: bold;">填入人数后请点击"+"</div>
+                <div colspan="13" style="color: #f12121;font-weigth: bold;">{{$t('objFill.v101.tianrrshqindj')}}"+"
+                </div>
               </td>
             </tr>
           </thead>
@@ -125,23 +126,26 @@
             <td rowspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">{{$t('hotel.hotel_Currency')}}</td>
             <td rowspan="2" style="width:180px" class="CP_ComTitle2 CostcomCenter">{{$t('Airticket.Air_Trip')}}</td>
             <td colspan="2" style="width:220px;" class="CP_ComTitle2 CostcomCenter">{{$t('hotel.hotel')}}</td>
-            <td colspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">车/天</td>
+            <td colspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.chetian')}}</td>
             <td colspan="2" style="width:200px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.can')}}</td>
             <td colspan="2" style="width:150px" class="CP_ComTitle2 CostcomCenter">{{$t('scen.sc_piao')}}</td>
-            <td colspan="2" style="width:100px" class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
+            <td colspan="2" style="width:100px" class="CP_ComTitle2 CostcomCenter">
+              {{$t('objFill.qitafy')}}<br />({{$t('objFill.baoxiansdzfd')}})</td>
           </tr>
           <tr>
             <td style="width:150px" class="CP_ComTitle2 CostcomCenter">{{$t('hotel.table_hotelname')}}</td>
-            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/人</td>
-            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.chezi')}}/天</td>
-            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">过路费<br />停车费/天</td>
+            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.jiageren')}}</td>
+            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.chezi')}}/{{$t('hotel.hotel_day')}}
+            </td>
+            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">
+              {{$t('objFill.guolufei')}}<br />{{$t('objFill.v101.tingcheft')}}</td>
             <td style="width:110px" class="CP_ComTitle2 CostcomCenter">{{$t('restaurant.res_resName')}}<br /><span
-                style="color:red;">填写餐厅名称才能带出价格</span></td>
-            <td style="width:90px" class="CP_ComTitle2 CostcomCenter">价格/餐</td>
+                style="color:red;">{{$t('objFill.v101.tianxctmccyjg')}}</span></td>
+            <td style="width:90px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.jiagecan')}}</td>
             <td style="width:150px" class="CP_ComTitle2 CostcomCenter">{{$t('visaT.jdname')}}<br />
-              <span style="color:red;">填写景点名称才能带出价格</span>
+              <span style="color:red;">{{$t('objFill.v101.tianxjqcaiyjg')}}</span>
             </td>
-            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/人</td>
+            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.jiageren')}}</td>
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('system.query_airName')}}</td>
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('Operation.Op_price')}}</td>
           </tr>
@@ -151,7 +155,7 @@
                 {{$t('tips.di')}}{{subItem.DayNum}}{{$t('hotel.hotel_day')}}
                 <br />
                 {{GetDayStr(subItem.DayNum-1)}}
-               
+
               </td>
               <td>
                 <el-form-item>
@@ -174,18 +178,18 @@
                   </el-option>
                 </el-select>
                 <el-form-item label="含餐:">
-                  <el-select v-model='subItem.ContainDinnerType' style="width:100px;" placeholder="含餐类型"
+                  <el-select v-model='subItem.ContainDinnerType' style="width:100px;" :placeholder="$t('objFill.v101.hancanlxin')"
                     @change="DinnerTypeChange(subItem)">
-                    <el-option label="含餐类型" :value='0'></el-option>
-                    <el-option label="含早餐" :value='1'></el-option>
-                    <el-option label="含晚餐" :value='2'></el-option>
-                    <el-option label="含早晚餐" :value='3'></el-option>
+                    <el-option :label="$t('objFill.v101.hancanlxin')" :value='0'></el-option>
+                    <el-option :label="$t('objFill.hanzaocan')" :value='1'></el-option>
+                    <el-option :label="$t('objFill.hanwancan')" :value='2'></el-option>
+                    <el-option :label="$t('objFill.v101.hanzaowanc')" :value='3'></el-option>
                   </el-select>
                 </el-form-item>
               </td>
               <td>
                 <el-input type='text' v-model="subItem.HotelCostPrice" class="w70"
-                  @keyup.native="checkPrice(subItem,'HotelCostPrice'),getchange(1)" placeholder="酒店价格"></el-input>
+                  @keyup.native="checkPrice(subItem,'HotelCostPrice'),getchange(1)" :placeholder="$t('objFill.v101.jiudianjge')"></el-input>
                 <template v-if="subItem.IsHotelChange">
                   <font style="color:red;">
                     <template v-if="subItem.HotelChangeValue>0">
@@ -639,7 +643,7 @@
 </template>
 <script>
   import travelDinner from '@/components/commonPage/travelDinner'
- 
+
   export default {
     props: ["postConfig", "AllCurrencyList"],
     watch: {

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -76,17 +76,18 @@
           <table>
             <tr>
               <th>
-                开团提示
+                {{$t('objFill.v101.kaituants')}}
               </th>
               <th colspan="7" style="text-align:left;line-height:40px;">
-                <p style="color:red;font-weight:bold;"> 1.“常规团”对应 “散拼”;&nbsp;&nbsp; 2.“小包团”(10人以下 或者
-                  超过10人纯玩不进店);&nbsp;&nbsp;
-                  3.“当地游”(不需要机票);
+                <p style="color:red;font-weight:bold;">
+                  1.{{$t('objFill.v101.changuitdyshnp')}}&nbsp;&nbsp;
+                  2.{{$t('objFill.v101.xiaobtcgbjd')}}&nbsp;&nbsp;
+                  3.{{$t('objFill.v101.dangdybxyjp')}}
                 </p>
               </th>
             </tr>
             <tr>
-              <td width="80" class="txtRightCost">出团类型</td>
+              <td width="80" class="txtRightCost">{{$t('objFill.v101.chutuanleix')}}</td>
               <td>
                 <el-select class="multiple_input" v-model="postData.TeamType"
                   @change="postData.LineId=0,postData.LineteamId=0">
@@ -153,7 +154,8 @@
               </td>
               <td width="80" class="txtRightCost">{{$t('fnc.khmingcheng')}}</td>
               <td>
-                <el-input v-model="postData.CustomerName" type="text" placeholder="客户名称" maxlength="200">
+                <el-input v-model="postData.CustomerName" type="text" :placeholder="$t('fnc.khmingcheng')"
+                  maxlength="200">
                 </el-input>
               </td>
             </tr>
@@ -162,10 +164,10 @@
               </td>
             </tr>
             <tr>
-              <td width="80" class="txtRightCost">团队标题</td>
+              <td width="80" class="txtRightCost">{{$t('sm.tuanduibiaoti')}}</td>
               <td colspan="7">
                 <el-input v-model="postData.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }" resize="none"
-                  placeholder="请填写团队标题" maxlength="200"></el-input>
+                  :placeholder="$t('objFill.v101.qingtxtdbti')" maxlength="200"></el-input>
               </td>
             </tr>
           </table>