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

src/api/hotel.ts

@@ -91,7 +91,7 @@ class HotelService {
       "pageSize":100,
       "currentPage":1,
       "total":0,
-      "OpType":0
+      "OpType":1
     }
     return request('hoteltip_get_GetPageList', params)
   }

src/pages/hotel/HotelList.vue

 <template>
   <div class="fix-height-subpage column no-wrap q-pa-md">
     <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>
     </div>
     <hotel-tips></hotel-tips>
@@ -9,71 +12,71 @@
 </template>
 
 <script lang="ts">
-import useMetaModule from '../../module/meta/metaModule'
-import { useI18n } from 'vue-i18n'
-import svgIcon from '../../components/global/svg-icon.vue'
-import { defineComponent, inject, provide, reactive, ref, toRefs } from 'vue'
-import { DirtionmaryHelper } from '../../config/dictionary'
-import ListHeader from '../../components/hotel/list/ListHeader.vue'
-import ListTable from '../../components/hotel/list/ListTable.vue'
-import HotelTips from '../../components/hotel/list/HotelTips.vue'
-import { date } from 'quasar'
-import { getStoreGetter } from '../../store/utils'
+import useMetaModule from "../../module/meta/metaModule";
+import { useI18n } from "vue-i18n";
+import svgIcon from "../../components/global/svg-icon.vue";
+import { defineComponent, inject, provide, reactive, ref, toRefs } from "vue";
+import { DirtionmaryHelper } from "../../config/dictionary";
+import ListHeader from "../../components/hotel/list/ListHeader.vue";
+import ListTable from "../../components/hotel/list/ListTable.vue";
+import HotelTips from "../../components/hotel/list/HotelTips.vue";
+import { date } from "quasar";
+import { getStoreGetter } from "../../store/utils";
 export default defineComponent({
   components: { svgIcon, ListHeader, ListTable, HotelTips },
   setup() {
-    const data = reactive({})
-    let { setTitle } = useMetaModule()
-    const { locale, t } = useI18n()
-    const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any
-    pageTitle.value = t('hotel.pageTitle')
-    setTitle(pageTitle.value)
+    const data = reactive({});
+    let { setTitle } = useMetaModule();
+    const { locale, t } = useI18n();
+    const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any;
+    pageTitle.value = t("hotel.pageTitle");
+    setTitle(pageTitle.value);
     const search = reactive({
       HotelChooseArray: [],
-      StartDate: '',
-      EndDate: '',
-      Country: '651',
+      StartDate: "",
+      EndDate: "",
+      Country: "0",
       Province: 0,
       City: 0,
       OutBranchId: -1,
       Star: 0,
       PriceLevel: 0,
       Supplier: 0,
-      MaxPrice: '',
-      MinPrice: '',
-      HotelName: ''
-    })
+      MaxPrice: "",
+      MinPrice: "",
+      HotelName: "",
+    });
 
-    provide(DirtionmaryHelper.HOTEL_QUERY_PARAM, search)
-    const HotelCarList = ref<Array<any>>([])
-      let userInfo = getStoreGetter<UserGetter>('user', 'getUser')
-    if(userInfo.groupId==100){
-      search.Country=0
+    provide(DirtionmaryHelper.HOTEL_QUERY_PARAM, search);
+    const HotelCarList = ref<Array<any>>([]);
+    let userInfo = getStoreGetter<UserGetter>("user", "getUser");
+    if (userInfo && userInfo.groupId == 2) {
+      search.Country = "651";
     }
-    const cacheCars = localStorage.getItem(DirtionmaryHelper.HOTEL_HOTELCARS_CACHE)
+    const cacheCars = localStorage.getItem(DirtionmaryHelper.HOTEL_HOTELCARS_CACHE);
     if (cacheCars) {
-      let cacheCarArray = JSON.parse(cacheCars).filter((x: any) => date.getDateDiff(new Date(x.Date), new Date(), 'days') >= 20)
-      HotelCarList.value = cacheCarArray
+      let cacheCarArray = JSON.parse(cacheCars).filter(
+        (x: any) => date.getDateDiff(new Date(x.Date), new Date(), "days") >= 20
+      );
+      HotelCarList.value = cacheCarArray;
     }
-    provide(DirtionmaryHelper.HOTEL_CAR_LIST, HotelCarList)
-    const updateObj = ref<any>({})
-    provide(DirtionmaryHelper.HOTEL_UPDATEHOTEL_CAR, updateObj)
-    const orderstatus = ref(false)
-    provide(DirtionmaryHelper.HOTEL_CAR_ORDER_STATUS, orderstatus)
-    const HotelLengths = ref(0)
-    provide(DirtionmaryHelper.HOTEL_CAR_ORDER_LENGTH, HotelLengths)
+    provide(DirtionmaryHelper.HOTEL_CAR_LIST, HotelCarList);
+    const updateObj = ref<any>({});
+    provide(DirtionmaryHelper.HOTEL_UPDATEHOTEL_CAR, updateObj);
+    const orderstatus = ref(false);
+    provide(DirtionmaryHelper.HOTEL_CAR_ORDER_STATUS, orderstatus);
+    const HotelLengths = ref(0);
+    provide(DirtionmaryHelper.HOTEL_CAR_ORDER_LENGTH, HotelLengths);
 
-    const menu = inject(DirtionmaryHelper.MENU_KEYS) as any
-    menu.value = 2
-    const methods = {}
+    const menu = inject(DirtionmaryHelper.MENU_KEYS) as any;
+    menu.value = 2;
+    const methods = {};
     return {
       ...toRefs(data),
-      ...methods
-    }
-  }
-})
+      ...methods,
+    };
+  },
+});
 </script>
 
