save

src/i18n/zh-SW/index.ts

@@ -97,5 +97,63 @@ export default {
 		maxLengthPass: '密码长度应为8-16位',
 		updateResult: '新密码已经设置成功，可以立即登入',
 		resultBtn: "立即登入"
+	},
+	Airticket: {
+	Air_requirent:'需求類型',
+	Air_PutForwardTime:'提出時間',
+	Air_ProcessState:'處理狀態',
+	Air_redType:'紅色',
+	Air_greenType:'綠色',
+	Air_blueType:'藍色',
+	Air_toProcessed:'待處理',
+	Air_Processed:'已處理',
+	Air_toDealWith:'處理',
+	Air_dealRemark:'處理備註',
+	Air_StartCityId:'出發城市編號',
+	Air_ArrivalCityId:'到達城市編號',
+	Air_flightDate:'班機日期',
+	Air_AcceptTransit:'是否接受中轉',
+	Air_requirePeople:'需求人',
+	Air_orderImport:'命令導入',
+	Air_bulkImport:'批量導入',
+	Air_downloadTemplate:'下載範本',
+	Air_firstClass:'頭等艙',
+	Air_businessClass:'商務艙',
+	Air_EconomyClass:'經濟艙',
+	Air_segment:'航段',
+	Air_Trip:'行程',
+	Air_go:'去程',
+	Air_transit:'中轉',
+	Air_returnTrip:'回程',
+	Air_backAndforth:'往返',
+	Air_oneWay:'單程',
+	Air_ben:'本',
+	Air_nei:'內',
+	Air_reservation:'機位',
+	Air_yvwei:'餘比特',
+	Air_departureDate:'起飛日期',
+	Air_deadTicketTime:'出票截止日期',
+	Air_AddTickets:'新增採購機票',
+	Air_Airlines:'航空公司',
+	Air_positions:'倉位',
+	Air_Status:'狀態',
+	Air_TicketType:'機票類型',
+	Air_TicketDeadLine:'出票時限',
+	Air_Number:'人數',
+	Air_unitPrice:'成本單價',
+	Air_salesPrice:'銷售價格',
+	Air_b2bPrice:'B2B單價',
+	Air_b2cPrice:'B2C單價',
+	Air_StartTime:'出發時間',
+	Air_yiding:'一定',
+	Air_erding:'二定',
+	Air_sanding:'三定',
+	Air_siding:'四定',
+	Air_lastPayment:'尾款',
+	Air_salesPlatform:'銷售平臺',
+	Air_positionLevel:'倉位等級',
+	Air_inputOrder:'請輸入命令',
+	Air_AirTicketPredict:'未來三個月機票用量預測',
+	Air_flightTo:'飛往',
   }
 }

src/i18n/zh-TW/index.ts

@@ -1321,6 +1321,207 @@ export default {
       hui: '優惠金額',
       paid: '已付總額'
     }
