save

src/i18n/ja-RB/index.ts

@@ -354,8 +354,85 @@ export default {
       first: 'ツケ',
       second: '月次請求書',
       three: '送金の説明'
+    },
+    travel: {
+      first: 'チャーター',
+      second: 'チャーターサービス',
+      three: 'チャーター注文',
     }
   },
+  travel: {
+    man: '大人の数',
+    addTitle: '注文の追加/変更',
+    oldPeople: '老人の数',
+    childNeedBed:'子供たちはベッドを占有する',
+    children: '老人の数',
+    ChirdNoNeedBedNum:'子供たちはベッドを作らない',
+    NoNeedBed:'ベッドを占有しないでください',
+    Baby:'赤ちゃん',
+    BabyNum:'赤ちゃんの数',
+    SingleRoomNum:'シングルルームの数',
+    VisaNum:'ビザの数',
+    OneSex:'独身男性と女性',
+    male:'男性',
+    woman: '女性',
+    PredictRoomNum: '部屋の予想される使用',
+    YSeatNum: 'エコノミークラス',
+    FSeatNum: '一流',
+    ESeatNum: 'ビジネスクラス',
+    ContactName: '連絡先',
+    ContactMobile: '連絡先電話番号',
+    Remarks: '備考',
+    PreferPrice: '注文価格',
+    cancel: 'キャンセル',
+    submit: '確認',
+    pays: '受け取った金額',
+    startDate: '出発日',
+    guestNum: '顧客数',
+    unit_Price: '取引価格',
+    tC_Price: 'このツアーの単価',
+    tradeWay: '支払い方法',
+    online: 'オンライン',
+    notLine: 'オフライン',
+    all: '無制限',
+    notPay: '回収するデポジット',
+    payed: '支払い保留中',
+    orderStatus: '注文ステータス',
+    createDate: '作成日',
+    payStatus: '支払いステータス',
+    id: '連隊番号',
+    planInfo: 'チャーター情報',
+    groupInfo: 'チーム情報',
+    airInfo: 'フライト情報',
+    tmp: '暫定的',
+    airSeatInfo: 'グループ情報',
+    YSeat: 'エコノミークラス',
+    unUseNum: '剰余',
+    CSeat: 'ビジネスクラス',
+    FSeat: 'ファーストクラス',
+    priceInfo: '価格情報',
+    midPrice: '中央価格',
+    BabyChargePrice: '子供追加料金',
+    OldManChargePrice: '老人追加料金',
+    VisaPrice: 'ビザ',
+    SingleRoomPrice: 'シングルルーム差額',
+    OtherPrice: '雑費',
+    buy: '注文する',
+    payOrder: 'チャーターチェックアウト',
+    noData: 'データなし',
+    ContactNamePay: 'パートナー',
+    EntGuestNum: 'リストの人数',
+    GuestNum: '申請者の総数',
+    PreferPricePay: '売掛金の合計額',
+    Refund: '払い戻し額',
+    PlatformTax: 'プラットフォーム税',
+    Income: '支払われた',
+    ZaiTuMoney: '輸送中の金額',
+    DiscountMoney: '割引額',
+    RedEnvelopeMoney: 'ビッグレッドパケット控除',
+    DueInMoney: '回収された合計金額',
+    CommissionRate: '利益',
+  },
   login: {
     notaccess: '同業者の会員アカウントがない?',
     registlink: '登録申請',
@@ -1101,5 +1178,17 @@ export default {
     },
     
   },
+	Airticket: {
+    Air_go:'往路',
+    Air_segment:'フライトセグメント',
+    Air_returnTrip:'戻る',
+    Air_transit:'トランジット',
+  },
+  system: {
+    query_flightNum:'フライト番号',
+    query_arrivalTime:'到着時間',
+    query_stopCity:'ストップシティ',
+    ph_flightTime:'離陸時間',
+  }
   //#endregion
 }

src/i18n/ko-HG/index.ts

@@ -354,8 +354,85 @@ export default {
       first: '계산서',
       second: '월간 청구서',
       three: '송금 안내'
+    },
+    travel: {
+      first: '헌장',
+      second: '전세 서비스',
+      three: '전세 주문',
     }
   },
