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

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

@@ -1632,7 +1632,7 @@ export const obj = {
   renmingbxj: 'RMB Subtotal',
   qitacbrmb: 'Other costs (RMB)',
   zhongduanjp: 'Mid-course Ticket',
-  xiaojijpzdsjly: 'Subtotals (airfare+mid flight ticket+taxes+intermodal transportation +Train tickets+tour guide sharing+overnight stay+visa+insurance - KB headcount fee)',
+  xiaojijpzdsjly: 'Subtotals (airfare+mid flight ticket+taxes+intermodal transportation +Train tickets+tour guide sharing+overnight stay+visa+insurance+Other expenses - KB headcount fee)',
   lingduidyft: 'Lead and guide sharing',
   guoye: 'Stay the night',
   dandijcb: 'Single ground connection (cost)',
@@ -2586,6 +2586,7 @@ export const obj = {
   xuanzhezh: 'Select an account',
   shiyqtbzhl: 'Use other currencies (system real-time exchange rate will be used)',
   qitafeiyong: 'Other expenses',
+  qitafeiyongsm: 'Other cost explanations',
   tuanfeixiaoji: 'Group fee subtotal',
   zhifeizc: 'Out-of-pocket expenses',
   yiyoucwdjwfzd: "Existing financial documents, cannot make documents",

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

@@ -1632,7 +1632,7 @@ export const obj = {
   renmingbxj: '人民元の小計',
   qitacbrmb: 'その他のコスト(人民元)',
   zhongduanjp: '航空券',
-  xiaojijpzdsjly: '小計（航空券+中段航空券+汽車の切符+税金+連絡輸送+添乗員割り当て+宿泊+ビザ+保険-KB頭金）',
+  xiaojijpzdsjly: '小計（航空券+中段航空券+汽車の切符+税金+連絡輸送+添乗員割り当て+宿泊+ビザ+保険+その他の費用-KB頭金）',
   lingduidyft: '添乗ガイド分担',
   guoye: '夜を明かす',
   dandijcb: 'コスト',
@@ -2585,7 +2585,8 @@ export const obj = {
   shenhebtg: '審核不通過',
   xuanzhezh: '選擇賬戶',
   shiyqtbzhl: '使用其他幣種(將使用系統實時彙率)',
-  qitafeiyong: '其他費用',
+  qitafeiyong: 'その他の費用',
+  qitafeiyongsm: 'その他の費用説明',
   tuanfeixiaoji: '團費小計',
   zhifeizc: '自費支出',
   yiyoucwdjwfzd: '已有財務單據、無法制單',

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

@@ -1632,7 +1632,7 @@ export const obj = {
     renmingbxj: '人民币小计',
     qitacbrmb: '其它成本(人民币)',
     zhongduanjp: '中段机票',
-    xiaojijpzdsjly: '小计(机票+中段机票+火车票+税金+联运+领队导游分摊+过夜+签证+保险-KB人头费)',
+    xiaojijpzdsjly: '小计(机票+中段机票+火车票+税金+联运+领队导游分摊+过夜+签证+保险+其它费用-KB人头费)',
     lingduidyft: '领队导游分摊',
     guoye: '过夜',
     dandijcb: '单地接(成本)',
@@ -2585,7 +2585,8 @@ export const obj = {
     shenhebtg: '审核不通过',
     xuanzhezh: '选择账户',
     shiyqtbzhl: '使用其他币种(将使用系统实时汇率)',
-    qitafeiyong: '其他费用',
+    qitafeiyong: '其它费用',
+    qitafeiyongsm: '其它费用说明',
     tuanfeixiaoji: '团费小计',
     zhifeizc: '自费支出',
     yiyoucwdjwfzd: '已有财务单据，无法制单',

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

@@ -1632,7 +1632,7 @@ export const obj = {
   renmingbxj: '人民幣小計',
   qitacbrmb: '其它成本(人民幣)',
   zhongduanjp: '中段機票',
-  xiaojijpzdsjly: '小計(機票+中段機票+火車票+稅金+聯運+領隊導遊分攤+過夜+簽證+保險-KB人頭費)',
+  xiaojijpzdsjly: '小計(機票+中段機票+火車票+稅金+聯運+領隊導遊分攤+過夜+簽證+保險+其它費用-KB人頭費)',
   lingduidyft: '領隊導遊分攤',
   guoye: '過夜',
   dandijcb: '單地接(成本)',
@@ -2585,7 +2585,8 @@ export const obj = {
   shenhebtg: '審覈不通過',
   xuanzhezh: '選擇賬戶',
   shiyqtbzhl: '使用其他幣種(將使用系統實時匯率)',
-  qitafeiyong: '其他費用',
+  qitafeiyong: '其它費用',
+  qitafeiyongsm: '其它費用説明',
   tuanfeixiaoji: '團費小計',
   zhifeizc: '自費支出',
   yiyoucwdjwfzd: '已有財務單據，無法制單',

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -338,8 +338,7 @@
         <th>{{$t('salesModule.BigBag')}}</th>
         <th>{{$t('sm.youhuijine')}}</th>
         <th>{{$t('Operation.Op_daishou')}}</th>
-        <!-- <th>{{$t('op.JapnaseYen')}}</th>
-        <th>{{$t('op.RYCBJ')}}</th> -->
+ 
         <th>{{$t('hotel.hotel_OrderStates')}}</th>
         <th>{{$t('fnc.cjshijian')}}</th>
         <th>{{$t('op.RZLDR')}}</th>
@@ -349,8 +348,8 @@
         <th>{{$t('MarketingActi.endTime')}}</th>
         <th width="180">{{$t('system.table_operation')}}</th>
       </tr>
-      <tbody v-for="(item,index) in dataList">
-        <tr :key="`d_`+index">
+      <tbody v-for="(item,index) in dataList" :key="`d_`+index">
+        <tr >
           <td style="border-bottom:2px solid #333" rowspan="2">{{item.OrderID}}
             <div>
               <el-tooltip class="item" effect="dark" :content="$t('objFill.xiaochengxdd')" placement="top">
@@ -409,6 +408,7 @@
                   <el-button type="success" icon="iconfont icon-sousuo" @click="goOrderDetails(item.OrderID)">
                   </el-button>
                 </el-tooltip>
+                <!--修改成本价-->
                 <el-tooltip v-if="EmployeeId==380||EmployeeId==46||EmployeeId==1||EmployeeId==5" class="item"
                   effect="dark" :content="$t('op.UpdateCBJ')" placement="top-start">
                   <el-button type="success" icon="iconfont icon-Edit" @click="getThisMsg(item)"></el-button>
@@ -919,7 +919,6 @@
               this.didaCancelOrderMsg.ConfirmID = res.data.data.ConfirmID;
               this.didaCancelOrderMsg.Currency = res.data.data.Currency;
               this.cancelDidaOrderDialog = true;
-
             } else {
               this.Error(res.data.message);
             }

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -573,26 +573,31 @@
                 {{OtherPrice.InlandTrainTicketMoney}}
               </el-form-item>
             </td>
+
             <td colspan="2">
-              <el-form-item :label="$t('objFill.shuijin')">
-                {{teamPrice.TaxPrice}}
+              <el-form-item :label="$t('salesModule.Union')">
+                {{teamPrice.UnionPrice}}
               </el-form-item>
             </td>
             <td colspan="2">
-              <el-form-item :label="$t('salesModule.Union')">
-                {{teamPrice.UnionPrice}}
+              <el-form-item :label="$t('objFill.qitafeiyong')">
+                {{OtherPrice.OtherShareMoney}}
               </el-form-item>
             </td>
-
-            <td colspan="4" rowspan="2">
+            <td colspan="2">
+              <el-form-item :label="$t('objFill.qitafeiyongsm')">
+                {{OtherPrice.OtherRemark}}
+              </el-form-item>
+            </td>
+            <td colspan="2" rowspan="2">
               {{$t('objFill.xiaojijpzdsjly')}}:
               <br />{{getCostTotalMoney()}}
             </td>
           </tr>
           <tr>
             <td colspan="2">
-              <el-form-item :label="$t('objFill.lingduidyft')">
-                {{OtherPrice.AirTicketShareMoney}}
+              <el-form-item :label="$t('objFill.shuijin')">
+                {{teamPrice.TaxPrice}}
               </el-form-item>
             </td>
             <td>
@@ -600,6 +605,11 @@
                 {{teamPrice.NightPrice}}
               </el-form-item>
             </td>
+            <td colspan="2">
+              <el-form-item :label="$t('objFill.lingduidyft')">
+                {{OtherPrice.AirTicketShareMoney}}
+              </el-form-item>
+            </td>
             <td colspan="2">
               <el-form-item :label="$t('active.cl_qianzheng')">
                 {{teamPrice.VisaPrice}}
@@ -1298,7 +1308,8 @@
           this.getConvertMoney(this.teamPrice.NightPrice) +
           this.getConvertMoney(this.teamPrice.VisaPrice) +
           this.getConvertMoney(this.OtherPrice.InlandTrainTicketMoney) +
-          this.getConvertMoney(this.OtherPrice.SafeMoney) -
+          this.getConvertMoney(this.OtherPrice.SafeMoney) +
+          this.getConvertMoney(this.OtherPrice.OtherShareMoney) -
           this.getConvertMoney(this.OtherPrice.KBMoney)
         return totalMoney;
       },

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -427,28 +427,33 @@
                     @keyup.native="checkPrice(otherPrice,'InlandTrainTicketMoney'),getchange()"></el-input>
                 </el-form-item>
               </td>
-              <td colspan="2">
-                <el-form-item :label="$t('objFill.shuijin')">
-                  <el-input type="text" v-model='teamPrice.TaxPrice' class="w100"
-                    @keyup.native="checkPrice(teamPrice,'TaxPrice'),getchange()"></el-input>
-                </el-form-item>
-              </td>
               <td colspan="2">
                 <el-form-item :label="$t('salesModule.Union')">
                   <el-input type="text" v-model='teamPrice.UnionPrice' class="w100"
                     @keyup.native="checkPrice(teamPrice,'UnionPrice'),getchange()"></el-input>
                 </el-form-item>
               </td>
-              <td colspan="4" rowspan="2">
+              <td colspan="2">
+                <el-form-item :label="$t('objFill.qitafeiyong')">
+                  <el-input type="text" v-model='otherPrice.OtherShareMoney' class="w100"
+                    @keyup.native="checkPrice(otherPrice,'OtherShareMoney'),getchange()"></el-input>
+                </el-form-item>
+              </td>
+              <td colspan="2">
+                <el-form-item :label="$t('objFill.qitafeiyongsm')">
+                  <el-input type="text" v-model='otherPrice.OtherRemark' class="w100"></el-input>
+                </el-form-item>
+              </td>
+              <td colspan="2" rowspan="2">
                 {{$t('objFill.xiaojijpzdsjly')}}:
                 <br /> {{getOtherCostMoney()}}
               </td>
             </tr>
             <tr>
               <td colspan="2">
-                <el-form-item :label="$t('objFill.lingduidyft')">
-                  <el-input type='text' class="w100" v-model="otherPrice.AirTicketShareMoney"
-                    @keyup.native="checkPrice(otherPrice,'AirTicketShareMoney'),getchange()"></el-input>
+                <el-form-item :label="$t('objFill.shuijin')">
+                  <el-input type="text" v-model='teamPrice.TaxPrice' class="w100"
+                    @keyup.native="checkPrice(teamPrice,'TaxPrice'),getchange()"></el-input>
                 </el-form-item>
               </td>
               <td>
@@ -457,6 +462,12 @@
                     @keyup.native="checkPrice(teamPrice,'NightPrice'),getchange()"></el-input>
                 </el-form-item>
               </td>
+              <td colspan="2">
+                <el-form-item :label="$t('objFill.lingduidyft')">
+                  <el-input type='text' class="w100" v-model="otherPrice.AirTicketShareMoney"
+                    @keyup.native="checkPrice(otherPrice,'AirTicketShareMoney'),getchange()"></el-input>
+                </el-form-item>
+              </td>
               <td colspan="2">
                 <el-form-item :label="$t('active.cl_qianzheng')">
                   <el-input type="text" v-model='teamPrice.VisaPrice' class="w100"
@@ -964,7 +975,6 @@
           IsAllHotel: 1,
           sDate: this.GetDayStr(subItem.DayNum - 1)
         };
-        console.log("hMsg", hMsg)
         this.apipost(
           "hotel_post_GetHasStockHotelList", hMsg,
           res => {
@@ -1130,7 +1140,8 @@
             this.getConvertMoney(this.teamPrice.NightPrice) +
             this.getConvertMoney(this.teamPrice.VisaPrice) +
             this.getConvertMoney(this.otherPrice.InlandTrainTicketMoney) +
-            this.getConvertMoney(this.otherPrice.SafeMoney) -
+            this.getConvertMoney(this.otherPrice.SafeMoney) +
+            this.getConvertMoney(this.otherPrice.OtherShareMoney) -
             this.getConvertMoney(this.otherPrice.KBMoney)
         }
         return otherMoney;
@@ -1349,9 +1360,8 @@
           });
         }
         if (this.teamPrice) {
-          this.teamPrice.SingleDMCPrice = tempPrice.toFixed(0);
-          if (this.teamPrice.SingleDMCPrice <= 0 || (type && type == 1)) {
-            //this.teamPrice.SingleDMCPrice = tempPrice.toFixed(0);
+          if ((type && type == 1) || (this.postConfig.LineId == 14 || this.postConfig.LineId == 118)) {
+            this.teamPrice.SingleDMCPrice = tempPrice.toFixed(0);
           }
         }
         this.getSubMoney();