+  },
+	Airticket: {
+	Air_requirent:'需求類型',
+	Air_PutForwardTime:'提出時間',
+	Air_ProcessState:'處理狀態',
+	Air_redType:'紅色',
+	Air_greenType:'綠色',
+	Air_blueType:'藍色',
+	Air_toProcessed:'待處理',
+	Air_Processed:'已處理',
+	Air_toDealWith:'處理',
+	Air_dealRemark:'處理備註',
+	Air_StartCityId:'出發城市編號',
+	Air_ArrivalCityId:'到達城市編號',
+	Air_flightDate:'班機日期',
+	Air_AcceptTransit:'是否接受中轉',
+	Air_requirePeople:'需求人',
+	Air_orderImport:'命令導入',
+	Air_bulkImport:'批量導入',
+	Air_downloadTemplate:'下載範本',
+	Air_firstClass:'頭等艙',
+	Air_businessClass:'商務艙',
+	Air_EconomyClass:'經濟艙',
+	Air_segment:'航段',
+	Air_Trip:'行程',
+	Air_go:'去程',
+	Air_transit:'中轉',
+	Air_returnTrip:'回程',
+	Air_backAndforth:'往返',
+	Air_oneWay:'單程',
+	Air_ben:'本',
+	Air_nei:'內',
+	Air_reservation:'機位',
+	Air_yvwei:'餘比特',
+	Air_departureDate:'起飛日期',
+	Air_deadTicketTime:'出票截止日期',
+	Air_AddTickets:'新增採購機票',
+	Air_Airlines:'航空公司',
+	Air_positions:'倉位',
+	Air_Status:'狀態',
+	Air_TicketType:'機票類型',
+	Air_TicketDeadLine:'出票時限',
+	Air_Number:'人數',
+	Air_unitPrice:'成本單價',
+	Air_salesPrice:'銷售價格',
+	Air_b2bPrice:'B2B單價',
+	Air_b2cPrice:'B2C單價',
+	Air_StartTime:'出發時間',
+	Air_yiding:'一定',
+	Air_erding:'二定',
+	Air_sanding:'三定',
+	Air_siding:'四定',
+	Air_lastPayment:'尾款',
+	Air_salesPlatform:'銷售平臺',
+	Air_positionLevel:'倉位等級',
+	Air_inputOrder:'請輸入命令',
+	Air_AirTicketPredict:'未來三個月機票用量預測',
+	Air_flightTo:'飛往',
+  },
+  system: {
+    label_zhifei:'直飛',
+    label_jingting:'經停',
+    label_info:'描述',
+    label_img:'圖片',
+    query_company:'所屬公司',
+    query_lineName:'線路名稱',
+    query_name:'姓名',
+    query_dest:'目的地',
+    query_airName:'名稱',
+    query_IATA:'IATA',
+    query_ICAO:'ICAO',
+    query_cityName:'都市名稱',
+    query_airCompanyName:'航空公司',
+    query_flightNum:'航班號',
+    query_type:'類型',
+    query_flightCity:'起飛都市',
+    query_flightAir:'起飛機場',
+    query_stopCity:'經停都市',
+    query_stopAir:'經停機場',
+    query_arrivalCity:'到達城市',
+    query_arrivalAir:'到達機場',
+    query_arrivalTime:'到達時間',
+    quety_area:'區域',
+    query_workType:'工作類型',
+    query_goCoun:'出行國家',
+    query_Language:'精通語種',
+    table_company:'公司', 
+    table_lineName:'線路名稱', 
+    table_ssLine:'所屬線路',
+    table_lineCode:'線路編碼',
+    table_staff:'估價/稽核人員',
+    table_xffy:'幸福存摺返傭',
+    table_bonus:'分公司分紅',
+    table_isShow:'是否顯示',
+    table_isShows:'顯示',
+    table_operation:'操作',
+    table_Appraise:'估價人員',
+    table_Auditing:'稽核人員',
+    table_staffs:'員工',
+    table_destName:'目的名稱',
+    table_country:'國家',
+    table_city:'都市',
+    table_destCoun:'目的國家',
+    table_edit:'修改',
+    table_delete:'删除',
+    table_kfPhone:'客服電話',
+    table_logoImg:'logo圖片',
+    table_ticketCont:'出票所需內容',
+    table_chekAll:'全選',
+    table_ticketAotu:'是否自動出票',
+    table_groupName:'團控團名',
+    table_code:'程式碼',
+    table_codeTips:'（三碼）',
+    table_LtName:'團名名稱',
+    table_NetLtName:'網頁團名',
+    table_isSaleInNET:'是否銷售',
+    table_LtNameTips:'（用於前臺收客網站顯示）',
+    table_NetLtNameTips:'（直客平臺顯示）',
+    table_isShowTips:'（內部團控）',
+    table_goCity:'出發城市',
+    table_enName:'英文名稱',
+    table_pvrg:'省份/地區',
+    table_rank:'排序',
+    table_rankNum:'排序編號',
+    table_priceChange:'浮動金額',
+    table_isDefault:'是否設為默認',
+    table_tips_fmgCk:'同步更新團隊/採購班機資訊',
+    table_tips_fmgInfo:'請選擇需要同步更新的出發日期範圍',
+    table_begTime:'開始時間',
+    table_overTime:'截止時間',
+    table_sex:'性別',
+    table_phone:'手機號',
+    table_Passport:'護照號',
+    table_IDcard:'身份證號',
+    table_pinyin:'拼音',
+    table_acc:'帳號',
+    table_ENname:'英文名',
+    table_jgName:'機構名稱',
+    table_jgCode:'機构程式碼',
+    table_jgType:'機构類型',
+    table_icon:'機构圖標',
+    table_Url:'網址',
+    table_EN:'英文',
+    table_praceQK:'價格浮動情况',
+    ph_time:'填寫時間',
+    ph_Passport:'請輸入護照號',
+    table_currencyName:'貨幣名稱',
+    table_currencyCode:'貨幣程式碼',
+    query_templateName:'範本名稱',
+    table_uniqueMark:'唯一標識',
+    ph_url:'請輸入網址',
+    ph_jgName:'機構名稱',
+    ph_jgCode:'機构程式碼',
+    ph_flightCity:'請選擇起飛都市', 
+    ph_flightAir:'請選擇起飛機場', 
+    ph_flightTime:'起飛時間', 
+    ph_stopFlightTime:'經停到達時間', 
+    ph_toFlightTime:'經停起飛時間',
+    ph_stopCity:'請選擇經停都市', 
+    ph_stopAir:'請選擇經停機場', 
+    ph_arrivalCity:'請選擇到達城市', 
+    ph_arrivalAir:'請選擇到達機場',
+    ph_type:'請選擇類型',
+    ph_airNum:'請輸入航班號', 
+    ph_name:'請輸入名稱', 
+    ph_ENname:'請輸入英文名稱', 
+    ph_choiceAir:'請選擇航空公司', 
+    ph_LtName:'請輸入團名名稱', 
+    ph_NetLtName:'請輸入網頁團名', 
+    ph_choice:'請選擇',
+    ph_in:'請輸入',
+    ph_lineName:'請輸入線路名稱',
+    ph_destName:'請輸入目的地名稱',
+    ph_code:'請輸入線路程式碼',
+    ph_xianluCode:'線路程式碼',
+    ph_codes:'請輸入程式碼',
+    ph_noChoice:'不選擇',
+    ph_noYes:'不選擇/可多選',
+    ph_airName:'請輸入航空公司名稱',
+    ph_IATA:'請輸入IATA',
+    ph_ICAO:'請輸入ICAO',
+    ph_kfphone:'請輸入客服電話',
+    ph_buxian:'不限',
+    ph_zhengchang:'正常', 
+    ph_shanchu:'删除',
+    ph_city:'請輸入都市', 
+    ph_cityEname:'請輸入都市英文名稱', 
+    up_upImg:'上傳圖片',
+    up_againUp:'重新上傳', 
+    up_tips:'（上傳圖片規格大於120*120）', 
+    sel_priceNo:'無浮動', 
+    sel_priceUp:'上浮', 
+    sel_priceDown:'下調', 
+    content_noData:'暫無數據', 
+    btn_closeCtrl:'關閉控制', 
+    btn_openCtrl:'開啟控制', 
+    btn_CtrlSet:'控制設定', 
+    btn_queryCtrl:'査詢當期',  
+    btn_bindCtrl:'綁定資訊', 
+    btn_addCoin:'添加幣種',  
+    label_netName:'網頁團名',
   }
   //#endregion
 }