+  travel: {
+    man: '성인 수',
+    addTitle: '주문 추가/수정',
+    oldPeople: '노인 수',
+    childNeedBed:'아이들이 침대를 차지합니다',
+    children: '어린이 수',
+    ChirdNoNeedBedNum:'아이들은 침대를 만들지 않는다',
+    NoNeedBed:'침대를 차지하지 마십시오',
+    Baby:'아기',
+    BabyNum:'아기의 수',
+    SingleRoomNum:'싱글룸 수',
+    VisaNum:'비자 수',
+    OneSex:'독신 남녀',
+    male:'남성',
+    woman: '여성',
+    PredictRoomNum: '방의 예상 사용',
+    YSeatNum: '이코노미 클래스',
+    FSeatNum: '퍼스트 클래스',
+    ESeatNum: '비즈니스 클래스',
+    ContactName: '연락처',
+    ContactMobile: '연락처 전화',
+    Remarks: '연락처',
+    PreferPrice: '주문 가격',
+    cancel: '취소',
+    submit: '확인',
+    pays: '받은 금액',
+    startDate: '출발일',
+    guestNum: '고객 수',
+    unit_Price: '거래 가격',
+    tC_Price: '이 투어의 단가',
+    tradeWay: '결제 방법',
+    online: '온라인',
+    notLine: '오프라인',
+    all: '무제한',
+    notPay: '징수할 보증금',
+    payed: '결제 보류 중',
+    orderStatus: '주문 상태',
+    createDate: '만든 날짜',
+    payStatus: '지불 상태',
+    id: '연대 번호',
+    planInfo: '헌장 정보',
+    groupInfo: '팀 정보',
+    airInfo: '항공편 정보',
+    tmp: '잠정',
+    airSeatInfo: '그룹 정보',
+    YSeat: '이코노미 클래스',
+    unUseNum: '나머지',
+    CSeat: '비즈니스 클래스',
+    FSeat: '퍼스트 클래스',
+    priceInfo: '가격 정보',
+    midPrice: '중앙 가격',
+    BabyChargePrice: '어린이 할증료',
+    OldManChargePrice: '노인 할증료',
+    VisaPrice: '비자',
+    SingleRoomPrice: '싱글 룸 차이',
+    OtherPrice: '기타 비용',
+    buy: '주문하기',
+    payOrder: '전세 체크아웃',
+    noData: '전세 체크아웃',
+    ContactNamePay: '파트너',
+    EntGuestNum: '목록에 있는 사람 수',
+    GuestNum: '총 지원자 수',
+    PreferPricePay: '총 미수금',
+    Refund: '환불 금액',
+    PlatformTax: '플랫폼세',
+    Income: '유료',
+    ZaiTuMoney: '운송 금액',
+    DiscountMoney: '할인금액',
+    RedEnvelopeMoney: '큰 빨간 패킷 공제',
+    DueInMoney: '총 수금 금액',
+    CommissionRate: '이익',
+  },
   login: {
     notaccess: '동업자회원계좌가 없다？',
     registlink: '등기를 신청하다',
@@ -1101,5 +1178,17 @@ export default {
     },
 
   },
+	Airticket: {
+    Air_go:'아웃바운드 여정',
+    Air_segment:'비행 구간',
+    Air_returnTrip:'반환',
+    Air_transit:'대중 교통',
+  },
+  system: {
+    query_flightNum:'항공편 번호',
+    query_arrivalTime:'도착 시간',
+    query_stopCity:'도시를 멈추다',
+    ph_flightTime:'이륙 시간',
+  }
   //#endregion
 }

src/i18n/zh-TW/index.ts

@@ -358,9 +358,83 @@ export default {
     travel: {
       first: '包机',
       second: '包机服务',
-      three: '包机订单'
+      three: '包机订单',
+      man: '成人数量',
+      addTitle: '新增/修改订单',
     }
   },
