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

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

@@ -8182,6 +8182,34 @@ export const obj = {
     yongtu: 'Purpose',    
     danjusr: 'Document Income',    
     danjuzc: 'Expenditure on receipts',
+    qitapintai: 'Other Platforms',
+    chengwdltuan: "Checking this option will adjust it to an independent tour period.",
+    chafentuandui: 'Split the team',
+    yichunzai: 'Already exists',
+    qingchongxxz: 'Please reselect',
+    shifoulddy: 'Is it a tour leader/guide?',
+    jihuoshijin: 'Activation Time',
+    jiagessbdyxzwck: 'Prices are subject to real-time changes. The following prices are for reference only. ',
+    dongnanyaxian: 'Southeast Asia Line',
+    huansuanbenwb: 'Convert to the base currency = Offset/settled original currency * main order exchange rate; Exchange rate difference = Offset/settlement base currency - converted base currency; ',
+    yichongdbwbjsyb: 'The original currency has been offset/settled',
+    yichongdbwbjsbwb: 'Offset/Settled base currency',
+    zhudanhuilv: 'Main Single Exchange Rate',
+    hunsuanbwb: 'Conversion to Base Currency',
+    huicha: 'Exchange Rate differential',
+    yuejiehuich: 'Monthly exchange Rate spread',
+    xin: 'New',
+    qieweituan: 'Cut position ball',
+    hebinlbhpglhbtdsy: 'Merged List (for the Merging team of Heping International Travel Service)',
+    zizhutuan: 'Autonomous Group',
+    zhinengkf: "Intelligent Customer Service",
+    jiagebiangeng: 'Price Change',
+    tuanduileixingbiangen: 'Team Type change',
+    tuanduihebin: 'Team Merge',
+    zuoyezhong: "Homework in progress",
+    zuoyewangcheng: 'Homework completed',
+    biangengshenqing: 'Change Application',
+    biangengyuanyin: 'Reasons for Change',
   },
   //#endregion
 }

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

@@ -8181,6 +8181,34 @@ export const obj = {
     yongtu: '用途',
     danjusr: '帳票収入',
     danjuzc: '帳票支出',
+    qitapintai:'他のプラットフォーム」です',
+    chengwdltuan: 'この項目にチェックを入れて独立団期に調整します',
+    chafentuandui: 'チーム分割',
+    yichunzai: 'あります',
+    qingchongxxz: '再選択します',
+    shifoulddy: '添乗/ガイドですか',
+    jihuoshijin: '時間を活性化します',
+    jiagessbdyxzwck: '価格はリアルタイムで変働します。',
+    dongnanyaxian: '東南アジア線',
+    huansuanbenwb: '本位貨幣を換算します=元貨幣*主単為替レートを決済します;為替の差=すでに相殺しました/決済の本位貨幣-本位貨幣に換算します;',
+    yichongdbwbjsyb: '已当当/決済原幣',
+    yichongdbwbjsbwb: '既に本位幣を相殺します/決済します',
+    zhudanhuilv: '主単為替レート',
+    hunsuanbwb: '本位貨幣換算',
+    huicha: '為替',
+    yuejiehuich: '月決済差',
+    xin: '新しいですね',
+    qieweituan: '切位団',
+    hebinlbhpglhbtdsy: '合併のリスト(平和の国の合併のチームが使用します)',
+    zizhutuan: '自主団',
+    zhinengkf: 'スマート顧客サービス',
+    jiagebiangeng: '価格変更します',
+    tuanduileixingbiangen: 'チームのタイプの変更',
+    tuanduihebin: 'チーム統合',
+    zuoyezhong: '作業中です',
+    zuoyewangcheng: '宿題完了',
+    biangengshenqing:'変更申請',
+    biangengyuanyin: '変更原因',
   },
   //#endregion
 }

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

@@ -8181,6 +8181,34 @@ export const obj = {
     yongtu: '用途',
     danjusr: '单据收入',
     danjuzc: '单据支出',
+    qitapintai: '其他平台',
+    chengwdltuan: '勾选此项将会调整为独立团期',
+    chafentuandui: '拆分团队',
+    yichunzai: '已存在',
+    qingchongxxz: '请重新选择',
+    shifoulddy: '是否领队/导游',
+    jihuoshijin: '激活时间',
+    jiagessbdyxzwck: '价格实时变动,以下价格仅供参考。',
+    dongnanyaxian: '东南亚线',
+    huansuanbenwb: '换算本位币 = 已冲抵/结算原币 * 主单汇率；   汇差 = 已冲抵/结算本位币 - 换算本位币；',
+    yichongdbwbjsyb: '已冲抵/结算原币',
+    yichongdbwbjsbwb: '已冲抵/结算本位币',
+    zhudanhuilv: '主单汇率',
+    hunsuanbwb: '换算本位币',
+    huicha: '汇差',
+    yuejiehuich: '月结汇差',
+    xin: '新',
+    qieweituan: '切位团',
+    hebinlbhpglhbtdsy: '合并列表(和平国旅合并团队使用)',
+    zizhutuan: '自主团',
+    zhinengkf: '智能客服',
+    jiagebiangeng: '价格变更',
+    tuanduileixingbiangen: '团队类型变更',
+    tuanduihebin: '团队合并',
+    zuoyezhong: '作业中',
+    zuoyewangcheng: '作业完成',
+    biangengshenqing: '变更申请',
+    biangengyuanyin: '变更原因',
   }
   //#endregion
 }

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