src/pages/travel/OrderPayList.vue

@@ -9,7 +9,7 @@
 <template>
 <div class="q-pa-md">
   
-  <div class="rounded-borders bg-white row items-center q-pa-md">
+  <!-- <div class="rounded-borders bg-white row items-center q-pa-md">
     <q-field :class="$q.platform.is.desktop ? '' : 'q-mb-md'" stack-label :label="$t('daterange')" standout class="q-ml-lg col-2" style="min-width: 190px" dense>
       <div class="self-center full-width no-outline" tabindex="0">{{ dateRangeFormat }}</div>
       <q-popup-proxy :offset="[0, 10]" ref="qDateProxy">
@@ -20,7 +20,7 @@
     <q-input class="q-mr-md q-ml-md" v-model="search.GTeamName" dense standout label="团号"/>
     <div class="col"></div>
     <q-btn color="primary" unelevated :label="$t('query')"  @click="setQueryHandler"/>
-  </div>
+  </div> -->
   <!-- <div class="row">
     
     <div>合作伙伴:<span>{{item.ContactName}}</span></div>
@@ -131,8 +131,8 @@ export default defineComponent({
           .then((r) => {
             data.loading = false;
             if (r.data.resultCode == ApiResult.SUCCESS) {
-              data.orders = r.data.data.pageData;
-              data.pages.pageCount = r.data.data.pageCount;
+              data.orders = r.data.data.length ? r.data.data : [r.data.data];
+              // data.pages.pageCount = r.data.data.pageCount;
             } else {
               message.errorMsg(r.data.message);
             }

src/pages/travel/components/OrderListHeader.vue

@@ -23,8 +23,9 @@
     <div :class="$q.platform.is.desktop ? '' : 'q-mb-md'">
       <q-select style="min-width: 190px;" unelevated dense label="支付状态" standout v-model="search.PayStatus" :options="payStateList" option-value="value" option-label="label"></q-select>
     </div>
-    <q-field :class="$q.platform.is.desktop ? 'q-ml-lg' : 'q-mb-md'" stack-label label="创建日期" standout class=" col-2" style="min-width: 190px" dense>
-      <div class="self-center full-width no-outline" tabindex="0">{{ dateRangeFormatC }}</div>
+    <q-field :class="$q.platform.is.desktop ? 'q-ml-lg' : 'q-mb-md'" stack-label label="创建日期" :clearable="true" standout class=" col-2" style="min-width: 190px" dense>
+      <div class="self-center full-width no-outline row justify-between 
+      " tabindex="0">{{ dateRangeFormatC }} <span @click="clearC" v-if="dateRangeFormatC"><q-icon name="close" size="20px" color="primary" class="cursor-pointer" v-ripple v-close-popup/></span></div>
       <q-popup-proxy :offset="[0, 10]" ref="qDateProxy">
         <q-date v-model="dateRangeC" :options="optionsFn" range mask="YYYY/MM/DD" landscape
           @range-end="dateRangeHandlerC"></q-date>
@@ -71,12 +72,19 @@ export default defineComponent({
     search.QStartDate = dateRange.from
     search.QEndDate = dateRange.to
     const dateRangeC = reactive({from: '', to: ''})
-    dateRangeC.to = date.formatDate(date.adjustDate(new Date(), { year,month: month,days: 1}), 'YYYY/MM/DD')
-    dateRangeC.from = date.formatDate(date.adjustDate(new Date(), { days: 1 }), 'YYYY/MM/DD')
-    const dateRangeFormatC = ref(`${dateRangeC.from} - ${dateRangeC.to}`)
+    // dateRangeC.to = date.formatDate(date.adjustDate(new Date(), { year,month: month,days: 1}), 'YYYY/MM/DD')
+    // dateRangeC.from = date.formatDate(date.adjustDate(new Date(), { days: 1 }), 'YYYY/MM/DD')
+    const dateRangeFormatC = ref('')
     search.CStartDate = dateRangeC.from
     search.CEndDate = dateRangeC.to
     const methods = {
+      clearC() {
+        dateRangeFormatC.value = ''
+        search.CStartDate = ''
+    search.CEndDate = ''
+    dateRangeC.from = ""
+    dateRangeC.to = ""
+      },
       setQueryHandler(){
         realSearch.QStartDate=search.QStartDate
         realSearch.QEndDate=search.QEndDate

src/pages/travel/components/addOrder.vue

@@ -136,7 +136,7 @@
             ></q-input>
           </div>
         </div>
-        <div class="row">
+        <!-- <div class="row">
           <div class="col">
             <div class="title">大床房</div>
             <q-input
@@ -170,7 +170,7 @@
                   autoRemarks('TripleRoomNum', '三人房');
                 "></q-input>
           </div>
-        </div>
+        </div> -->
         <div class="row">
           <div class="col">
             <div class="title">签证数量</div>
@@ -191,6 +191,11 @@
             >
           </div>
           <div class="col">
+            <div class="title">单身男女</div>
+                <q-radio v-model="addMsg.OneSex" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" val="1" label="男" @update:model-value="changePeople"/>
+                <q-radio v-model="addMsg.OneSex" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" val="2" label="女" @update:model-value="changePeople"/>
+          </div>
+          <!-- <div class="col">
             <div class="title">保险数量</div>
             <q-input
               v-model="addMsg.SafeNum"
@@ -205,14 +210,9 @@
                   getTotalPrice();
                   autoRemarks2('SafeNum', '不要保险数量');
                 "></q-input>
-          </div>
+          </div> -->
         </div>
         <div class="row">
-          <div class="col">
-            <div class="title">单身男女</div>
-                <q-radio v-model="addMsg.OneSex" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" val="1" label="男" @update:model-value="changePeople"/>
-                <q-radio v-model="addMsg.OneSex" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" val="2" label="女" @update:model-value="changePeople"/>
-          </div>
           <div class="col">
             <div class="title">预计用房</div>
             <q-input
@@ -223,8 +223,6 @@
               standout
                v-model="addMsg.PredictRoomNum" :disable="true"></q-input>
           </div>
-        </div>
-        <div class="row">
           <div class="col">
             <div class="title">经济舱</div>
             <q-input

src/pages/travel/components/productList.vue

@@ -24,15 +24,28 @@
       </div>
       <div class="col-4">
                 <div class="mb-title"><i class="iconfont icon-hangban1"></i><span>航班信息</span></div>
+                    <div class="FlightDiv-TCL" @click="showDialogF(x)">
                         <div 
-          class="mb"
           v-for="(subItem, subIndex) in x.TravelTeamFlightList"
           :key="subIndex + 1000"
-        >
-          <div>
-            {{ subItem.Flight_number }} {{ subItem.DepartureAirPortName }}
-            {{ subItem.Departure_time }} {{ subItem.ArrivalAirPortName }}
-            {{ subItem.Arrival_time }}
+                          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}})
+                              </span>
+                              <span v-else>-</span>
+                              {{subItem.ArrivalCityName}}
+                              <template v-if="!subItem.DIATA">({{subItem.aName}})</template>
+                            </template>
+                            <span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
+                            <span v-else class="TCL-redType">【暂定】</span>
+                          </span>
                         </div>
                     </div>
       </div>
@@ -94,6 +107,47 @@
         <q-btn color="primary" unelevated @click="ViewPayment(x)">下单</q-btn>
         <q-btn :class="$q.platform.is.desktop ? 'q-mt-md' : 'q-ml-md'" color="primary" unelevated @click="gotoUrl(x)">包机结算</q-btn>
       </div>
+                  <q-dialog width="900" v-model="showItem" trigger="click" >
+                    <div class="TC_tripDetails" style="width: 900px;background-color: #fff;">
+                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                      <tr class="_color_666" style="text-align:center;">
+                        <th width="60">{{$t('Airticket.Air_segment')}}</th>
+                        <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 dialogObj.TravelTeamFlightList" :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==dialogObj.TravelTeamFlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
+                          <span
+                            v-else-if="fIndex>0 && fIndex!=dialogObj.TravelTeamFlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
+                        </td>
+                        <td>
+                          <div>{{fItem.Flight_number}}</div>
+                          <div style="margin-top:5px;">{{fItem.AlName}}</div>
+                        </td>
+                        <td>
+                          <div>{{fItem.FlightDate.slice(0,10)}} {{fItem.Departure_time}}</div>
+                          <div style="margin-top:5px;">
+                            <span v-if="fItem.DIATA">({{fItem.DIATA}})</span>
+                            {{fItem.dName}}
+                          </div>
+                        </td>
+                        <td>
+                          <div>{{fItem.FlightArrivalTime}} {{fItem.Arrival_time}}</div>
+                          <div style="margin-top:5px;">
+                            <span v-if="fItem.AIATA">({{fItem.AIATA}})</span>
+                            {{fItem.aName}}
+                          </div>
+                        </td>
+                        <td>
+                          <template v-if="fItem.StopoverIATA">({{fItem.StopoverIATA}})</template>{{fItem.StopoverName}}
+                        </td>
+                      </tr>
+                    </table></div>
+                  </q-dialog>
     </q-card>
     <q-card
       class="light-shadow q-pa-md bg-white rounded-borders q-mb-md"
@@ -161,6 +215,8 @@ export default defineComponent({
     });
 
     const data = reactive({
+      showItem: false,
+      dialogObj: {TravelTeamFlightList: []} as any,
       info: {},
       copyId: 0,
       showAddOrder: false,
@@ -179,6 +235,11 @@ export default defineComponent({
     });
 
     const methods = {
+      showDialogF(item) {
+        console.log('showDialogF', item)
+        data.showItem = true
+        data.dialogObj = item
+      },
       closeAdd() {
         data.showAddOrder = false
         methods.initOrders()
@@ -340,6 +401,15 @@ export default defineComponent({
 }
 </style>
 <style scoped>
+
+.TC_tripDetails {padding: 0; box-shadow: 0px 1px 3px 0px #dedede; max-height: 400px;overflow-y: auto;}
+.TC_tripDetails .popper__arrow::after {border-bottom-color: #ededed !important;}
+.TC_tripDetails table { padding: 10px 0 0 20px; background-color: #ededed; border-collapse: collapse; border: 1px solid #d2d2d2; font-size: 12px;}
+.TC_tripDetails table th { background-color: #ededed; padding: 5px;}
+.TC_tripDetails table td { background-color: #ffffff; padding: 9px 15px;color: #333333;border: 1px solid #d2d2d2;}
+.TC_tripDetails table td._d_name {background-color: #ededed;}
+.TC_tripDetails table ._color_666 {color: #666666;}
+.TC_tripDetails table tr._color_666 th { padding: 9px 15px;}
 .mb-title {
   font-weight: bold;
   margin-bottom: 10px;