+  travel: {
+    man: '成人数量',
+    addTitle: '新增/修改订单',
+    oldPeople: '老人数量',
+    childNeedBed:'儿童占床',
+    children: '儿童人数',
+    ChirdNoNeedBedNum:'儿童不占床',
+    NoNeedBed:'不占床',
+    Baby:'婴儿',
+    BabyNum:'婴儿人数',
+    SingleRoomNum:'单房数量',
+    VisaNum:'签证数量',
+    OneSex:'单身男女',
+    male:'男',
+    woman: '女',
+    PredictRoomNum: '预计用房',
+    YSeatNum: '经济舱',
+    FSeatNum: '头等舱',
+    ESeatNum: '商务舱',
+    ContactName: '联系人',
+    ContactMobile: '联系人电话',
+    Remarks: '备注',
+    PreferPrice: '订单价格',
+    cancel: '取消',
+    submit: '确认',
+    pays: '已收金额',
+    startDate: '发团日期',
+    guestNum: '顾客数量',
+    unit_Price: '成交单价',
+    tC_Price: '本团单价',
+    tradeWay: '支付方式',
+    online: '线上',
+    notLine: '线下',
+    all: '不限',
+    notPay: '待收定金',
+    payed: '待收尾款',
+    orderStatus: '订单状态',
+    createDate: '创建日期',
+    payStatus: '支付状态',
+    id: '团号',
+    planInfo: '包机信息',
+    groupInfo: '团队信息',
+    airInfo: '航班信息',
+    tmp: '【暂定',
+    airSeatInfo: '团位信息',
+    YSeat: '经济舱',
+    unUseNum: '剩余',
+    CSeat: '商务舱',
+    FSeat: '头等舱',
+    priceInfo: '价格信息',
+    midPrice: '中心价',
+    BabyChargePrice: '儿童附加费',
+    OldManChargePrice: '老人附加费',
+    VisaPrice: '签证',
+    SingleRoomPrice: '单房差',
+    OtherPrice: '杂费',
+    buy: '下单',
+    payOrder: '包机结算',
+    noData: '暂无数据',
+    ContactNamePay: '合作伙伴',
+    EntGuestNum: '已入名单人数',
+    GuestNum: '报名总人数',
+    PreferPricePay: '应收总金额',
+    Refund: '退款金额',
+    PlatformTax: '平台税金',
+    Income: '实收',
+    ZaiTuMoney: '在途金额',
+    DiscountMoney: '折扣金额',
+    RedEnvelopeMoney: '大红包抵扣金额',
+    DueInMoney: '代收总金额',
+    CommissionRate: '利润',
+  },
   login: {
     notaccess: '沒有同業會員帳戶？',
     registlink: '申請註冊',
@@ -1323,205 +1397,16 @@ export default {
     }
   },
 	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:'飛往',
+    Air_go:'去程',
+    Air_segment:'航段',
+    Air_returnTrip:'回程',
+    Air_transit:'中轉',
   },
   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:'網頁團名',
+    query_stopCity:'經停都市',
+    ph_flightTime:'起飛時間',
   }
   //#endregion
 }

src/pages/travel/OrderPayList.vue

@@ -39,18 +39,18 @@
   </div> -->
   <div class="row q-py-md">
     
-    <div class="col-1">合作伙伴</div>
-    <div class="col-1">已入名单人数</div>
-    <div class="col-1">报名总人数</div>
-    <div class="col-1">应收总金额</div>
-    <div class="col-1">退款金额</div>
-    <div class="col-1">平台税金</div>
-    <div class="col-1">实收</div>
-    <div class="col-1">在途金额</div>
-    <div class="col-1">折扣金额</div>
-    <div class="col-1">大红包抵扣金额</div>
-    <div class="col-1">代收总金额</div>
-    <div class="col-1">利润</div>
+    <div class="col-1">{{$t('travel.ContactNamePay')}}</div>
+    <div class="col-1">{{$t('travel.EntGuestNum')}}</div>
+    <div class="col-1">{{$t('travel.GuestNum')}}</div>
+    <div class="col-1">{{$t('travel.PreferPricePay')}}</div>
+    <div class="col-1">{{$t('travel.Refund')}}</div>
+    <div class="col-1">{{$t('travel.PlatformTax')}}</div>
+    <div class="col-1">{{$t('travel.Income')}}</div>
+    <div class="col-1">{{$t('travel.ZaiTuMoney')}}</div>
+    <div class="col-1">{{$t('travel.DiscountMoney')}}</div>
+    <div class="col-1">{{$t('travel.RedEnvelopeMoney')}}</div>
+    <div class="col-1">{{$t('travel.DueInMoney')}}</div>
+    <div class="col-1">{{$t('travel.CommissionRate')}}</div>
   </div>
   <div class="row q-py-md" v-for="item in orders" :key="item.id">
     <div class="col-1"><span>{{item.ContactName}}</span></div>
@@ -66,7 +66,7 @@
     <div class="col-1"><span>{{item.DueInMoney}}</span></div>
     <div class="col-1"><span>{{item.CommissionRate}}</span></div>
   </div>
-  <div v-if="!orders.length" class="none">暂无数据</div>
+  <div v-if="!orders.length" class="none">{{$t('travel.noData')}}</div>
 </div>
 </template>
 <script lang="ts">

