Commit eabba234 authored by 吴春's avatar 吴春

酒店/门票地区修改

parent a1993a9e
...@@ -17,6 +17,18 @@ class HotelService { ...@@ -17,6 +17,18 @@ class HotelService {
return request('dict_post_Destination_GetChildList', params) return request('dict_post_Destination_GetChildList', params)
} }
/**
* 查詢城市信息
* @param params
* @returns
*/
static async GetCityExtList(params: any): Promise<HttpResponse> {
return request('dict_get_Destination_GetCityExtList', params)
}
/** /**
* 上次旅客名單 * 上次旅客名單
* @param OrderId 訂單ID * @param OrderId 訂單ID
......
...@@ -87,6 +87,7 @@ import useScrollModule from '../../../module/scrollbar/scrollModule' ...@@ -87,6 +87,7 @@ import useScrollModule from '../../../module/scrollbar/scrollModule'
// import { dateDiffer } from '../../../utils/tools' // import { dateDiffer } from '../../../utils/tools'
import ListCar from "./ListCar.vue" import ListCar from "./ListCar.vue"
import { DirtionmaryHelper } from '../../../config/dictionary' import { DirtionmaryHelper } from '../../../config/dictionary'
import { getStoreGetter } from '../../../store/utils'
export default defineComponent({ export default defineComponent({
components: { svgIcon, ListCar, NCascader, NSelect }, components: { svgIcon, ListCar, NCascader, NSelect },
setup() { setup() {
...@@ -107,6 +108,10 @@ export default defineComponent({ ...@@ -107,6 +108,10 @@ export default defineComponent({
addressParams: { addressParams: {
Id: '651' Id: '651'
}, },
addressDestination: {
QCountry: 0,
CodeLevel:2,
},
provinces: [], provinces: [],
cascader: { cascader: {
addressValue: null addressValue: null
...@@ -121,7 +126,7 @@ export default defineComponent({ ...@@ -121,7 +126,7 @@ export default defineComponent({
}) })
data.scrollStyle = useScrollModule().scrollStyle data.scrollStyle = useScrollModule().scrollStyle
const search = inject(DirtionmaryHelper.HOTEL_QUERY_PARAM) as any const search = inject(DirtionmaryHelper.HOTEL_QUERY_PARAM) as any
data.userInfo = getStoreGetter<UserGetter>('user', 'getUser')
data.dateRange.to = date.formatDate(date.addToDate(new Date(), { days: 50 }), 'YYYY/MM/DD') data.dateRange.to = date.formatDate(date.addToDate(new Date(), { days: 50 }), 'YYYY/MM/DD')
data.dateRange.from = date.formatDate(date.addToDate(new Date(), { days: 20 }), 'YYYY/MM/DD') data.dateRange.from = date.formatDate(date.addToDate(new Date(), { days: 20 }), 'YYYY/MM/DD')
data.dateRangeFormat = `${data.dateRange.from} - ${data.dateRange.to}` data.dateRangeFormat = `${data.dateRange.from} - ${data.dateRange.to}`
...@@ -131,6 +136,23 @@ export default defineComponent({ ...@@ -131,6 +136,23 @@ export default defineComponent({
const methods = { const methods = {
initAddress() { initAddress() {
if(data.userInfo.groupId==100){
HotelService.GetCityExtList(data.addressDestination)
.then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) {
r.data.data.forEach((x: any) => {
x.isLeaf = false
x.depth = 1
})
data.provinces = r.data.data
} else {
message.errorMsg(r.data.message)
}
})
.catch(e => {
message.errorMsg(e.message)
})
}else{
HotelService.GetDestination(data.addressParams) HotelService.GetDestination(data.addressParams)
.then(r => { .then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
...@@ -146,6 +168,7 @@ export default defineComponent({ ...@@ -146,6 +168,7 @@ export default defineComponent({
.catch(e => { .catch(e => {
message.errorMsg(e.message) message.errorMsg(e.message)
}) })
}
}, },
initHotels() { initHotels() {
HotelService.GetHasStockHotelList() HotelService.GetHasStockHotelList()
......
...@@ -74,6 +74,7 @@ import HotelService from 'src/api/hotel' ...@@ -74,6 +74,7 @@ import HotelService from 'src/api/hotel'
import { CascaderOption, NCascader } from 'naive-ui' import { CascaderOption, NCascader } from 'naive-ui'
import { ApiResult } from 'src/@types/enumHelper' import { ApiResult } from 'src/@types/enumHelper'
import message from 'src/utils/message' import message from 'src/utils/message'
import { getStoreGetter } from '../../../store/utils'
export default { export default {
components: { svgIcon, NCascader }, components: { svgIcon, NCascader },
setup(props) { setup(props) {
...@@ -84,18 +85,25 @@ export default { ...@@ -84,18 +85,25 @@ export default {
addressParams: { addressParams: {
Id: '651' Id: '651'
}, },
addressDestination: {
QCountry: 0,
CodeLevel:2,
},
provinces: [], provinces: [],
cascader: { cascader: {
addressValue: null addressValue: null
} as any, } as any,
searchClone: {} as any, searchClone: {} as any,
canHide: false, canHide: false,
userInfo: {} as any,
}) })
data.userInfo = getStoreGetter<UserGetter>('user', 'getUser')
const search = inject(DirtionmaryHelper.TICKET_QUERY_PARAM) as any const search = inject(DirtionmaryHelper.TICKET_QUERY_PARAM) as any
data.searchClone = JSON.parse(JSON.stringify(search.msg)) data.searchClone = JSON.parse(JSON.stringify(search.msg))
const methods = { const methods = {
initAddress() { initAddress() {
HotelService.GetDestination(data.addressParams) if(data.userInfo.groupId==100){
HotelService.GetCityExtList(data.addressDestination)
.then(r => { .then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
r.data.data.forEach((x: any) => { r.data.data.forEach((x: any) => {
...@@ -110,6 +118,25 @@ export default { ...@@ -110,6 +118,25 @@ export default {
.catch(e => { .catch(e => {
message.errorMsg(e.message) message.errorMsg(e.message)
}) })
}else{
HotelService.GetDestination(data.addressParams)
.then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) {
r.data.data.forEach((x: any) => {
x.isLeaf = false
x.depth = 1
})
data.provinces = r.data.data
} else {
message.errorMsg(r.data.message)
}
})
.catch(e => {
message.errorMsg(e.message)
})
}
}, },
loadChilds(option: CascaderOption) { loadChilds(option: CascaderOption) {
return new Promise<void>(resolve => { return new Promise<void>(resolve => {
......
...@@ -18,6 +18,7 @@ import ListHeader from '../../components/hotel/list/ListHeader.vue' ...@@ -18,6 +18,7 @@ import ListHeader from '../../components/hotel/list/ListHeader.vue'
import ListTable from '../../components/hotel/list/ListTable.vue' import ListTable from '../../components/hotel/list/ListTable.vue'
import HotelTips from '../../components/hotel/list/HotelTips.vue' import HotelTips from '../../components/hotel/list/HotelTips.vue'
import { date } from 'quasar' import { date } from 'quasar'
import { getStoreGetter } from '../../store/utils'
export default defineComponent({ export default defineComponent({
components: { svgIcon, ListHeader, ListTable, HotelTips }, components: { svgIcon, ListHeader, ListTable, HotelTips },
setup() { setup() {
...@@ -45,7 +46,10 @@ export default defineComponent({ ...@@ -45,7 +46,10 @@ export default defineComponent({
provide(DirtionmaryHelper.HOTEL_QUERY_PARAM, search) provide(DirtionmaryHelper.HOTEL_QUERY_PARAM, search)
const HotelCarList = ref<Array<any>>([]) const HotelCarList = ref<Array<any>>([])
let userInfo = getStoreGetter<UserGetter>('user', 'getUser')
if(userInfo.groupId==100){
search.Country=0
}
const cacheCars = localStorage.getItem(DirtionmaryHelper.HOTEL_HOTELCARS_CACHE) const cacheCars = localStorage.getItem(DirtionmaryHelper.HOTEL_HOTELCARS_CACHE)
if (cacheCars) { if (cacheCars) {
let cacheCarArray = JSON.parse(cacheCars).filter((x: any) => date.getDateDiff(new Date(x.Date), new Date(), 'days') >= 20) let cacheCarArray = JSON.parse(cacheCars).filter((x: any) => date.getDateDiff(new Date(x.Date), new Date(), 'days') >= 20)
......
...@@ -13,6 +13,7 @@ import { useI18n } from 'vue-i18n' ...@@ -13,6 +13,7 @@ import { useI18n } from 'vue-i18n'
import { DirtionmaryHelper } from '../../config/dictionary'; import { DirtionmaryHelper } from '../../config/dictionary';
import ListHeader from 'src/components/ticket/list/ListHeader.vue'; import ListHeader from 'src/components/ticket/list/ListHeader.vue';
import ListTable from 'src/components/ticket/list/ListTable.vue'; import ListTable from 'src/components/ticket/list/ListTable.vue';
import { getStoreGetter } from '../../store/utils'
export default defineComponent({ export default defineComponent({
components: { ListHeader, ListTable }, components: { ListHeader, ListTable },
setup(props) { setup(props) {
...@@ -35,8 +36,12 @@ export default defineComponent({ ...@@ -35,8 +36,12 @@ export default defineComponent({
StartPrice: '', StartPrice: '',
EndPrice: '', EndPrice: '',
ViewType:1,//列表模式 ViewType:1,//列表模式
} },
}) })
let userInfo = getStoreGetter<UserGetter>('user', 'getUser')
if(userInfo.groupId==100){
search.msg.QCountry=0
}
provide(DirtionmaryHelper.TICKET_QUERY_PARAM, search) provide(DirtionmaryHelper.TICKET_QUERY_PARAM, search)
const menu=inject(DirtionmaryHelper.MENU_KEYS) as any const menu=inject(DirtionmaryHelper.MENU_KEYS) as any
menu.value=8 menu.value=8
......
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