-<style>
-
-</style>
+<style></style>

src/pages/vehicle/vehicleOrder.vue

 <template>
-    <div class="fix-height-subpage column no-wrap q-pa-md">
-        <q-tabs
-            v-model="tab"
-            dense
-            class="text-grey"
-            active-color="primary"
-            indicator-color="primary"
-            align="left">
-            <q-tab :name="0" :label="$t('v102.vehicle.tabtitle0')"></q-tab>
-            <q-tab :name="1" :label="$t('v102.vehicle.tabtitle1')"></q-tab>
-            <q-tab :name="2" :label="$t('v102.vehicle.tabtitle2')"></q-tab>
-            <q-tab :name="3" :label="$t('v102.vehicle.tabtitle3')"></q-tab>
-      </q-tabs>
-      <teamOrder v-if="tab==0" :OrderId="OrderId"></teamOrder>
-      <CharteredBusOrder :type="tab" :OrderId="OrderId" v-if="tab!=0"></CharteredBusOrder>
-    </div>
+  <div class="fix-height-subpage column no-wrap q-pa-md">
+    <q-tabs
+      v-model="tab"
+      dense
+      class="text-grey"
+      active-color="primary"
+      indicator-color="primary"
+      align="left"
+    >
+      <template v-if="b2bUserInfo && b2bUserInfo.groupId == 2">
+        <q-tab :name="0" :label="$t('v102.vehicle.tabtitle0')"></q-tab>
+      </template>
+      <q-tab :name="1" :label="$t('v102.vehicle.tabtitle1')"></q-tab>
+      <q-tab :name="2" :label="$t('v102.vehicle.tabtitle2')"></q-tab>
+      <q-tab :name="3" :label="$t('v102.vehicle.tabtitle3')"></q-tab>
+    </q-tabs>
+    <teamOrder v-if="tab == 0" :OrderId="OrderId"></teamOrder>
+    <CharteredBusOrder :type="tab" :OrderId="OrderId" v-if="tab != 0"></CharteredBusOrder>
+  </div>
 </template>
 <script lang="ts">
