chamomind/jws-frontend
chamomind/jws-frontend
6
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'ui-new' into develop

Browse source
This commit is contained in:
Methapon2001 2024-07-15 09:29:40 +07:00
commit 603d1d7fb5
2 changed files with 654 additions and 651 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/pages/03_customer-management/MainPage.vue
View file

@ -1973,6 +1973,7 @@ watch([inputSearch, currentStatus], async () => {
<q-btn
icon="mdi-dots-vertical"
:id="`btn-dots-${props.row.customerName}`"
size="sm"
dense
round

24
src/pages/04_product-service/MainPage.vue
View file

@ -1295,6 +1295,7 @@ watch(inputSearchProductAndService, async () => {
></q-fab-action>
</ButtonAddComponent>
<div class="full-height overflow-hidden">
<div class="text-body-2 q-mb-xs flex items-center">
{{ $t('dataSum') }}
<q-btn
@ -1326,8 +1327,8 @@ watch(inputSearchProductAndService, async () => {
<q-splitter
v-model="splitterModel"
:limits="[0, 100]"
style="width: 100%; height: 82%"
:limits="[20, 100]"
style="width: 100%; height: 100%"
after-class="overflow-hidden"
>
<template v-slot:before>
@ -1648,9 +1649,9 @@ watch(inputSearchProductAndService, async () => {
</div>
<template v-else>
<div class="col flex scroll full-height q-pa-md surface-1">
<div class="full-width">
<div class="surface-1 col flex q-pa-md scroll full-width">
<q-table
:style="`height: ${hideStat ? '60dvh' : '50vh'}`"
flat
bordered
:grid="modeView"
@ -2085,7 +2086,6 @@ watch(inputSearchProductAndService, async () => {
</template>
</q-table>
</div>
</div>
<div
v-if="productMode === 'group'"
@ -2151,7 +2151,7 @@ watch(inputSearchProductAndService, async () => {
<div
v-if="productMode === 'type'"
class="row justify-between items-center"
class="row justify-between items-center q-px-md q-py-sm"
>
<div class="col-4">
<div class="row items-center">
@ -2429,16 +2429,18 @@ watch(inputSearchProductAndService, async () => {
(productAndServiceTab === 'product' && product?.length === 0) ||
(productAndServiceTab === 'service' && service?.length === 0)
"
class="flex justify-center items-center surface-1 col"
class="flex justify-center items-center surface-1"
:style="`height: ${hideStat ? '60vh' : '49vh'}`"
>
{{ hideStat }}
<NoData :not-found="!!inputSearchProductAndService" />
</div>
<!-- tab -->
<template v-else>
<div class="col flex scroll full-height q-pa-md surface-1">
<div class="full-width">
<div class="flex scroll full-width q-pa-md surface-1">
<q-table
class="full-width"
:style="`height: ${hideStat ? '55vh' : '45vh'}`"
flat
bordered
:rows-per-page-options="[0]"
@ -2824,7 +2826,7 @@ watch(inputSearchProductAndService, async () => {
</template>
<template v-slot:item="{ row }">
<div class="col-12 col-md-4 col-lg-2">
<div class="col-12 col-md-6 col-lg-4">
<TotalProductCardComponent
:data="row"
:key="row.id"
@ -2879,7 +2881,6 @@ watch(inputSearchProductAndService, async () => {
</template>
</q-table>
</div>
</div>
</template>
<!-- footer -->
<div
@ -2948,6 +2949,7 @@ watch(inputSearchProductAndService, async () => {
</div>
</template>
</q-splitter>
</div>
<FormDialog
v-model:modal="dialogInputForm"