no message

src/components/CharteredBus/list/ListHeader.vue

@@ -47,6 +47,7 @@
     </q-btn>
     <q-btn v-if="$q.platform.is.desktop" color="primary" unelevated :label="$t('query')" @click="setSearchHandler"/>
     <q-btn v-else color="primary" :round="$q.platform.is.mobile" :dense="$q.platform.is.mobile" :icon="$q.platform.is.mobile?'search':''" unelevated :label="$q.platform.is.mobile?'':$t('query')" @click="setSearchHandler"/>
+    <q-btn class="q-ml-sm" color="primary" unelevated :label="$t('v102.CharteredBus.td')" @click="goUrl"/>
   </div>
 </template>
 
@@ -61,10 +62,12 @@ import { CascaderOption, NCascader } from 'naive-ui'
 import { ApiResult } from 'src/@types/enumHelper'
 import message from 'src/utils/message'
 import { useHotel } from '../../../utils/hotelRate'
+import { useRouter } from 'vue-router'
 export default {
   components: { svgIcon, NCascader },
   setup(props) {
     const $q = useQuasar()
+    const $router = useRouter()
     const qDateProxy = ref(null) as any
     const data = reactive({
       CharteredBusType: useHotel.getCharteredBusType(),
@@ -80,6 +83,9 @@ export default {
     const search = inject(DirtionmaryHelper.TICKET_QUERY_PARAM) as any
     data.searchClone = JSON.parse(JSON.stringify(search.msg))
     const methods = {
+      goUrl(){
+        $router.push({ path:`/vehicle/addEditVehicle/2`})
+      },
       getCarType(e:any){
         if(e){
           methods.initAddress()

src/components/CharteredBus/list/ListTable.vue

@@ -27,7 +27,7 @@
     <div class="q-py-md" style="width: 70%;min-width: 1000px;">
       <div class="row q-pa-md q-mb-md bg-white rounded-borders">
         <div class="col"></div>
-        <q-btn class="hover q-mr-md" v-for="(item,index) in 2"
+        <q-btn dense unelevated class="hover q-px-sm q-mr-md" v-for="(item,index) in 2"
         :class="{'bg-blue text-white':pages.Q_OrderBy==index+1&&pages.Q_OrderBy!=0,'bg-grey-3':pages.Q_OrderBy!=index+1}" @click="getList(index+1)">
           {{index+1==1?$t('v102.CharteredBus.jiageshenxu'):$t('v102.CharteredBus.jiagejianxu')}}
         </q-btn>

src/components/scattered/list/ListTable.vue

@@ -75,7 +75,7 @@
     <template v-slot:top>
         <div class="row full-width">
           <div class="col"></div>
-          <q-btn class="hover q-mr-md" v-for="(item,index) in 2"
+          <q-btn dense unelevated class="hover q-px-sm q-mr-md" v-for="(item,index) in 2"
           :class="{'bg-blue text-white':pages.sort==index+1,'bg-grey-3':pages.sort!=index+1}" @click="pages.sort=index+1,initHotels()">
             {{index+1==1?$t('v101.scattered.anrenqi'):$t('v101.scattered.anjiage')}}
           </q-btn>

src/i18n/zh-TW/index.ts

@@ -889,6 +889,8 @@ export default {
 
     },
     vehicle: {
+      pageTitle: '用車訂單',
+      pageTitle2: '新增/編輯用車訂單',
       title: '客戶訂車確認單(小車)',
       title1: "訂車單位",
       title2: "訂車人",
@@ -904,6 +906,7 @@ export default {
       title12: "創建時間",
       title13: "車型選擇",
       title14: "接送機時間",
+      close: "取消",
       tatle: {
         th1: '日期',
         th2: '第幾天',
@@ -962,6 +965,7 @@ export default {
       }
     },
     CharteredBus:{
+      pageTitle: '車輛檢索',
       baochetype: '包車類型',
       baochetype0: '不限',
       baochetype1: '接機',
@@ -970,8 +974,8 @@ export default {
       jiansuojichang: '檢索機場',
       qishirenshu: '起始人數',
       jiezhirenshu: '截止人數',
-      jiageshenxu: '升序',
-      jiagejianxu: '降序',
+      jiageshenxu: '价格升序',
+      jiagejianxu: '价格降序',
       baoche: '包車',
       xiaoshi: '小時',
       mianfeiquxiao: '天前可免費取消',
@@ -1001,6 +1005,7 @@ export default {
       xunxi: '訊息',
       nt: '沒有選擇車型',
       rtt: '取消限製',
+      td: '团订',
       sjc:{
         c1: '姓名',
         c2: '電話',

src/pages/CharteredBus/CharteredBusList.vue

@@ -19,7 +19,7 @@ export default defineComponent({
     let { setTitle } = useMetaModule()
     const { t } = useI18n()
     const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any
-    pageTitle.value = t('v102.ticket.pageTitle')
+    pageTitle.value = t('v102.CharteredBus.pageTitle')
     setTitle(pageTitle.value)
 
     const data= reactive({
@@ -40,7 +40,7 @@ export default defineComponent({
     })
     provide(DirtionmaryHelper.TICKET_QUERY_PARAM, search)
     const menu=inject(DirtionmaryHelper.MENU_KEYS) as any
-    menu.value=8
+    menu.value=5
     const methods = {
     }
 

src/pages/vehicle/index.vue → src/pages/vehicle/vehicleOrder.vue

@@ -121,22 +121,29 @@
 </template>
 <script lang="ts">
 import { defineComponent, ref, reactive, toRefs, provide, onMounted, inject, watch, onBeforeUnmount, computed } from 'vue'
+import useMetaModule from '../../module/meta/metaModule'
 import { useI18n } from 'vue-i18n'
 import { useQuasar } from 'quasar'
 import { date } from 'quasar'
 import vehiclePopover from '../../components/vehicle/vehiclePopover.vue'
 import vehicleDetails from '../../components/vehicle/vehicleDetails.vue'//详情
-// import { DirtionmaryHelper } from '../../../config/dictionary',
+import { DirtionmaryHelper } from '../../config/dictionary'
 import useScrollModule from 'src/module/scrollbar/scrollModule'
 import HotelService from '../../api/vehicle'
 import message from 'src/utils/message'
 import { ApiResult } from 'src/@types/enumHelper'
+import { useRouter } from 'vue-router'
 export default defineComponent({
     components: { vehiclePopover, vehicleDetails },
     setup() {
         const qDateProxy = ref(null) as any
         const { t } = useI18n()
         const $q = useQuasar()
+        const $router = useRouter()
+        let { setTitle } = useMetaModule()
+        const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any
+        pageTitle.value = t('v102.vehicle.pageTitle')
+        setTitle(pageTitle.value)
         const data = reactive({
             showdetails: false,
             cancelshow: false,
@@ -282,7 +289,8 @@ export default defineComponent({
             },
             mask(val: any) {
                 data.Id = val
-                data.showPriceList = true
+                $router.push({ path:`/vehicle/addEditVehicle/1${data.Id?'/'+data.Id:''}`})
+                // data.showPriceList = true
             }
         }
         onMounted(() => {
@@ -293,7 +301,7 @@ export default defineComponent({
 })
 </script>
 <style scoped>
-.date-box /deep/.q-field__control {
+.date-box :deep(.q-field__control) {
     height: 20px;
 }
 

src/router/routes.ts

@@ -22,7 +22,8 @@ const routes: RouteRecordRaw[] = [
       { path: '/ticket/order', component: () => import('pages/ticket/TicketOrder.vue') },
       { path: '/vehicle/index', component: () => import('pages/CharteredBus/CharteredBusList.vue') },//车辆
       { path: '/vehicle/Preview/:ProductId/:Time', component: () => import('pages/CharteredBus/CharteredBusPreview.vue') },
-      { path: '/vehicle/order', component: () => import('pages/CharteredBus/CharteredBusOrder.vue') },
+      { path: '/vehicle/order', component: () => import('pages/vehicle/vehicleOrder.vue') },
+      { path: '/vehicle/addEditVehicle/:pages/:Id?', component: () => import('pages/vehicle/addEditVehicle.vue') },
       { path: '/ticket/preview/:ticketId/:Time', component: () => import('pages/ticket/TicketOrderPreview.vue') },
       { path: '/ticket/order/:orderId?', component: () => import('pages/ticket/TicketOrder.vue') }
     ]

src/utils/menus.ts

@@ -68,7 +68,7 @@ const useMenus = {
                 },
                 {
                     name: t('menu.car.three'),
-                    url: '/comingsoon',
+                    url: '/vehicle/order',
                     id: 6,
                     parentId: 4,
                 }