Skip to content

M
million
Commit fcd57ce0 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/million

parents 1d96d5c4 b2f4c179
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 28 deletions
src/components/search_sf/search_sf1.vue
View file @ fcd57ce0
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
<q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy"> <q-popup-proxy ref="qS1DateProxy">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qS1DateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy"> <q-popup-proxy ref="qS2DateProxy">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_end')" subtitle="選擇" v-model="searchEndDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_end')" subtitle="選擇" v-model="searchEndDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qS2DateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -202,9 +202,9 @@ ...@@ -202,9 +202,9 @@
<q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy"> <q-popup-proxy ref="qS3DateProxy">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qS3DateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -215,9 +215,9 @@ ...@@ -215,9 +215,9 @@
<q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy"> <q-popup-proxy ref="qS4DateProxy">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchEndDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchEndDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qS4DateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
......
src/components/search_sf/search_sf2.vue
View file @ fcd57ce0
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
<q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy"> <q-popup-proxy ref="qS1DateProxy">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qS1DateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy"> <q-popup-proxy ref="qS2DateProxy">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_end')" subtitle="選擇" v-model="searchEndDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_end')" subtitle="選擇" v-model="searchEndDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qS2DateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -202,9 +202,9 @@ ...@@ -202,9 +202,9 @@
<q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy"> <q-popup-proxy ref="qS3DateProxy">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qS3DateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -215,9 +215,9 @@ ...@@ -215,9 +215,9 @@
<q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy"> <q-popup-proxy ref="qS4DateProxy">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchEndDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchEndDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qS4DateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
......
src/components/search_sf/search_sf3.vue
View file @ fcd57ce0
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
<q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy"> <q-popup-proxy ref="qS1DateProxy">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qS1DateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy"> <q-popup-proxy ref="qS2DateProxy">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_end')" subtitle="選擇" v-model="searchEndDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_end')" subtitle="選擇" v-model="searchEndDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qS2DateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -202,9 +202,9 @@ ...@@ -202,9 +202,9 @@
<q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy"> <q-popup-proxy ref="qS3DateProxy">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qS3DateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -215,9 +215,9 @@ ...@@ -215,9 +215,9 @@
<q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy"> <q-popup-proxy ref="qS4DateProxy">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchEndDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchEndDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qS4DateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
......
src/pages/Search.vue
View file @ fcd57ce0
...@@ -542,6 +542,18 @@ ...@@ -542,6 +542,18 @@
font-size: 28px; font-size: 28px;
} }
} }
.SearchMain .q-field__control {
height: 46px;
}
.SearchMain .q-field__control{
min-height:46px!important;
}
.SearchMain .q-field__native{
min-height:46px;
}
.SearchMain .q-field__marginal{
height:46px;
}
</style> </style>
<template> <template>
...@@ -554,11 +566,11 @@ ...@@ -554,11 +566,11 @@
:label="$t('search')" @focus="searchFocusHandler" @blur="searchBlurHandler" @keyup="searchChangeHandler" /> :label="$t('search')" @focus="searchFocusHandler" @blur="searchBlurHandler" @keyup="searchChangeHandler" />
</div> </div>
<div class="col-2"> <div class="col-2">
<q-input filled v-model="startDate" mask="date"> <q-input filled v-model="qMsg.startDate" mask="date">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale"> <q-popup-proxy ref="qStartDateProxy" transition-show="scale" transition-hide="scale">
<q-date v-model="startDate" @input="() => $refs.qDateProxy.hide()" /> <q-date v-model="qMsg.startDate" @input="() => $refs.qStartDateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -582,7 +594,7 @@ ...@@ -582,7 +594,7 @@
<div class="col-2" style="margin-left:10px;"> <div class="col-2" style="margin-left:10px;">
<span style="margin-top:15px;display:inline-block;cursor:pointer;" @click="fullHeight = true">更多篩選條件</span> <span style="margin-top:15px;display:inline-block;cursor:pointer;" @click="fullHeight = true">更多篩選條件</span>
</div> </div>
<div v-show="showSplitPannel" id="sb" transition-show="fade" elevated transition-hide="scale" <div v-show="showSplitPannel" id="sb" style="z-index:999" transition-show="fade" elevated transition-hide="scale"
class="showbox row"> class="showbox row">
<div style="width:180px;"> <div style="width:180px;">
<q-scroll-area :thumb-style="thumbStyle" :bar-style="barStyle" style="height: 100%;"> <q-scroll-area :thumb-style="thumbStyle" :bar-style="barStyle" style="height: 100%;">
......
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