-import { defineComponent, ref, reactive, toRefs, provide, 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 {
+  defineComponent,
+  ref,
+  reactive,
+  toRefs,
+  provide,
+  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({
-    components: { teamOrder,CharteredBusOrder },
-    setup() {
-        const { t } = useI18n()
-        let { setTitle } = useMetaModule()
-        const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any
-        pageTitle.value = t('v102.vehicle.pageTitle')
-        setTitle(pageTitle.value)
-        const data = reactive({
-            tab: 0,
-            OrderId: null as any,
-        })
-        watch(()=>data.tab,(o,n)=>{
-
-        })
-        if(currentRouter.currentRoute){
-            if(currentRouter.currentRoute.value.params.OrderId){
-                data.OrderId = currentRouter.currentRoute.value.params.OrderId
-            }
-            if(currentRouter.currentRoute.value.params.pages<4){
-                data.tab = Number(currentRouter.currentRoute.value.params.pages)
-            }else{
-                data.tab = 0
-            }
-        }
-        const menu = inject(DirtionmaryHelper.MENU_KEYS) as any
-        menu.value = 6
-        const methods = {
-           
-        }
-        onMounted(() => {
-            
-        })
-        return { ...toRefs(data), ...methods }
-    },
-})
+  components: { teamOrder, CharteredBusOrder },
+  setup() {
+    const { t } = useI18n();
+    let { setTitle } = useMetaModule();
+    const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any;
+    pageTitle.value = t("v102.vehicle.pageTitle");
+    const b2bUserInfo = getStoreGetter<UserGetter>("user", "getUser");
+    setTitle(pageTitle.value);
+    const data = reactive({
+      tab: 0,
+      OrderId: null as any,
+    });
+    if (b2bUserInfo && b2bUserInfo.groupId == 2) {
+      data.tab = 0;
+    } else {
+      data.tab = 1;
+    }
+    watch(
+      () => data.tab,
+      (o, n) => {}
+    );
+    if (currentRouter.currentRoute) {
+      if (currentRouter.currentRoute.value.params.OrderId) {
+        data.OrderId = currentRouter.currentRoute.value.params.OrderId;
+      }
+      if (currentRouter.currentRoute.value.params.pages < 4) {
+        data.tab = Number(currentRouter.currentRoute.value.params.pages);
+      } else {
+        data.tab = 0;
+      }
+    }
+    const menu = inject(DirtionmaryHelper.MENU_KEYS) as any;
+    menu.value = 6;
+    const methods = {};
+    onMounted(() => {});
+    return { ...toRefs(data), b2bUserInfo, ...methods };
+  },
+});
 </script>
 <style scoped>
 .date-box :deep(.q-field__control) {
-    height: 20px;
+  height: 20px;
 }
 
 .add {
-    margin-bottom: 20px;
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
+  margin-bottom: 20px;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
 }
 
 .shou {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .driver {
-    font-size: 14px;
-    font-weight: 400;
-    border-bottom: 1px solid;
-    margin-left: 50px;
+  font-size: 14px;
+  font-weight: 400;
+  border-bottom: 1px solid;
+  margin-left: 50px;
 }
 
 .title {
-    display: flex;
-    justify-content: center;
-    font-size: 22px;
-    margin-bottom: 10px;
+  display: flex;
+  justify-content: center;
+  font-size: 22px;
+  margin-bottom: 10px;
 }
 
 .flex {
-    display: flex;
-    align-items: center;
+  display: flex;
+  align-items: center;
 }
 
 th {
-    padding: 10px 10px;
-    font-size: 14px;
+  padding: 10px 10px;
+  font-size: 14px;
 }
 
 .table-title {
-    font-size: 14px;
+  font-size: 14px;
 }
 
 .sticky-rightrowspan-column-table2 th:last-child,
 .sticky-rightrowspan-column-table2 tbody tr td {
-    position: sticky !important;
-    right: 0 !important;
-    z-index: 1 !important;
-    box-shadow: rgba(0, 0, 0, 0.05) -2px 0px 0px !important;
+  position: sticky !important;
+  right: 0 !important;
+  z-index: 1 !important;
+  box-shadow: rgba(0, 0, 0, 0.05) -2px 0px 0px !important;
 }
 </style>