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