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

fix: 02,03 surface color

Browse source
This commit is contained in:
puriphatt 2024-07-16 02:11:18 +00:00
parent 7fc990ef62
commit 85d2035b00
2 changed files with 28 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/pages/02_personnel-management/MainPage.vue
View file

@ -266,31 +266,26 @@ async function openDialog(
agencyFileList.value = result; agencyFileList.value = result;
} }
} }
} if(userStore.userOption.hqOpts.length !== 0) { }
if (userStore.userOption.hqOpts.length !== 0) {
hqId.value = userStore.userOption.hqOpts[0].value; hqId.value = userStore.userOption.hqOpts[0].value;
} }
if(userStore.userOption.hqOpts.length === 0) { if (userStore.userOption.hqOpts.length === 0) {
console.log('no hq'); console.log('no hq');
dialog({ dialog({
color: 'warning', color: 'warning',
icon: 'mdi-alert', icon: 'mdi-alert',
title: t('warning'), title: t('warning'),
actionText: t('agree'), actionText: t('agree'),
persistent: true, persistent: true,
message: t('headquartersNotEstablished'), message: t('headquartersNotEstablished'),
action: async () => { action: async () => {},
});
},
});
return
return;
} }
if (action === 'FORM') { if (action === 'FORM') {
modal.value = true; modal.value = true;
} else if (action === 'INFO') { } else if (action === 'INFO') {
@ -710,12 +705,12 @@ watch(inputSearch, async () => await fetchUserList());
<!-- main --> <!-- main -->
<div <div
class="col surface-1 rounded justify-between column no-wrap bordered" class="col surface-2 rounded justify-between column no-wrap bordered"
style="overflow: hidden" style="overflow: hidden"
> >
<div class="column"> <div class="column">
<div <div
class="row surface-2 justify-between full-width items-center" class="row surface-3 justify-between full-width items-center"
style="z-index: 1" style="z-index: 1"
> >
<div class="row q-py-sm q-px-md justify-between full-width"> <div class="row q-py-sm q-px-md justify-between full-width">
@ -939,7 +934,7 @@ watch(inputSearch, async () => await fetchUserList());
</div> </div>
</div> </div>
<div class="col scroll column"> <div class="col scroll column q-pa-md">
<div v-if="userData && userData.total > 0 && !inputSearch"> <div v-if="userData && userData.total > 0 && !inputSearch">
<q-table <q-table
flat flat
@ -1114,8 +1109,8 @@ watch(inputSearch, async () => await fetchUserList());
openDialog('INFO', props.row.id); openDialog('INFO', props.row.id);
} }
" "
v-close-popup v-close-popup
clickable clickable
dense dense
class="row q-py-sm" class="row q-py-sm"
style="white-space: nowrap" style="white-space: nowrap"
@ -1133,8 +1128,8 @@ watch(inputSearch, async () => await fetchUserList());
<q-item <q-item
:id="`view-detail-btn-${props.row.name}-edit`" :id="`view-detail-btn-${props.row.name}-edit`"
v-close-popup v-close-popup
clickable clickable
dense dense
class="row q-py-sm" class="row q-py-sm"
style="white-space: nowrap" style="white-space: nowrap"
@ -1157,8 +1152,7 @@ watch(inputSearch, async () => await fetchUserList());
<q-item <q-item
:id="`view-detail-btn-${props.row.name}-delete`" :id="`view-detail-btn-${props.row.name}-delete`"
dense dense
v-close-popup v-close-popup
:clickable="props.row.status === 'CREATED'" :clickable="props.row.status === 'CREATED'"
class="row" class="row"
:class="{ :class="{
@ -1655,10 +1649,6 @@ watch(inputSearch, async () => await fetchUserList());
opacity: 0; opacity: 0;
} }
.status-active { .status-active {
--_branch-status-color: var(--green-6-hsl); --_branch-status-color: var(--green-6-hsl);
} }

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

@ -1610,13 +1610,13 @@ watch([inputSearch, currentStatus], async () => {
<!-- main --> <!-- main -->
<div <div
class="surface-1 bordered rounded col column" class="surface-2 bordered rounded col column"
style="overflow: hidden" style="overflow: hidden"
> >
<!-- tabs --> <!-- tabs -->
<div class="column"> <div class="column">
<div <div
class="row justify-between full-width items-center surface-2" class="row justify-between full-width items-center surface-3"
style="z-index: 1" style="z-index: 1"
> >
<div class="row q-py-sm q-px-md justify-between full-width"> <div class="row q-py-sm q-px-md justify-between full-width">
@ -1783,7 +1783,10 @@ watch([inputSearch, currentStatus], async () => {
class="col" class="col"
> >
<template v-slot:before> <template v-slot:before>
<div class="column q-pa-md" style="gap: var(--size-1)"> <div
class="column q-pa-md surface-1 full-height"
style="gap: var(--size-1)"
>
<template v-if="selectorLabel === 'EMPLOYER'"> <template v-if="selectorLabel === 'EMPLOYER'">
<q-item <q-item
v-close-popup v-close-popup
@ -1839,10 +1842,7 @@ watch([inputSearch, currentStatus], async () => {
v-if="listCustomer.length !== 0" v-if="listCustomer.length !== 0"
class="col q-pa-md scroll" class="col q-pa-md scroll"
> >
<div <div class="row full-width customer-row">
class="row full-width customer-row"
style="min-height: 250px"
>
<q-table <q-table
flat flat
bordered bordered