@@ -8181,6 +8181,34 @@ export const obj = {
     yongtu: '用途',
     danjusr: '單據收入',
     danjuzc: '單據支出',
+    qitapintai: '其他平臺',
+    chengwdltuan: '勾選此項將會調整為獨立團期',
+    chafentuandui: '拆分團隊',
+    yichunzai: '已存在',
+    qingchongxxz: '請重新選擇',
+    shifoulddy: '是否領隊/導遊',
+    jihuoshijin: '激活時間',
+    jiagessbdyxzwck: '價格實時變動,以下價格僅供參考。',
+    dongnanyaxian: '東南亞線',
+    huansuanbenwb: '換算本位幣 = 已沖抵/結算原幣 * 主單匯率；   匯差 = 已沖抵/結算本位幣 - 換算本位幣；',
+    yichongdbwbjsyb: '已沖抵/結算原幣',
+    yichongdbwbjsbwb: '已沖抵/結算本位幣',
+    zhudanhuilv: '主單匯率',
+    hunsuanbwb: '換算本位幣',
+    huicha: '匯差',
+    yuejiehuich: '月結匯差',
+    xin: '新',
+    qieweituan: '切位團',
+    hebinlbhpglhbtdsy: '合並列表(和平國旅合並團隊使用)',
+    zizhutuan: '自主團',
+    zhinengkf: '智能客服',
+    jiagebiangeng: '價格變更',
+    tuanduileixingbiangen: '團隊類型變更',
+    tuanduihebin: '團隊合並',
+    zuoyezhong: '作業中',
+    zuoyewangcheng: '作業完成',
+    biangengshenqing: '變更申請',
+    biangengyuanyin: '變更原因',
   },
   //#endregion
 }

src/components/FinancialModule/MonthlyCostStatement/exchangedifference.vue

