Skip to content

B
bigwood
Commit ce42cba9 authored by 罗超's avatar 罗超
Browse files
Options

优化包机

parent a54f50cf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 409 additions and 353 deletions
quasar.conf.js
View file @ ce42cba9
......@@ -64,7 +64,7 @@ module.exports = configure(function (ctx) {
publicPath: ctx.dev ? '/' : './',
env: ctx.dev
? {
BASE_APP_API: 'http://192.168.5.46/api/common/post',
BASE_APP_API: 'http://192.168.5.204:8030/api/common/post',
JAVA_URL_API: 'http://efficient.oytour.com',
VERSION:require('./package.json').version,
......
src/i18n/en-US/index.ts
View file @ ce42cba9
......@@ -357,13 +357,23 @@ export default {
three: 'Remittance instructions'
},
travel: {
first: 'charter flight',
second: 'Charter flight service',
three: 'Charter flight order',
four: 'Charter flight settlement',
first: 'PAK',
second: 'PAK group',
three: 'PAK order',
four: 'PAK settlement',
}
},
travel: {
start:'Departure',
download:'Download itinerary',
returnMoney:'Current return amount',
queryDetail:'View return details',
peopleRequired:'Number of people required',
totalSeat:'Total team',
ratio:'Return ratio',
current:'Current',
people:'person',
startCity:'Departure city',
man: 'Number of adults',
addTitle: 'Add/Modify Order',
oldPeople: 'Number of elderly people',
......
src/i18n/in-ID/index.ts
View file @ ce42cba9
......@@ -355,13 +355,23 @@ export default {
three: 'Instruksi pengiriman uang'
},
travel: {
first: 'piagam',
second: 'Layanan sewa',
three: 'Perintah piagam',
four: 'Penyelesaian penerbangan sewaan',
startCity:'Keluar',
first: 'PAK',
second: 'PAK grup tur',
three: 'PAK urutan',
four: 'PAK penyelesaian',
}
},
travel: {
download:'Unduh jadwal',
start:'Keluar',
returnMoney:'Jumlah pengembalian dana saat ini',
queryDetail:'Lihat detail pengembalian dana',
peopleRequired:'Jumlah orang yang dibutuhkan',
totalSeat:'Jumlah total tim',
ratio:'Rasio pengembalian dana',
current:'Saat ini',
people:'orang',
man: 'jumlah orang dewasa',
addTitle: 'ambah/ubah pesanan',
oldPeople: 'Jumlah orang tua',
......@@ -1185,7 +1195,7 @@ export default {
c15: 'Masukkan jumlah bagasi yang diperiksa',
}
},
},
//#endregion
//#region ending v1.0.3
......
src/i18n/ja-RB/index.ts
View file @ ce42cba9
......@@ -357,13 +357,23 @@ export default {
three: '送金の説明'
},
travel: {
first: 'チャーター機です',
second: 'チャーターサービスです',
three: 'チャーター機受注です',
four: 'チャーターチェックアウト',
first: 'PAK',
second: 'PAK 団',
three: 'PAK オーダー',
four: 'PAK 決済',
}
},
travel: {
start:'出発',
download:'行程をダウンロード',
returnMoney:'現在の返佣金額',
queryDetail:'返佣詳細を見る',
peopleRequired:'必要な人数',
totalSeat:'総団位',
ratio:'返佣比例',
current:'現在',
people:'人',
startCity:'出発地',
man: '大人の数',
addTitle: '注文の追加/変更',
oldPeople: '老人の数',
......@@ -1187,7 +1197,7 @@ export default {
c15: '手荷物数を入力します',
}
},
},
Airticket: {
Air_go:'往路',
......
src/i18n/ko-HG/index.ts
View file @ ce42cba9
......@@ -357,13 +357,23 @@ export default {
three: '송금 안내'
},
travel: {
first: '전세기',
second: '전세기 서비스',
three: '전세기 주문서',
four: '전세 체크아웃',
first: 'PAK',
second: 'PAK 서비스',
three: 'PAK 주문서',
four: 'PAK 체크아웃',
}
},
travel: {
start:'출발',
download:'여정 다운로드',
returnMoney:'현재 반환 금액',
queryDetail:'返佣 상세 보기',
peopleRequired:'필요한 사람 수',
totalSeat:'총 팀 수',
ratio:'반환 비율',
current:'현재',
people:'사람',
startCity:'출발 도시',
man: '성인 수',
addTitle: '주문 추가/수정',
oldPeople: '노인 수',
......
src/i18n/zh-SW/index.ts
View file @ ce42cba9
......@@ -357,13 +357,23 @@ export default {
three: '汇款说明'
},
travel: {
first: '包机',
second: '包机服务',
three: '包机订单',
four: '包机结算',
first: 'PAK团',
second: 'PAK团表',
three: 'PAK订单',
four: 'PAK結算',
}
},
travel: {
start:'出发',
download:'下载行程',
returnMoney:'当前返佣金額',
queryDetail:'查看返佣詳情',
peopleRequired:'需求人數',
totalSeat:'總團位',
ratio:'返佣比例',
current:'當前',
people:'人',
startCity:'出发城市',
man: '成人数量',
addTitle: '新增/修改订单',
oldPeople: '老人数量',
......
src/i18n/zh-TW/index.ts
View file @ ce42cba9
......@@ -357,13 +357,23 @@ export default {
three: '匯款說明'
},
travel: {
first: '包機',
second: '包機服務',
three: '包機訂單',
four: '包機結算',
first: 'PAK团',
second: 'PAK团表',
three: 'PAK订单',
four: 'PAK結算',
}
},
travel: {
start:'出發',
download:'下載行程',
returnMoney:'当前返佣金額',
queryDetail:'查看返佣詳情',
peopleRequired:'需求人數',
totalSeat:'總團位',
ratio:'返佣比例',
current:'當前',
people:'人',
startCity:'出發城市',
man: '成人數量',
addTitle: '新增/修改訂單',
oldPeople: '老人數量',
......@@ -403,7 +413,7 @@ export default {
createDate: '創建日期',
payStatus: '支付狀態',
id: '團號',
planInfo: '包機資訊',
planInfo: 'PAK 資訊',
groupInfo: '團隊資訊',
airInfo: '航班資訊',
tmp: '暫定',
......@@ -531,7 +541,7 @@ export default {
}
},
scattered: {
kefang: '客房',
chengren: '成人',
ertong: '兒童',
......@@ -1191,7 +1201,7 @@ export default {
c15: '輸入托运行李数',
}
},
},
//#endregion
//#region ending v1.0.3
......
src/pages/travel/components/productHeader.vue
View file @ ce42cba9
......@@ -8,6 +8,7 @@
</q-popup-proxy>
</q-field>
<q-input class="q-mr-md q-ml-md" v-model="search.TCID" dense standout :label="$t('travel.id')"/>
<q-input class="q-mr-md q-ml-md" v-model="search.StartAddress" dense standout :label="$t('travel.startCity')"/>
<div class="col"></div>
<q-btn color="primary" unelevated :label="$t('query')" @click="setQueryHandler"/>
</div>
......@@ -24,8 +25,8 @@ export default defineComponent({
const realSearch = inject(DirtionmaryHelper.TRAVEL_ORDER_OBJ) as any
const search = reactive(JSON.parse(JSON.stringify(realSearch)))
const dateRange = reactive({from: '', to: ''})
dateRange.to = date.formatDate(date.addToDate(new Date(), { days: 50 }), 'YYYY/MM/DD')
dateRange.from = date.formatDate(date.addToDate(new Date(), { days: 20 }), 'YYYY/MM/DD')
// dateRange.to = date.formatDate(date.addToDate(new Date(), { days: 50 }), 'YYYY/MM/DD')
// dateRange.from = date.formatDate(date.addToDate(new Date(), { days: 20 }), 'YYYY/MM/DD')
const dateRangeFormat = ref(`${dateRange.from} - ${dateRange.to}`)
search.SelectStartDate = dateRange.from
search.SelectEndDate = dateRange.to
......@@ -40,6 +41,7 @@ export default defineComponent({
realSearch.SelectStartDate=search.SelectStartDate
realSearch.SelectEndDate=search.SelectEndDate
realSearch.TCID=search.TCID
realSearch.StartAddress=search.StartAddress
},
dateRangeHandler(e: any) {
search.SelectStartDate = `${e.from.year}/${e.from.month}/${e.from.day}`
......
src/pages/travel/components/productList.vue
View file @ ce42cba9
This diff is collapsed.
src/pages/travel/order.vue
View file @ ce42cba9
......@@ -6,7 +6,7 @@
</div>
</div>
</template>
<script lang="ts">
import { inject, provide, reactive, toRefs, defineComponent,onMounted } from 'vue';
import travelService from '../../api/travel'
......@@ -15,6 +15,7 @@ import { ApiResult } from '../../@types/enumHelper'
import message from '../../utils/message'
import { useI18n } from 'vue-i18n'
import OrderListHeader from './components/productHeader.vue';
import OrderList from './components/productList.vue';
import { DirtionmaryHelper } from '../../config/dictionary';
import useMetaModule from '../../module/meta/metaModule'
......@@ -54,15 +55,16 @@ import useMetaModule from '../../module/meta/metaModule'
const search = reactive({
GTeamName:"", // 包机名称
FlightCompany:"", // 航空公司
FlightNo:"", // 航班号
SelectEndDate:"", // 出发开始时间
FlightNo:"", // 航班号
SelectEndDate:"", // 出发开始时间
SelectStartDate:"", // 出发结算时间
StartAddress:"" // 出发城市
})
const methods = {
}
provide(DirtionmaryHelper.TRAVEL_ORDER_OBJ,search)
onMounted(()=>{
})
return {
// ...toRefs(data),
......@@ -71,8 +73,7 @@ import useMetaModule from '../../module/meta/metaModule'
}
})
</script>
<style>
</style>
\ No newline at end of file
src/utils/menus.ts
View file @ ce42cba9
......@@ -11,117 +11,118 @@ const { t } = i18n.global
const useMenus = {
getMenus(): Menu[] {
let menus = [] as Menu[]
menus.push({
name: t('menu.hotel.first'),
url: '',
id: 1,
parentId: 0,
icon: 'Home/Building.svg',
childs: [
{
name: t('menu.hotel.second'),
url: '/hotel',
id: 2,
parentId: 1,
},
{
name: t('menu.hotel.three'),
url: '/hotel/order',
id: 3,
parentId: 1,
}
]
})
menus.push({
name: t('menu.scattered.first'),
url: '',
id: 13,
parentId: 0,
icon: 'scattered/The.svg',
childs: [
{
name: t('menu.scattered.second'),
url: '/scattered',
id: 14,
parentId: 13,
},
{
name: t('menu.scattered.didaName'),
url: '/didahotel',
id: 23,
parentId: 13,
},
{
name: t('menu.scattered.three'),
url: '/scattered/HotelOrder',
id: 15,
parentId: 13,
}
]
})
menus.push({
name: t('menu.car.first'),
url: '',
id: 4,
parentId: 0,
icon: 'Electric/Iron.svg',
childs: [
{
name: t('menu.car.second'),
url: '/vehicle/index',
id: 5,
parentId: 4,
},
{
name: t('menu.car.three'),
url: '/vehicle/order',
id: 6,
parentId: 4,
}
]
}),
menus.push({
name: t('menu.ticket.first'),
url: '',
id: 7,
parentId: 0,
icon: 'Shopping/Ticket.svg',
childs: [
{
name: t('menu.ticket.second'),
url: '/ticket/list',
id: 8,
parentId: 7,
},
{
name: t('menu.ticket.three'),
url: '/ticket/order',
id: 9,
parentId: 7,
}
]
})
menus.push({
name: t('menu.stroke.first'),
url: '',
id: 16,
parentId: 0,
icon: 'ScheduledTrip/stroke.svg',
childs: [
{
name: t('menu.stroke.second'),
url: '/scheduledTrip/index',
id: 17,
parentId: 16,
},
{
name: t('menu.stroke.three'),
url: '/scheduledTrip/order',
id: 18,
parentId: 16,
},
]
})
//menus.push(
// {
// name: t('menu.hotel.first'),
// url: '',
// id: 1,
// parentId: 0,
// icon: 'Home/Building.svg',
// childs: [
// {
// name: t('menu.hotel.second'),
// url: '/hotel',
// id: 2,
// parentId: 1,
// },
// {
// name: t('menu.hotel.three'),
// url: '/hotel/order',
// id: 3,
// parentId: 1,
// }
// ]
// })
// menus.push({
// name: t('menu.scattered.first'),
// url: '',
// id: 13,
// parentId: 0,
// icon: 'scattered/The.svg',
// childs: [
// {
// name: t('menu.scattered.second'),
// url: '/scattered',
// id: 14,
// parentId: 13,
// },
// {
// name: t('menu.scattered.didaName'),
// url: '/didahotel',
// id: 23,
// parentId: 13,
// },
// {
// name: t('menu.scattered.three'),
// url: '/scattered/HotelOrder',
// id: 15,
// parentId: 13,
// }
// ]
// })
// menus.push({
// name: t('menu.car.first'),
// url: '',
// id: 4,
// parentId: 0,
// icon: 'Electric/Iron.svg',
// childs: [
// {
// name: t('menu.car.second'),
// url: '/vehicle/index',
// id: 5,
// parentId: 4,
// },
// {
// name: t('menu.car.three'),
// url: '/vehicle/order',
// id: 6,
// parentId: 4,
// }
// ]
// }),
// menus.push({
// name: t('menu.ticket.first'),
// url: '',
// id: 7,
// parentId: 0,
// icon: 'Shopping/Ticket.svg',
// childs: [
// {
// name: t('menu.ticket.second'),
// url: '/ticket/list',
// id: 8,
// parentId: 7,
// },
// {
// name: t('menu.ticket.three'),
// url: '/ticket/order',
// id: 9,
// parentId: 7,
// }
// ]
// })
// menus.push({
// name: t('menu.stroke.first'),
// url: '',
// id: 16,
// parentId: 0,
// icon: 'ScheduledTrip/stroke.svg',
// childs: [
// {
// name: t('menu.stroke.second'),
// url: '/scheduledTrip/index',
// id: 17,
// parentId: 16,
// },
// {
// name: t('menu.stroke.three'),
// url: '/scheduledTrip/order',
// id: 18,
// parentId: 16,
// },
// ]
// })
menus.push({
name: t('menu.travel.first'),
url: '',
......@@ -143,27 +144,27 @@ const useMenus = {
}
]
})
menus.push({
name: t('menu.finance.first'),
url: '',
id: 10,
parentId: 0,
icon: 'Shopping/Money.svg',
childs: [
{
name: t('menu.finance.second'),
url: '/comingsoon',
id: 11,
parentId: 10,
},
{
name: t('menu.finance.three'),
url: '/comingsoon',
id: 12,
parentId: 10,
}
]
})
// menus.push({
// name: t('menu.finance.first'),
// url: '',
// id: 10,
// parentId: 0,
// icon: 'Shopping/Money.svg',
// childs: [
// {
// name: t('menu.finance.second'),
// url: '/comingsoon',
// id: 11,
// parentId: 10,
// },
// {
// name: t('menu.finance.three'),
// url: '/comingsoon',
// id: 12,
// parentId: 10,
// }
// ]
// })
return menus
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment