Commit 32ba1722 authored by 吴春's avatar 吴春

Merge branch 'master' of http://gitlab.oytour.com/luochao/bigwood

parents 79e077d2 6e9024e1
...@@ -91,7 +91,7 @@ class HotelService { ...@@ -91,7 +91,7 @@ class HotelService {
"pageSize":100, "pageSize":100,
"currentPage":1, "currentPage":1,
"total":0, "total":0,
"OpType":0 "OpType":1
} }
return request('hoteltip_get_GetPageList', params) return request('hoteltip_get_GetPageList', params)
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<template> <template>
<div class="fix-height-subpage column no-wrap q-pa-md"> <div class="fix-height-subpage column no-wrap q-pa-md">
<list-header></list-header> <list-header></list-header>
<div class="col q-mt-md" :class="{ 'light-shadow q-pa-md bg-white rounded-border': $q.platform.is.desktop }"> <div
class="col q-mt-md"
:class="{ 'light-shadow q-pa-md bg-white rounded-border': $q.platform.is.desktop }"
>
<list-table></list-table> <list-table></list-table>
</div> </div>
<hotel-tips></hotel-tips> <hotel-tips></hotel-tips>
...@@ -9,71 +12,71 @@ ...@@ -9,71 +12,71 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import useMetaModule from '../../module/meta/metaModule' import useMetaModule from "../../module/meta/metaModule";
import { useI18n } from 'vue-i18n' import { useI18n } from "vue-i18n";
import svgIcon from '../../components/global/svg-icon.vue' import svgIcon from "../../components/global/svg-icon.vue";
import { defineComponent, inject, provide, reactive, ref, toRefs } from 'vue' import { defineComponent, inject, provide, reactive, ref, toRefs } from "vue";
import { DirtionmaryHelper } from '../../config/dictionary' import { DirtionmaryHelper } from "../../config/dictionary";
import ListHeader from '../../components/hotel/list/ListHeader.vue' 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' import { getStoreGetter } from "../../store/utils";
export default defineComponent({ export default defineComponent({
components: { svgIcon, ListHeader, ListTable, HotelTips }, components: { svgIcon, ListHeader, ListTable, HotelTips },
setup() { setup() {
const data = reactive({}) const data = reactive({});
let { setTitle } = useMetaModule() let { setTitle } = useMetaModule();
const { locale, t } = useI18n() const { locale, t } = useI18n();
const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any;
pageTitle.value = t('hotel.pageTitle') pageTitle.value = t("hotel.pageTitle");
setTitle(pageTitle.value) setTitle(pageTitle.value);
const search = reactive({ const search = reactive({
HotelChooseArray: [], HotelChooseArray: [],
StartDate: '', StartDate: "",
EndDate: '', EndDate: "",
Country: '651', Country: "0",
Province: 0, Province: 0,
City: 0, City: 0,
OutBranchId: -1, OutBranchId: -1,
Star: 0, Star: 0,
PriceLevel: 0, PriceLevel: 0,
Supplier: 0, Supplier: 0,
MaxPrice: '', MaxPrice: "",
MinPrice: '', MinPrice: "",
HotelName: '' HotelName: "",
}) });
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') let userInfo = getStoreGetter<UserGetter>("user", "getUser");
if(userInfo.groupId==100){ if (userInfo && userInfo.groupId == 2) {
search.Country=0 search.Country = "651";
} }
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(
HotelCarList.value = cacheCarArray (x: any) => date.getDateDiff(new Date(x.Date), new Date(), "days") >= 20
);
HotelCarList.value = cacheCarArray;
} }
provide(DirtionmaryHelper.HOTEL_CAR_LIST, HotelCarList) provide(DirtionmaryHelper.HOTEL_CAR_LIST, HotelCarList);
const updateObj = ref<any>({}) const updateObj = ref<any>({});
provide(DirtionmaryHelper.HOTEL_UPDATEHOTEL_CAR, updateObj) provide(DirtionmaryHelper.HOTEL_UPDATEHOTEL_CAR, updateObj);
const orderstatus = ref(false) const orderstatus = ref(false);
provide(DirtionmaryHelper.HOTEL_CAR_ORDER_STATUS, orderstatus) provide(DirtionmaryHelper.HOTEL_CAR_ORDER_STATUS, orderstatus);
const HotelLengths = ref(0) const HotelLengths = ref(0);
provide(DirtionmaryHelper.HOTEL_CAR_ORDER_LENGTH, HotelLengths) provide(DirtionmaryHelper.HOTEL_CAR_ORDER_LENGTH, HotelLengths);
const menu = inject(DirtionmaryHelper.MENU_KEYS) as any const menu = inject(DirtionmaryHelper.MENU_KEYS) as any;
menu.value = 2 menu.value = 2;
const methods = {} const methods = {};
return { return {
...toRefs(data), ...toRefs(data),
...methods ...methods,
} };
} },
}) });
</script> </script>
<style> <style></style>
</style>
<template> <template>
<div class="fix-height-subpage column no-wrap q-pa-md"> <div class="fix-height-subpage column no-wrap q-pa-md">
<q-tabs <q-tabs
v-model="tab" v-model="tab"
dense dense
class="text-grey" class="text-grey"
active-color="primary" active-color="primary"
indicator-color="primary" indicator-color="primary"
align="left"> align="left"
<q-tab :name="0" :label="$t('v102.vehicle.tabtitle0')"></q-tab> >
<q-tab :name="1" :label="$t('v102.vehicle.tabtitle1')"></q-tab> <template v-if="b2bUserInfo && b2bUserInfo.groupId == 2">
<q-tab :name="2" :label="$t('v102.vehicle.tabtitle2')"></q-tab> <q-tab :name="0" :label="$t('v102.vehicle.tabtitle0')"></q-tab>
<q-tab :name="3" :label="$t('v102.vehicle.tabtitle3')"></q-tab> </template>
</q-tabs> <q-tab :name="1" :label="$t('v102.vehicle.tabtitle1')"></q-tab>
<teamOrder v-if="tab==0" :OrderId="OrderId"></teamOrder> <q-tab :name="2" :label="$t('v102.vehicle.tabtitle2')"></q-tab>
<CharteredBusOrder :type="tab" :OrderId="OrderId" v-if="tab!=0"></CharteredBusOrder> <q-tab :name="3" :label="$t('v102.vehicle.tabtitle3')"></q-tab>
</div> </q-tabs>
<teamOrder v-if="tab == 0" :OrderId="OrderId"></teamOrder>
<CharteredBusOrder :type="tab" :OrderId="OrderId" v-if="tab != 0"></CharteredBusOrder>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent, ref, reactive, toRefs, provide, onMounted, inject,watch } from 'vue' import {
import useMetaModule from '../../module/meta/metaModule' defineComponent,
import { useI18n } from 'vue-i18n' ref,
import teamOrder from './teamOrder.vue' reactive,
import CharteredBusOrder from '../CharteredBus//CharteredBusOrder.vue' toRefs,
import { DirtionmaryHelper } from '../../config/dictionary' provide,
import { currentRouter } from 'src/router' onMounted,
inject,
watch,
} from "vue";
import useMetaModule from "../../module/meta/metaModule";
import { useI18n } from "vue-i18n";
import teamOrder from "./teamOrder.vue";
import CharteredBusOrder from "../CharteredBus//CharteredBusOrder.vue";
import { DirtionmaryHelper } from "../../config/dictionary";
import { currentRouter } from "src/router";
import { getStoreGetter } from "../../store/utils";
export default defineComponent({ export default defineComponent({
components: { teamOrder,CharteredBusOrder }, components: { teamOrder, CharteredBusOrder },
setup() { setup() {
const { t } = useI18n() const { t } = useI18n();
let { setTitle } = useMetaModule() let { setTitle } = useMetaModule();
const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any;
pageTitle.value = t('v102.vehicle.pageTitle') pageTitle.value = t("v102.vehicle.pageTitle");
setTitle(pageTitle.value) const b2bUserInfo = getStoreGetter<UserGetter>("user", "getUser");
const data = reactive({ setTitle(pageTitle.value);
tab: 0, const data = reactive({
OrderId: null as any, tab: 0,
}) OrderId: null as any,
watch(()=>data.tab,(o,n)=>{ });
if (b2bUserInfo && b2bUserInfo.groupId == 2) {
}) data.tab = 0;
if(currentRouter.currentRoute){ } else {
if(currentRouter.currentRoute.value.params.OrderId){ data.tab = 1;
data.OrderId = currentRouter.currentRoute.value.params.OrderId }
} watch(
if(currentRouter.currentRoute.value.params.pages<4){ () => data.tab,
data.tab = Number(currentRouter.currentRoute.value.params.pages) (o, n) => {}
}else{ );
data.tab = 0 if (currentRouter.currentRoute) {
} if (currentRouter.currentRoute.value.params.OrderId) {
} data.OrderId = currentRouter.currentRoute.value.params.OrderId;
const menu = inject(DirtionmaryHelper.MENU_KEYS) as any }
menu.value = 6 if (currentRouter.currentRoute.value.params.pages < 4) {
const methods = { data.tab = Number(currentRouter.currentRoute.value.params.pages);
} else {
} data.tab = 0;
onMounted(() => { }
}
}) const menu = inject(DirtionmaryHelper.MENU_KEYS) as any;
return { ...toRefs(data), ...methods } menu.value = 6;
}, const methods = {};
}) onMounted(() => {});
return { ...toRefs(data), b2bUserInfo, ...methods };
},
});
</script> </script>
<style scoped> <style scoped>
.date-box :deep(.q-field__control) { .date-box :deep(.q-field__control) {
height: 20px; height: 20px;
} }
.add { .add {
margin-bottom: 20px; margin-bottom: 20px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
} }
.shou { .shou {
cursor: pointer; cursor: pointer;
} }
.driver { .driver {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
border-bottom: 1px solid; border-bottom: 1px solid;
margin-left: 50px; margin-left: 50px;
} }
.title { .title {
display: flex; display: flex;
justify-content: center; justify-content: center;
font-size: 22px; font-size: 22px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.flex { .flex {
display: flex; display: flex;
align-items: center; align-items: center;
} }
th { th {
padding: 10px 10px; padding: 10px 10px;
font-size: 14px; font-size: 14px;
} }
.table-title { .table-title {
font-size: 14px; font-size: 14px;
} }
.sticky-rightrowspan-column-table2 th:last-child, .sticky-rightrowspan-column-table2 th:last-child,
.sticky-rightrowspan-column-table2 tbody tr td { .sticky-rightrowspan-column-table2 tbody tr td {
position: sticky !important; position: sticky !important;
right: 0 !important; right: 0 !important;
z-index: 1 !important; z-index: 1 !important;
box-shadow: rgba(0, 0, 0, 0.05) -2px 0px 0px !important; box-shadow: rgba(0, 0, 0, 0.05) -2px 0px 0px !important;
} }
</style> </style>
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