@@ -45,7 +45,7 @@
               @click="openDetails(scope.row.FrID)">{{ scope.row.FrID }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="name" label="公司别" width="100">
+        <el-table-column prop="name" :label="$t('objFill.gongsibie')" width="100">
           <template slot-scope="scope">
             {{scope.row.RB_BranchName}}
           </template>

src/components/FinancialModule/MonthlyCostStatement/vouchernumber.vue

@@ -46,7 +46,7 @@
               @click="openDetails(scope.row.FrID)">{{ scope.row.FrID }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="name" label="公司别" width="100">
+        <el-table-column prop="name" :label="$t('objFill.gongsibie')" width="100">
           <template slot-scope="scope">
             {{scope.row.RB_BranchName}}
           </template>

src/components/FinancialModule/ReportForm/MemberSettlement.vue

@@ -174,7 +174,7 @@
               </el-table-column>
               <el-table-column prop="TCNUM" label="团号">
               </el-table-column>
-              <el-table-column prop="BName" label="公司别">
+              <el-table-column prop="BName" :label="$t('objFill.gongsibie')">
               </el-table-column>
               <el-table-column prop="CustomerName" label="客户">
               </el-table-column>
@@ -215,7 +215,7 @@
               </el-table-column>
               <el-table-column prop="TCNUM" label="团号">
               </el-table-column>
-              <el-table-column prop="BName" label="公司别">
+              <el-table-column prop="BName" :label="$t('objFill.gongsibie')">
               </el-table-column>
               <el-table-column prop="CustomerName" label="客户">
               </el-table-column>

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -651,7 +651,7 @@ tr._item_list td:last-child {
                 <el-option value="1" :label="$t('objFill.changguit')"></el-option>
                 <el-option value="2" :label="$t('objFill.xiaobaot')"></el-option>
                 <el-option value="3" :label="$t('MarketingActi.local')"></el-option>
-                <el-option value="6" label="切位团"></el-option>
+                <el-option value="6" :label="$t('objFill.v103.qieweituan')"></el-option>
                 <el-option value="5" label="PAK团"></el-option>
               </el-select>
             </el-form-item>

src/components/SalesModule/RepayConfig.vue

@@ -100,7 +100,7 @@
       <tr>
         <th>订单类型</th>
         <th>线路</th>
-        <th>团队类型</th>
+        <th>{{$t('objFill.tuanduilx')}}</th>
         <th>积分比例</th>
         <th>积分购买力</th>
         <th>操作</th>
@@ -197,7 +197,7 @@
       <tr>
         <th>订单类型</th>
         <th>线路</th>
-        <th>团队类型</th>
+        <th>{{$t('objFill.tuanduilx')}}</th>
         <th>返佣比例</th>
         <th width="300">适配同行</th>
         <th>操作</th>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -188,11 +188,11 @@
             </span>
           </li>
           <li>
-            <span><em>团队类型</em></span>
+            <span><em>{{$t('objFill.tuanduilx')}}</em></span>
             <el-select class="w150" v-model="queryMsg.QTeamType" filterable :placeholder="$t('pub.pleaseSel')">
               <el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
-              <el-option label="常规团" :value="0" :key="0"></el-option>
-              <el-option label="切位团" :value="5" :key="5"></el-option>
+              <el-option :label="$t('objFill.changguit')" :value="0" :key="0"></el-option>
+              <el-option :label="$t('objFill.v103.qieweituan')" :value="5" :key="5"></el-option>
             </el-select>
           </li>
           <li class="advancedLi" style="height: 34px">
@@ -499,7 +499,7 @@
                     <span v-if="item.Status == 1" :title="$t('visaT.sale')">{{
                       $t("visaT.sale")
                     }}</span>
-                    <span v-if="item.IsNewArrival == 1" title="新品上市">新</span>
+                    <span v-if="item.IsNewArrival == 1" title="新品上市">{{$t('objFill.v103.xin')}}</span>
 
                     <span v-if="item.GroupRecommendType == 1"
                       :title="$t('objFill.jingping')">{{ $t("objFill.jing") }}</span>
@@ -715,7 +715,7 @@
                     </template>
                     <template v-if="item.TeamPriceList && item.TeamPriceList.length > 1">
                       <font style="display:none;">
-                        <el-tooltip class="item" effect="dark" content="合并列表(和平国旅合并团队使用)">
+                        <el-tooltip class="item" effect="dark" :content="$t('objFill.v103.hebinlbhpglhbtdsy')">
                           <el-popover width="350" trigger="hover" popper-class="TC_HotelPop">
                             <table width="100%" border="0" cellspacing="0" cellpadding="0">
                               <tr>
@@ -776,7 +776,7 @@
                         otherPlat: item.StandardCurrencyName == '',
                       }">{{ item.StandardCurrencyName }}{{ $t("objFill.jiesuan") }}</span>
                     <template v-if="item.OutBranchId==1253&& item.ExtPriceInfo&&item.ExtPriceInfo.IsIndependent==1">
-                      <font>自主团</font>
+                      <font>{{$t('objFill.v103.zizhutuan')}}</font>
                     </template>
                   </p>
                   <p class="travelnowrap" v-if="item.IsSetOut == 0">

src/components/dmc/manager/dmcTotalTable.vue

@@ -139,14 +139,14 @@
           </span>
         </li>
         <li>
-          <span><em>团队类型</em>
+          <span><em>{{$t('objFill.tuanduilx')}}</em>
             <el-select v-model="msg.QTeamType" filterable :placeholder="$t('pub.pleaseSel')">
               <el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
-              <el-option label="常规团" :value="0" :key="0"></el-option>
+              <el-option :label="$t('objFill.changguit')" :value="0" :key="0"></el-option>
               <el-option label="小包团" :value="1" :key="1"></el-option>
               <el-option label="当地游" :value="2" :key="2"></el-option>
               <el-option label="PAK" :value="4" :key="4"></el-option>
-              <el-option label="切位团" :value="5" :key="5"></el-option>
+              <el-option :label="$t('objFill.v103.qieweituan')" :value="5" :key="5"></el-option>
             </el-select>
           </span>
         </li>

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -742,8 +742,8 @@
                     'TCb2c':standardCurrencyName=='新台币','AppPlat':standardCurrencyName=='',
                     'otherPlat':standardCurrencyName=='',}">{{standardCurrencyName}}{{$t('objFill.jiesuan')}}</span>
                     <el-radio-group v-if="priceData.OutBranchId==1253" v-model="priceData.ExtPriceInfo.IsIndependent">
-                      <el-radio :label="0">常规</el-radio>
-                      <el-radio :label="1">自主团</el-radio>
+                      <el-radio :label="0">{{$t('objFill.changgui')}}</el-radio>
+                      <el-radio :label="1">{{$t('objFill.v103.zizhutuan')}}</el-radio>
                     </el-radio-group>
                   </el-form-item>
                   <el-form-item style="margin-top:1px;">

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -734,8 +734,8 @@
                     'otherPlat':standardCurrencyName=='',}">{{standardCurrencyName}}{{$t('objFill.jiesuan')}}</span>
 
                     <el-radio-group v-if="priceData.OutBranchId==1253" v-model="priceData.ExtPriceInfo.IsIndependent">
-                      <el-radio :label="0">常规</el-radio>
-                      <el-radio :label="1">自主团</el-radio>
+                      <el-radio :label="0">{{$t('objFill.changgui')}}</el-radio>
+                      <el-radio :label="1">{{$t('objFill.v103.zizhutuan')}}</el-radio>
                     </el-radio-group>
                   </el-form-item>
                   <!-- <el-form-item prop="OutGroupType" style="margin-top:1px;">