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

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

@@ -1608,6 +1608,7 @@ export const obj = {
   baoxiansdzfd: 'Insurance, director miscellaneous fees, etc.',
   guolufei: 'Toll',
   tingchefei: 'Parking fees',
+  dayofferchange:"Change",
   hanzaocan: 'Breakfast included',
   hanwancan: 'Including dinner',
   zao: 'Morning',
@@ -1615,9 +1616,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

@@ -1606,6 +1606,7 @@ export const obj = {
     baoxiansdzfd: '保険、司導雑費など',
     guolufei: '通行料',
     tingchefei: '駐車料金',
+    dayofferchange:"変更",
     hanzaocan: '朝食付き',
     hanwancan: '夕食付き',
     zao: 'おはようございます',
@@ -1613,9 +1614,13 @@ export const obj = {
     wan: '遅い',
     waibixj: '外為小計',
     jiudianxj: '酒店小計',
+    jiudianchangxj:'ホテル変更合計',
     chezhixj: '車資小計',
+    chezhichangexj:'運賃変更合計',
     canxj: '食小計',
+    canchangexj:"食事変更合計",
     menpiaoxj: '入場券小計',
+    menpiaochangexj:"チケット変更合計",
     zazhixj: '私はあなたを愛しています',
     renmingbxj: '人民元の小計',
     qitacbrmb: 'その他のコスト(人民元)',

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

@@ -1608,6 +1608,7 @@ export const obj = {
     baoxiansdzfd: '保险、司导杂费等',
     guolufei: '过路费',
     tingchefei: '停车费',
+    dayofferchange:"变更",
     hanzaocan: '含早餐',
     hanwancan: '含晚餐',
     zao: '早',
@@ -1615,9 +1616,13 @@ export const obj = {
     wan: '晚',
     waibixj: '外币小计',
     jiudianxj: '酒店小计',
+    jiudianchangxj:'酒店变更合计',
     chezhixj: '车资小计',
+    chezhichangexj:'车资变更合计',
     canxj: '餐小计',
+    canchangexj:"餐变更合计",
     menpiaoxj: '门票小计',
+    menpiaochangexj:"门票变更合计",
     zazhixj: '杂支小计',
     renmingbxj: '人民币小计',
     qitacbrmb: '其它成本(人民币)',
@@ -7519,9 +7524,9 @@ export const obj = {
     tianxjqcaiyjg: '填写景点名称才能带出价格',
     hancan: '含餐',
     guolfqcfei: '过路费、停车费',
-    zaocanmc: '早餐名称',
-    wucanmc: '午餐名称',
-    wancaimc: '晚餐名称',
+    zaocanmc: '早',
+    wucanmc: '午',
+    wancaimc: '晚',
     jindianjiag: '景点价格',
     zazhiminc: '杂支名称',
     guanltcqzqtx: '关联提成,请正确填写',

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

@@ -1608,6 +1608,7 @@ export const obj = {
   baoxiansdzfd: '保險、司導雜費等',
   guolufei: '過路費',
   tingchefei: '停車費',
+  dayofferchange:"變更",
   hanzaocan: '含早餐',
   hanwancan: '含晚餐',
   zao: '早',
@@ -1615,9 +1616,13 @@ export const obj = {
   wan: '晚',
   waibixj: '外幣小計',
   jiudianxj: '酒店小計',
+  jiudianchangxj:'酒店變更合計',
   chezhixj: '車資小計',
+  chezhichangexj:'車資變更合計',
   canxj: '餐小計',
+  canchangexj:"餐變更合計",
   menpiaoxj: '門票小計',
+  menpiaochangexj:"門票變更合計",
   zazhixj: '雜支小計',
   renmingbxj: '人民幣小計',
   qitacbrmb: '其它成本(人民幣)',
@@ -7518,10 +7523,10 @@ export const obj = {
     tianxctmccyjg: '填寫餐廳名稱才能帶出價格',
     tianxjqcaiyjg: '填寫景點名稱才能帶出價格',
     hancan: '含餐',
-    guolfqcfei: '過路費、請車費"',
-    zaocanmc: '早餐名稱',
-    wucanmc: '午餐名稱',
-    wancaimc: '晚餐名稱',
+    guolfqcfei: '過路費、停車費',
+    zaocanmc: '早',
+    wucanmc: '午',
+    wancaimc: '晚',
     jindianjiag: '景點價格',
     zazhiminc: '雜支名稱',
     guanltcqzqtx: '關聯提成,請正確填寫',

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -167,7 +167,8 @@
                     <div>{{$t('salesModule.Adult')}}</div>
                     <div class="priceList">
                       <div>
-                        <span class="pLeftPrice">{{$t('Airticket.Air_salesPrice')}}：￥{{item.QuotationPrice.B2BMemberPrice}}</span>
+                        <span
+                          class="pLeftPrice">{{$t('Airticket.Air_salesPrice')}}：￥{{item.QuotationPrice.B2BMemberPrice}}</span>
                       </div>
                     </div>
                     <div>{{$t('op.Child')}}</div>
@@ -289,7 +290,7 @@
                     </div>
                   </div>
                   <template v-if="item.ChangeManagerAduitDate&&item.ChangeManagerAduitDate!=''">
-                    <div class="priceContentDiv" style="margin-bottom:5px;" >
+                    <div class="priceContentDiv" style="margin-bottom:5px;">
                       <div>
                         <span>{{$t('objFill.v101.FinancialModule.shenpjg')}}</span>
                         <span class="AuditDate">{{item.ChangeManagerAduitDate}}</span>
@@ -304,7 +305,8 @@
                       </div>
                     </div>
                   </template>
-                  <div class="priceContentDiv" v-if="item.ChangeAduitDate&&item.ChangeAduitDate!=''" style="margin-bottom:5px;">
+                  <div class="priceContentDiv" v-if="item.ChangeAduitDate&&item.ChangeAduitDate!=''"
+                    style="margin-bottom:5px;">
                     <div>
                       <span>{{$t('objFill.v101.FinancialModule.shenpjg')}}</span>
                       <span class="AuditDate">{{item.ChangeAduitDate}}</span>
@@ -324,7 +326,8 @@
             </div>
             <div style="width:134px;">
               <span class="openGroup opbd" @click="goToOpenTravel(item)" v-if="item.TravelState==3&& item.OpenState==2">
-                <el-tooltip class="item" effect="dark" :content="$t('sm.kaituan')" placement="top-start" popper-class="max-w250">
+                <el-tooltip class="item" effect="dark" :content="$t('sm.kaituan')" placement="top-start"
+                  popper-class="max-w250">
                 </el-tooltip>
                 {{$t('op.Kai')}}
               </span>
@@ -349,9 +352,11 @@
                   <i @click="goUrl('QuotationAduit',item,1)" class="iconfont icon-view"></i>
                 </el-tooltip>
               </span>
-              <span class="bianji newAopbdd" v-if="item.TravelState==3||item.TravelState==7">
-                <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.baojdbgen')" placement="top-start" popper-class="max-w250">
-                  <i @click="goUrl('OfferChange',item,3)" class="iconfont el-icon-edit"></i>
+          
+              <span class="bianji newAopbdd" v-if="item.TravelState==3||item.TravelState==7||item.TravelState==8">
+                <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.baojdbgen')" placement="top-start"
+                  popper-class="max-w250">
+                  <i @click="goUrl('OfferChange',item,3)" class="el-icon-edit" circle></i>
                 </el-tooltip>
               </span>
               <span style="background:#85ce61; " class="newAopbdd" @click="copyOffer(item)">
@@ -389,7 +394,8 @@
           <tbody>
             <tr height="36">
               <td width="50%"><input id="IsShowTripPrice" type="checkbox" v-model="downLoadMsg.IsShowTripPrice" /><label
-                  for="IsShowTripPrice">({{$t('objFill.v101.dmc.xingcbj')}})<br />{{$t('objFill.v101.fangcancmpiao')}}</label></td>
+                  for="IsShowTripPrice">({{$t('objFill.v101.dmc.xingcbj')}})<br />{{$t('objFill.v101.fangcancmpiao')}}</label>
+              </td>
               <td width="50%"><input id="IsShowTraffic" type="checkbox" v-model="downLoadMsg.IsShowTraffic" /><label
                   for="IsShowTraffic">{{$t('objFill.v101.jiaotobuf')}}</label></td>
             </tr>
@@ -413,7 +419,7 @@
             </tr>
             <tr height="36">
               <td><input id="IsCostRebate" type="checkbox" v-model="downLoadMsg.IsCostRebate" /><label
-                  for="IsCostRebate" >{{$t('objFill.v101.chengbhuko')}}</label></td>
+                  for="IsCostRebate">{{$t('objFill.v101.chengbhuko')}}</label></td>
               <td><input id="IsShowOtherPrice" type="checkbox" v-model="downLoadMsg.IsShowOtherPrice" /><label
                   for="IsShowOtherPrice">{{$t('objFill.v101.linduifentan')}}</label></td>
             </tr>
@@ -484,8 +490,8 @@
               </td>
               <td>
                 <el-form-item :label="$t('fnc.khmingcheng')">
-                  <el-input v-model="postConfig.CustomerName" type="text" :placeholder="$t('fnc.khmingcheng')" maxlength="200"
-                    style="width:180px">
+                  <el-input v-model="postConfig.CustomerName" type="text" :placeholder="$t('fnc.khmingcheng')"
+                    maxlength="200" style="width:180px">
                   </el-input>
                 </el-form-item>
               </td>
@@ -506,7 +512,8 @@
           </tbody>
           <tr>
             <td colspan="2" style="text-align:center;">
-              <el-button type="primary" class="normalBtn" :loading="importOfferLoading" @click="ImportOffer()">{{$t('pub.saveBtn')}}
+              <el-button type="primary" class="normalBtn" :loading="importOfferLoading" @click="ImportOffer()">
+                {{$t('pub.saveBtn')}}
               </el-button>
               <input type="button" class="normalBtn" :value="$t('pub.closeSel')"
                 @click="isShowImportOffer=false,clearMsg()" />
@@ -618,7 +625,7 @@
       //复制报价单
       copyOffer(item) {
         var that = this;
-        var tipMsg = that.$t('sm.shifyfzhi')+"【" + item.Title + "】"+that.$t('objFill.v101.cibaojdan');
+        var tipMsg = that.$t('sm.shifyfzhi') + "【" + item.Title + "】" + that.$t('objFill.v101.cibaojdan');
         that.Confirm(tipMsg, function () {
           let offerMsg = {
             OldOfferId: item.OfferId,
@@ -698,7 +705,7 @@
               this.isShowImportOffer = false;
               this.getList();
             } else {
-              this.$message.error(this.$t('objFill.v101.Rest.shangchuansb')+'!');
+              this.$message.error(this.$t('objFill.v101.Rest.shangchuansb') + '!');
             }
           }
         }).catch(err => {
@@ -867,7 +874,7 @@
         } else if (item.LineName) {
           fileName += "【" + item.LineName + "】";
         }
-        fileName += this.$t('objFill.v101.chengbenxiaz')+".xls";
+        fileName += this.$t('objFill.v101.chengbenxiaz') + ".xls";
         this.downLoadMsg.FileName = fileName;
         this.downloadBill = true;
       },