页面修改

src/assets/common/lang/en.js

@@ -128,6 +128,7 @@ export const system = {
   query_stopAir: 'stopover airport',
   query_arrivalCity: 'Reach the city',
   query_arrivalAir: 'Arriving at the airport',
+  query_arrivalAirThreeCode:'Three codes to the airport upon arrival',
   query_arrivalTime: 'Arrival time',
   quety_area: 'area',
   query_workType: 'work type',
@@ -1773,6 +1774,7 @@ export const visaT = {
   sqneirong: 'Application type',
   crjtime: 'entry-exit time',
   cfAirport: 'Departure Airport',
+  cfAirportTreeCode:'Departure airport three codes',
   chujingtime: 'exit time',
   rujingtime: 'time of entry',
   Portofentry: 'port ofentry',

src/assets/common/lang/jp.js

@@ -91,6 +91,7 @@ export const system = {
     query_stopAir:'経由空港',
     query_arrivalCity:'到着都市',
     query_arrivalAir:'到着空港',
+    query_arrivalAirThreeCode:'空港到着3ヤード',
     query_arrivalTime:'到着時間',
     quety_area:'エリア',
     query_workType:'仕事',
@@ -1719,6 +1720,7 @@ export const visaT = {
   sqneirong:'申請タイプ',
   crjtime:'出入国時間',
   cfAirport:'出発空港',
+  cfAirportTreeCode:'出発空港3ヤード',
   chujingtime:'出国時間',
   rujingtime:'入国時間',
   Portofentry:'入国口岸',

src/assets/common/lang/zh-tw.js

@@ -126,6 +126,7 @@ export const system = {
   query_stopAir:'經停機場',
   query_arrivalCity:'到達城市',
   query_arrivalAir:'到達機場',
+  query_arrivalAirThreeCode:'到達機場三碼',
   query_arrivalTime:'到達時間',
   quety_area:'區域',
   query_workType:'工作類型',
@@ -1759,6 +1760,7 @@ export const visaT = {
   sqneirong:'申請類型',
   crjtime:'出入境時間',
   cfAirport:'出發機場',
+  cfAirportTreeCode:'出發機場三碼',
   chujingtime:'出境時間',
   rujingtime:'入境時間',
   Portofentry:'入境口岸',

src/assets/common/lang/zh.js

@@ -127,6 +127,7 @@ export const system = {
     query_stopAir:'经停机场',
     query_arrivalCity:'到达城市',
     query_arrivalAir:'到达机场',
+    query_arrivalAirThreeCode:'到达机场三码',
     query_arrivalTime:'到达时间',
     quety_area:'区域',
     query_workType:'工作类型',
@@ -1776,6 +1777,7 @@ export const visaT = {
   sqneirong:'申请类型',
   crjtime:'出入境时间',
   cfAirport:'出发机场',
+  cfAirportTreeCode:'出发机场三码',
   chujingtime:'出境时间',
   rujingtime:'入境时间',
   Portofentry:'入境口岸',

src/components/TravelManager/TravelTeam/priceGroup.vue

@@ -611,14 +611,13 @@
                         <th width="80">{{$t('system.query_flightNum')}}</th>
                         <th width="150">{{$t('system.ph_flightTime')}}</th>
                         <th width="80">{{$t('system.query_arrivalTime')}}</th>
-                        <th width="100">{{$t('system.query_stopCity')}}</th>
                       </tr>
-                      <tr v-for="(fItem,fIndex) in item.TravelTeamFlightList" :key="fIndex" style="text-align:center;">
+                      <tr v-for="(fItem,fIndex) in item.SelfFlightList" :key="fIndex" style="text-align:center;">
                         <td class="_d_name _color_666">
                           <span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span>
-                          <span v-else-if="fIndex==item.TravelTeamFlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
+                          <span v-else-if="fIndex==item.SelfFlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
                           <span
-                            v-else-if="fIndex>0 && fIndex!=item.TravelTeamFlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
+                            v-else-if="fIndex>0 && fIndex!=item.SelfFlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
                         </td>
                         <td>
                           <div>{{fItem.Flight_number}}</div>
@@ -638,21 +637,17 @@
                             {{fItem.aName}}
                           </div>
                         </td>
-                        <td>
-                          <template v-if="fItem.StopoverIATA">({{fItem.StopoverIATA}})</template>{{fItem.StopoverName}}
-                        </td>
                       </tr>
                     </table>
                     <div class="FlightDiv-TCL" slot="reference">
                       <template>
-                        <div v-for="subItem in item.TravelTeamFlightList" slot="reference" :key="subItem.subCode"
+                        <div v-for="subItem in item.SelfFlightList" slot="reference" :key="subItem.subCode"
                           class="TCL-flighInfoList">
                           <span class="travelnowrap">
                             <span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
                             <span><template v-if="subItem.DIATA">({{subItem.DIATA}})</template>
                               <template v-else>({{subItem.dName}})</template></span>
                             {{subItem.DepartureName}}
-                            {{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
                             <template v-if="subItem.ArrivalCityName">
                               <span v-if="subItem.AIATA">
                                 -({{subItem.AIATA}})
@@ -716,10 +711,20 @@
                   margin: 5px 0;
                 ">
                 <span style="font-size: 14px;">{{ $t("objFill.v101.zhongxinjge") }}:</span>
-                 </br>￥{{
+                 <br />￥{{
                   item.B2CMemberPrice 
                 }}
               </p>
+               <p style="color: #47BF8C;">
+                      {{ $t("Operation.Op_tradePrice") }}：￥{{
+                      item.B2BShowPrice | priceFormat(item.B2BShowPrice)
+                    }}
+                    </p>
+                    <p style="color: #47BF8C;">
+                      {{ $t("Operation.Op_directPrice") }}：￥{{
+                      item.B2CShowPrice | priceFormat(item.B2CShowPrice)
+                    }}
+                    </p>
               <p>
                 <el-popover width="630" trigger="click">
                   <table class="PQ_detail">
@@ -739,41 +744,38 @@
                       <td>{{ $t("salesModule.Adult") }}</td>
                       <td>
                         {{
-                          item.B2BMemberPrice 
+                          item.B2BShowPrice 
                         }}
                       </td>
-                      <td>{{ item.B2BPrice }}</td>
+                      <td>{{ item.B2BShowPrice }}</td>
                       <td>
                         {{
-                          item.B2CMemberPrice 
+                          item.B2CShowPrice 
                         }}
                       </td>
-                      <td>{{ item.B2CPrice }}</td>
+                      <td>{{ item.B2CShowPrice }}</td>
                     </tr>
                     <tr>
                       <td>{{ $t("salesModule.ChildBed") }}</td>
                       <td>
                         {{
-                          (item.B2BMemberPrice + item.ChildNeedPrice)
+                          (item.B2BShowPrice + item.ChildNeedPrice)
                            
                         }}
                       </td>
                       <td>
                         {{
-                          (item.B2BPrice + item.ChildNeedPrice)
-                           
+                          (item.B2BShowPrice + item.ChildNeedPrice)
                         }}
                       </td>
                       <td>
                         {{
-                          (item.B2CMemberPrice + item.ChildNeedPrice)
-                            
+                          (item.B2CShowPrice + item.ChildNeedPrice)
                         }}
                       </td>
                       <td>
                         {{
-                          (item.B2CPrice + item.ChildNeedPrice)
-                            
+                          (item.B2CShowPrice + item.ChildNeedPrice)
                         }}
                       </td>
                     </tr>
@@ -781,24 +783,22 @@
                       <td>{{ $t("salesModule.ChildNoBed") }}</td>
                       <td>
                         {{
-                          (item.B2BMemberPrice - item.ChildNoNeedPrice)
-                            
+                          (item.B2BShowPrice - item.ChildNoNeedPrice)
                         }}
                       </td>
                       <td>
                         {{
-                          (item.B2BPrice - item.ChildNoNeedPrice)
+                          (item.B2BShowPrice - item.ChildNoNeedPrice)
                         }}
                       </td>
                       <td>
                         {{
-                          (item.B2CMemberPrice - item.ChildNoNeedPrice)
-                           
+                          (item.B2CShowPrice - item.ChildNoNeedPrice)
                         }}
                       </td>
                       <td>
                         {{
-                          (item.B2CPrice - item.ChildNoNeedPrice)
+                          (item.B2CShowPrice - item.ChildNoNeedPrice)
                         }}
                       </td>
                     </tr>
@@ -916,7 +916,7 @@
                   style="background:#00C6FF; border-color:#00C6FF">{{$t('sm.xiadan')}}
                 </el-button></div>
                 <el-dropdown trigger="click">
-                  <span class="el-dropdown-link">{{$t('pub.more')}}:
+                  <span class="el-dropdown-link">{{$t('pub.more')}}
                     <i class="el-icon-arrow-down el-icon--right"></i>
                   </span>
                   <el-dropdown-menu slot="dropdown" class="travelControlDropDown">