src/pages/travel/components/OrderList.vue

@@ -16,7 +16,7 @@
             bordered :columns="cols" class="sticky-rightrowspan-column-table light-border col no-shadow">
           </q-table>
         </div>
-          <div class="q-my-md">备注: {{x.remarks}}</div>
+          <div class="q-my-md">{{ $t('travel.Remarks') }}: {{x.remarks}}</div>
         
       
         
@@ -43,7 +43,7 @@
             </div>
           </div>
           <div class="row items-center justify-between q-mb-sm q-pb-sm" style="border-bottom: 1px dashed #ddd">
-            <div class="f12 text-grey">已收金额</div>
+            <div class="f12 text-grey">{{ $t('travel.pays') }}</div>
             <div class="dark q-ml-xl">
               <!-- <span class="f12">{{ $t('unit.jpc') }}</span> -->
               <span class="din text-subtitle1">{{ moneyFormat(x.income) }}</span>
@@ -186,15 +186,15 @@ export default defineComponent({
   { name: 'iron', label: 'Iron (%)', field: 'iron', sortable: true}
 ],
       cols: [
-        { name: 'startDate', field: 'startDate', label: "发团日期", align: 'left' },
-        { name: 'oldPeopleNum', field: 'oldPeopleNum', label: '老人', align: 'left' },
-        { name: 'manNum', field: 'manNum', label: '成年人', align: 'left' },
-        { name: 'babyNum', field: 'babyNum', label: '婴儿', align: 'left' },
-        { name: 'chirdNum', field: 'chirdNum', label: '儿童', align: 'left' },
-        { name: 'guestNum', field: 'guestNum', label: '顾客数量', align: 'left' },
-        { name: 'unit_Price', field: 'unit_Price', label: '成交单价', align: 'left' },
-        { name: 'tC_Price', field: 'tC_Price', label: '本团单价', align: 'left' },
-        { name: 'tradeWay', field: 'tradeWay', label: '支付方式', align: 'left' },
+        { name: 'startDate', field: 'startDate', label: t("travel.startDate"), align: 'left' },
+        { name: 'oldPeopleNum', field: 'oldPeopleNum', label: t("travel.oldPeople"), align: 'left' },
+        { name: 'manNum', field: 'manNum', label: t("travel.man"), align: 'left' },
+        { name: 'babyNum', field: 'babyNum', label: t("travel.BabyNum"), align: 'left' },
+        { name: 'chirdNum', field: 'chirdNum', label: t("travel.children"), align: 'left' },
+        { name: 'guestNum', field: 'guestNum', label: t("travel.guestNum"), align: 'left' },
+        { name: 'unit_Price', field: 'unit_Price', label: t("travel.unit_Price"), align: 'left' },
+        { name: 'tC_Price', field: 'tC_Price', label: t("travel.tC_Price"), align: 'left' },
+        { name: 'tradeWay', field: 'tradeWay', label: t("travel.tradeWay"), align: 'left' },
         // { name: 'remarks', field: 'remarks', label: '备注', align: 'left' },
       ] as any,
     });
@@ -266,7 +266,7 @@ export default defineComponent({
               data.orders = r.data.data.pageData;
               data.orders.forEach(item => {
                 item.rows = [toRaw(item)]
-                item.tradeWay = item.tradeWay === 1 ? '线上' : '线下'
+                item.tradeWay = item.tradeWay === 1 ? t('travel.online') : t('travel.notLine')
               })
               console.log('data.orders', data.orders)
               data.pages.pageCount = r.data.data.pageCount;

src/pages/travel/components/OrderListHeader.vue

@@ -10,7 +10,7 @@
   <div class="rounded-borders bg-white row items-center q-pa-md">
     <div class="q-mr-md" :class="$q.platform.is.desktop ? '' : 'q-mb-md'">
       <!-- <span>订单状态</span> -->
-      <q-select style="min-width: 190px;" unelevated dense label="订单状态" standout v-model="search.OrderState" :options="orderStateList" option-value="Id" option-label="Name"></q-select>
+      <q-select style="min-width: 190px;" unelevated dense :label="$t('travel.orderStatus')" standout v-model="search.OrderState" :options="orderStateList" option-value="Id" option-label="Name"></q-select>
     </div>
     <!-- <div class=" q-pa-md">
       <span>参团类型</span>
@@ -21,9 +21,9 @@
       <q-select v-model="search.OrderSource"></q-select>
     </div> -->
     <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>
+      <q-select style="min-width: 190px;" unelevated dense :label="$t('travel.payStatus')" 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="创建日期" :clearable="true" standout class=" col-2" style="min-width: 190px" dense>
+    <q-field :class="$q.platform.is.desktop ? 'q-ml-lg' : 'q-mb-md'" stack-label :label="$t('travel.createDate')" :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">
@@ -31,14 +31,14 @@
           @range-end="dateRangeHandlerC"></q-date>
       </q-popup-proxy>
     </q-field>
-    <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>
+    <q-field :class="$q.platform.is.desktop ? 'q-ml-lg' : 'q-mb-md'" stack-label :label="$t('travel.startDate')" standout class=" 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">
         <q-date v-model="dateRange" :options="optionsFn" range mask="YYYY/MM/DD" landscape
           @range-end="dateRangeHandler"></q-date>
       </q-popup-proxy>
     </q-field>
-    <q-input class="q-mr-md q-ml-md" v-model="search.TCNUM" dense standout label="团号"/>
+    <q-input class="q-mr-md q-ml-md" v-model="search.TCNUM" dense standout :label="$t('travel.id')"/>
     <div class="col"></div>
     <q-btn color="primary" unelevated :label="$t('query')"  @click="setQueryHandler"/>
   </div>
@@ -51,11 +51,13 @@ import { date } from 'quasar'
 import travelService from "../../../api/travel";
 import { ApiResult } from "../../../@types/enumHelper";
 import message from "../../../utils/message";
+import { useI18n } from "vue-i18n";
 
 export default defineComponent({
   setup(props) {
-    const orderStateList = ref([{Name: '不限', Id: 0}])
-    const payStateList = reactive([{label: '不限', value: -1},{label: '待收定金', value: 1},{label: '待收尾款', value: 2},])
+    const { t } = useI18n();
+    const orderStateList = ref([{Name: t("travel.all"), Id: 0}])
+    const payStateList = reactive([{label: t("travel.all"), value: -1},{label: t("travel.notPay"), value: 1},{label: t("travel.payed"), value: 2},])
     const qDateProxy = ref(null) as any
     const realSearch = inject(DirtionmaryHelper.TRAVEL_ORDER_OBJ) as any
     const search = reactive(JSON.parse(JSON.stringify(realSearch)))

src/pages/travel/components/addOrder.vue

@@ -14,11 +14,11 @@
 <template>
   <q-card flat class="q-pa-md" style="background: #fff; width: 600px; min-width: 375px">
     <div class="bacakground">
-        <div class="heading">新增/修改订单</div>
+        <div class="heading">{{ $t('travel.addTitle') }}</div>
       <q-form @submit="saveOrder">
         <div class="row">
           <div class="col">
-            <div class="title">成人数量</div>
+            <div class="title">{{ $t('travel.man') }}</div>
             <q-input
               v-model="addMsg.ManNum"
               class="col q-mr-md"
@@ -38,7 +38,7 @@
             >
           </div>
           <div class="col">
-            <div class="title">老人数量</div>
+            <div class="title">{{ $t('travel.oldPeople') }}</div>
             <q-input
               v-model="addMsg.OldPeopleNum"
               class="col q-mr-md"
@@ -60,7 +60,7 @@
         </div>
         <div class="row">
           <div class="col">
-            <div class="title">儿童占床</div>
+            <div class="title">{{ $t('travel.childNeedBed') }}</div>
             <q-input
               v-model="addMsg.ChirdNeedBedNum"
               class="col q-mr-md"
@@ -78,7 +78,7 @@
             >
           </div>
           <div class="col">
-            <div class="title">儿童不占床</div>
+            <div class="title">{{ $t('travel.ChirdNoNeedBedNum') }}</div>
             <q-input
               v-model="addMsg.ChirdNoNeedBedNum"
               class="col q-mr-md"
@@ -99,7 +99,7 @@
         </div>
         <div class="row">
           <div class="col">
-            <div class="title">婴儿人数</div>
+            <div class="title">{{ $t('travel.BabyNum') }}</div>
             <q-input
               v-model="addMsg.BabyNum"
               class="col q-mr-md"
@@ -117,7 +117,7 @@
             >
           </div>
           <div class="col">
-            <div class="title">单房数量</div>
+            <div class="title">{{ $t('travel.SingleRoomNum') }}</div>
             <q-input
               v-model="addMsg.SingleRoomNum"
               class="col q-mr-md"
@@ -136,44 +136,9 @@
             ></q-input>
           </div>
         </div>
-        <!-- <div class="row">
-          <div class="col">
-            <div class="title">大床房</div>
-            <q-input
-              v-model="addMsg.BigRoomNum"
-              class="col q-mr-md"
-              mask="#"
-              reverse-fill-mask
-              dense
-              type="text"
-              standout
-               @keyup.native="checkInteger(addMsg, 'BigRoomNum')" @update:model-value="
-                  yzBigBed();
-                  getTotalPrice();
-                  autoRemarks('BigRoomNum', '大床房');
-                "></q-input
-            >
-          </div>
-          <div class="col">
-            <div class="title">三人房</div>
-            <q-input
-              v-model="addMsg.TripleRoomNum"
-              class="col q-mr-md"
-              mask="#"
-              reverse-fill-mask
-              dense
-              type="text"
-              standout
-               @keyup.native="checkInteger(addMsg, 'TripleRoomNum')" @update:model-value="
-                  yzBigBed1();
-                  getTotalPrice();
-                  autoRemarks('TripleRoomNum', '三人房');
-                "></q-input>
-          </div>
-        </div> -->
         <div class="row">
           <div class="col">
-            <div class="title">签证数量</div>
+            <div class="title">{{ $t('travel.VisaNum') }}</div>
             <q-input
               v-model="addMsg.VisaNum"
               class="col q-mr-md"
@@ -191,9 +156,9 @@
             >
           </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 class="title">{{ $t('travel.OneSex') }}</div>
+                <q-radio v-model="addMsg.OneSex" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" val="1" :label="$t('travel.male')" @update:model-value="changePeople"/>
+                <q-radio v-model="addMsg.OneSex" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" val="2" :label="$t('travel.woman')" @update:model-value="changePeople"/>
           </div>
           <!-- <div class="col">
             <div class="title">保险数量</div>
@@ -214,7 +179,7 @@
         </div>
         <div class="row">
           <div class="col">
-            <div class="title">预计用房</div>
+            <div class="title">{{ $t('travel.PredictRoomNum') }}</div>
             <q-input
               class="col q-mr-md"
               reverse-fill-mask
@@ -224,7 +189,7 @@
                v-model="addMsg.PredictRoomNum" :disable="true"></q-input>
           </div>
           <div class="col">
-            <div class="title">经济舱</div>
+            <div class="title">{{ $t('travel.YSeatNum') }}</div>
             <q-input
               v-model="addMsg.YSeatNum"
               class="col q-mr-md"
@@ -240,7 +205,7 @@
         </div>
         <div class="row">
           <div class="col">
-            <div class="title">头等舱</div>
+            <div class="title">{{ $t('travel.FSeatNum') }}</div>
             <q-input
               v-model="addMsg.FSeatNum"
               class="col q-mr-md"
@@ -254,7 +219,7 @@
             ></q-input>
           </div>
           <div class="col">
-            <div class="title">商务舱</div>
+            <div class="title">{{ $t('travel.ESeatNum') }}</div>
             <q-input
               v-model="addMsg.ESeatNum"
               class="col q-mr-md"
@@ -270,7 +235,7 @@
         </div>
         <div class="row">
           <div class="col">
-            <div class="title">联系人</div>
+            <div class="title">{{ $t('travel.ContactName') }}</div>
             <q-input
               v-model="addMsg.ContactName"
               class="col q-mr-md"
@@ -282,7 +247,7 @@
             ></q-input>
           </div>
           <div class="col">
-            <div class="title">联系人电话</div>
+            <div class="title">{{ $t('travel.ContactMobile') }}</div>
             <q-input
               v-model="addMsg.ContactMobile"
               class="col q-mr-md"
@@ -296,7 +261,7 @@
           </div>
         </div>
         <div>
-          <div class="title">备注</div>
+          <div class="title">{{ $t('travel.Remarks') }}</div>
           <q-input
             v-model="addMsg.Remarks"
             class="col q-mr-md"
@@ -308,12 +273,12 @@
           ></q-input>
         </div>
         <div class="row justify-between items-center">
-          <div class="title">订单价格</div>
+          <div class="title">{{ $t('travel.PreferPrice') }}</div>
           <div class=" text-subtitle2 text-weight-bolder text-primary">{{ addMsg.PreferPrice }}</div>
         </div>
         <div class="row justify-end">
-        <q-btn unelevated class="bg-grey-3 hover q-mr-md" @click="cancel">取消</q-btn>
-        <q-btn :loading="loading"  color="primary" unelevated class="q-ml-md" type="submit">确认</q-btn></div>
+        <q-btn unelevated class="bg-grey-3 hover q-mr-md" @click="cancel">{{ $t('travel.cancel') }}</q-btn>
+        <q-btn :loading="loading"  color="primary" unelevated class="q-ml-md" type="submit">{{ $t('travel.submit') }}</q-btn></div>
       </q-form>
     </div>
   </q-card>
@@ -805,7 +770,7 @@ export default defineComponent({
           .then((r) => {
             data.loading = false;
             if (r.data.resultCode == ApiResult.SUCCESS) {
-            message.successMsg('操作成功');
+            message.successMsg(r.data.message);
             context.emit('close')
             } else {
               message.errorMsg(r.data.message);

src/pages/travel/components/productHeader.vue

@@ -7,7 +7,7 @@
           @range-end="dateRangeHandler"></q-date>
       </q-popup-proxy>
     </q-field>
-    <q-input class="q-mr-md q-ml-md" v-model="search.TCID" dense standout label="团号"/>
+    <q-input class="q-mr-md q-ml-md" v-model="search.TCID" dense standout :label="$t('travel.id')"/>
     <div class="col"></div>
     <q-btn color="primary" unelevated :label="$t('query')"  @click="setQueryHandler"/>
   </div>

src/pages/travel/components/productList.vue

@@ -9,21 +9,21 @@
       <div class="col-2">
 
         <div class="mb-title">
-          <i class="iconfont icon-biaoti1"></i><span>包机信息</span>
+          <i class="iconfont icon-biaoti1"></i><span>{{$t('travel.planInfo')}}</span>
         </div>
         {{ x.GTeamName }}
         <div class="mb">
           <span>{{ x.Title }}</span>
         </div>
         <div>
-          出发日期：<span>{{ x.StartDate }}</span>
+          {{$t('travel.startDate')}}：<span>{{ x.StartDate }}</span>
         </div>
         <div>
-          团队信息：<span>{{ x.TCNUM }}({{ x.TCID }})</span>
+          {{$t('travel.groupInfo')}}：<span>{{ x.TCNUM }}({{ x.TCID }})</span>
         </div>
       </div>
       <div class="col-4">
-                <div class="mb-title"><i class="iconfont icon-hangban1"></i><span>航班信息</span></div>
+                <div class="mb-title"><i class="iconfont icon-hangban1"></i><span>{{$t('travel.airInfo')}}</span></div>
                     <div class="FlightDiv-TCL" @click="showDialogF(x)">
                         <div 
           v-for="(subItem, subIndex) in x.TravelTeamFlightList"
@@ -44,7 +44,7 @@
                               <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 v-else class="TCL-redType">{{$t('travel.tmp')}}】</span>
                           </span>
                         </div>
                     </div>
@@ -52,60 +52,60 @@
       <div class="col-2">
         <div>
           <div class="mb-title">
-            <i class="iconfont icon-jiage"></i><span>团位信息</span>
+            <i class="iconfont icon-jiage"></i><span>{{$t('travel.airSeatInfo')}}</span>
           </div>
-          <div class="mb bold"><span class="item-title">经济舱:</span><span>{{x.YSeat}} <span class="item-title q-ml-md">剩余:</span>{{x.SurplusYSeatNum}}</span></div>
-                  <div class="mb bold"><span class="item-title">商务舱:</span><span> {{x.CSeat}} <span class="item-title q-ml-md">剩余:</span>{{x.SurplusCSeatNum}}</span></div>
-                  <div class="mb bold"><span class="item-title">头等舱:</span><span> {{x.FSeat}} <span class="item-title q-ml-md">剩余:</span>{{x.SurplusFSeatNum}}</span></div>
+          <div class="mb bold"><span class="item-title">{{$t('travel.YSeat')}}:</span><span>{{x.YSeat}} <span class="item-title q-ml-md">{{$t('travel.unUseNum')}}:</span>{{x.SurplusYSeatNum}}</span></div>
+                  <div class="mb bold"><span class="item-title">{{$t('travel.CSeat')}}:</span><span> {{x.CSeat}} <span class="item-title q-ml-md">{{$t('travel.unUseNum')}}:</span>{{x.SurplusCSeatNum}}</span></div>
+                  <div class="mb bold"><span class="item-title">{{$t('travel.FSeat')}}:</span><span> {{x.FSeat}} <span class="item-title q-ml-md">{{$t('travel.unUseNum')}}:</span>{{x.SurplusFSeatNum}}</span></div>
                   
         </div>
       </div>
       <div class="col-3">
         <div class="mb-title">
-          <i class="iconfont icon-jiage"></i><span>价格信息</span>
+          <i class="iconfont icon-jiage"></i><span>{{$t('travel.priceInfo')}}</span>
         </div>
         <div class="mb bold">
-          <span class="item-title">中心价: </span>{{ x.B2BMemberPrice }}
+          <span class="item-title">{{$t('travel.midPrice')}}: </span>{{ x.B2BMemberPrice }}
         </div>
         <div class="mb bold">
           <span class="item-title"
-            >小孩占床: </span
+            >{{$t('travel.childNeedBed')}}: </span
           >{{ x.ChildNeedPrice }}
           <span class="item-title q-ml-md"
-            >不占床:</span
+            >{{$t('travel.NoNeedBed')}}:</span
           >
             {{ x.ChildNoNeedPrice }}
         </div>
         <div class="mb bold">
           <span class="item-title"
-            >婴儿:</span
+            >{{$t('travel.Baby')}}:</span
           > {{ x.BabyPrice }}
           <span class="item-title q-ml-md"
-            >儿童附加费: </span
+            >{{$t('travel.BabyChargePrice')}}: </span
           >{{ x.BabyChargePrice }}
         </div>
         <div class="mb bold">
           <span class="item-title"
-            >老人附加费:</span
+            >{{$t('travel.OldManChargePrice')}}:</span
           > {{ x.OldManChargePrice }}
           <span class="item-title q-ml-md"
-            >签证:
+            >{{$t('travel.VisaPrice')}}:
             </span
           >{{ x.VisaPrice }}
         </div>
         <div class="mb bold">
           <span class="item-title"
-            >单房差:</span
+            >{{$t('travel.SingleRoomPrice')}}:</span
           > {{ x.SingleRoomPrice }}
           <span class="item-title q-ml-md"
-            >杂费:
+            >{{$t('travel.OtherPrice')}}:
             </span
           >{{ x.OtherPrice }}
         </div>
       </div>
       <div class="col-1">
-        <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>
+        <q-btn color="primary" unelevated @click="ViewPayment(x)">{{$t('travel.buy')}}</q-btn>
+        <q-btn :class="$q.platform.is.desktop ? 'q-mt-md' : 'q-ml-md'" color="primary" unelevated @click="gotoUrl(x)">{{$t('travel.payOrder')}}</q-btn>
       </div>
                   <q-dialog width="900" v-model="showItem" trigger="click" >
                     <div class="TC_tripDetails" style="width: 900px;background-color: #fff;">

src/utils/menus.ts

@@ -117,44 +117,44 @@ const useMenus = {
             ]
         })
         menus.push({
-            name: t('menu.finance.first'),
+            name: t('menu.travel.first'),
             url: '',
-            id: 10,
+            id: 20,
             parentId: 0,
-            icon: 'Shopping/Money.svg',
+            icon: 'Shopping/Box1.svg',
             childs: [
                 {
-                    name: t('menu.finance.second'),
-                    url: '/comingsoon',
-                    id: 11,
-                    parentId: 10,
+                    name: t('menu.travel.second'),
+                    url: '/travel/order',
+                    id: 21,
+                    parentId: 20,
                 },
                 {
-                    name: t('menu.finance.three'),
-                    url: '/comingsoon',
-                    id: 12,
-                    parentId: 10,
+                    name: t('menu.travel.three'),
+                    url: '/travel/orderList',
+                    id: 22,
+                    parentId: 20,
                 }
             ]
         })
         menus.push({
-            name: t('menu.travel.first'),
+            name: t('menu.finance.first'),
             url: '',
-            id: 20,
+            id: 10,
             parentId: 0,
             icon: 'Shopping/Money.svg',
             childs: [
                 {
-                    name: t('menu.travel.second'),
-                    url: '/travel/order',
-                    id: 21,
-                    parentId: 20,
+                    name: t('menu.finance.second'),
+                    url: '/comingsoon',
+                    id: 11,
+                    parentId: 10,
                 },
                 {
-                    name: t('menu.travel.three'),
-                    url: '/travel/orderList',
-                    id: 22,
-                    parentId: 20,
+                    name: t('menu.finance.three'),
+                    url: '/comingsoon',
+                    id: 12,
+                    parentId: 10,
                 }
             ]
         })