-
+
Refresh
@@ -119,8 +119,8 @@ onMounted(async () => {
rounded
flat
dense
- size="xs"
- class="app-text-muted-2 q-ml-sm"
+ size="sm"
+ class="app-text-muted-2"
@click="async () => await deleteNoti()"
>
{{ $t('general.delete') }}
@@ -131,7 +131,7 @@ onMounted(async () => {
rounded
flat
dense
- size="xs"
+ size="sm"
class="app-text-muted-2 q-mx-sm"
@click="async () => await markAsRead()"
>
From 7a2be56ef4668357d8633fc93656ab7c992a91e3 Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Wed, 30 Apr 2025 11:13:45 +0700
Subject: [PATCH 111/331] refactor: improve checkbox and badge behavior based
on notification state
---
src/pages/00_notification/MainPage.vue | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/pages/00_notification/MainPage.vue b/src/pages/00_notification/MainPage.vue
index a2a37e65..bc4cee01 100644
--- a/src/pages/00_notification/MainPage.vue
+++ b/src/pages/00_notification/MainPage.vue
@@ -97,7 +97,8 @@ onMounted(async () => {
{{
tab.value === 'all'
From 0871a8b899706e3dc1a4ca145c35934674f7bf98 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Wed, 30 Apr 2025 12:02:05 +0700
Subject: [PATCH 112/331] feat: only allow current responsible user and group
---
src/pages/08_request-list/RequestListView.vue | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue
index fc6e69c2..ad7254fe 100644
--- a/src/pages/08_request-list/RequestListView.vue
+++ b/src/pages/08_request-list/RequestListView.vue
@@ -1005,7 +1005,21 @@ function toEmployee(employee: RequestData['employee']) {
:label="$t('dialog.action.close')"
/>
Date: Wed, 30 Apr 2025 12:04:18 +0700
Subject: [PATCH 113/331] feat: enable responsible user filtering and enhance
button states for improved UX
---
src/pages/08_request-list/MainPage.vue | 1 +
src/pages/08_request-list/RequestListAction .vue | 2 ++
2 files changed, 3 insertions(+)
diff --git a/src/pages/08_request-list/MainPage.vue b/src/pages/08_request-list/MainPage.vue
index 7f98b870..64b339dc 100644
--- a/src/pages/08_request-list/MainPage.vue
+++ b/src/pages/08_request-list/MainPage.vue
@@ -143,6 +143,7 @@ async function openRequestListDialog() {
page: 1,
pageSize: 999,
incomplete: true,
+ responsibleOnly: true,
});
if (ret) {
diff --git a/src/pages/08_request-list/RequestListAction .vue b/src/pages/08_request-list/RequestListAction .vue
index 7ec34ff4..09f62aa1 100644
--- a/src/pages/08_request-list/RequestListAction .vue
+++ b/src/pages/08_request-list/RequestListAction .vue
@@ -153,6 +153,7 @@ watch(
@click="prev"
/>
Date: Wed, 30 Apr 2025 15:11:12 +0700
Subject: [PATCH 114/331] refactor: remove unused workerList and reset
selectedWorker on branch change
---
src/pages/05_quotation/QuotationForm.vue | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/pages/05_quotation/QuotationForm.vue b/src/pages/05_quotation/QuotationForm.vue
index d7e332f7..fdc36d8b 100644
--- a/src/pages/05_quotation/QuotationForm.vue
+++ b/src/pages/05_quotation/QuotationForm.vue
@@ -198,7 +198,6 @@ const selectedWorkerItem = computed(() => {
})),
];
});
-const workerList = ref([]);
const firstCodePayment = ref('');
const selectedProductGroup = ref('');
const selectedInstallmentNo = ref([]);
@@ -1059,12 +1058,7 @@ watch(
() => quotationFormData.value.customerBranchId,
async (v) => {
if (!v) return;
-
- const retEmp = await customerStore.fetchBranchEmployee(v, {
- passport: true,
- });
-
- if (retEmp) workerList.value = retEmp.data.result;
+ selectedWorker.value = [];
},
);
@@ -2531,8 +2525,8 @@ function covertToNode() {
}
:deep(
- i.q-icon.mdi.mdi-chevron-down-circle.q-expansion-item__toggle-icon.q-expansion-item__toggle-icon--rotated
- ) {
+ i.q-icon.mdi.mdi-chevron-down-circle.q-expansion-item__toggle-icon.q-expansion-item__toggle-icon--rotated
+) {
color: var(--brand-1);
}
@@ -2549,9 +2543,9 @@ function covertToNode() {
}
:deep(
- .q-item.q-item-type.row.no-wrap.q-item--dense.q-item--clickable.q-link.cursor-pointer.q-focusable.q-hoverable.surface-1
- .q-focus-helper
- ) {
+ .q-item.q-item-type.row.no-wrap.q-item--dense.q-item--clickable.q-link.cursor-pointer.q-focusable.q-hoverable.surface-1
+ .q-focus-helper
+) {
visibility: hidden;
}
From 70e9755952d1f7a6f91ed6e602681bd040bc60d8 Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Wed, 30 Apr 2025 15:34:30 +0700
Subject: [PATCH 115/331] fix: ensure contactName and contactTel default to
empty string if undefined
---
src/pages/02_personnel-management/MainPage.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue
index b0aa4f02..d5a54507 100644
--- a/src/pages/02_personnel-management/MainPage.vue
+++ b/src/pages/02_personnel-management/MainPage.vue
@@ -600,8 +600,8 @@ async function assignFormData(idEdit: string) {
responsibleArea: foundUser.responsibleArea,
status: foundUser.status,
selectedImage: foundUser.selectedImage,
- contactName: foundUser.contactName,
- contactTel: foundUser.contactTel,
+ contactName: foundUser.contactName || '',
+ contactTel: foundUser.contactTel || '',
licenseExpireDate:
(foundUser.licenseExpireDate &&
new Date(foundUser.licenseExpireDate)) ||
From 4d023a7c7c5e5ed6b50277205ee6619d1413509a Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Wed, 30 Apr 2025 16:15:08 +0700
Subject: [PATCH 116/331] feat: add smooth scrolling on validation error for
forms
---
src/components/DialogForm.vue | 10 ++++++++++
src/components/DrawerInfo.vue | 10 ++++++++++
src/components/dialog/DialogFormContainer.vue | 10 ++++++++++
src/pages/02_personnel-management/MainPage.vue | 1 -
4 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/src/components/DialogForm.vue b/src/components/DialogForm.vue
index 84319bcf..fb29a4ca 100644
--- a/src/components/DialogForm.vue
+++ b/src/components/DialogForm.vue
@@ -42,6 +42,15 @@ defineProps<{
const modal = defineModel('modal', { default: false });
const currentTab = defineModel('currentTab');
+
+async function onValidationError(ref: any) {
+ const el = ref.$el as Element;
+ el.scrollIntoView({
+ behavior: 'smooth',
+ block: 'center',
+ inline: 'nearest',
+ });
+}
('currentTab');
@submit.prevent
@validation-success="submit"
class="column full-height"
+ @validation-error="onValidationError"
>
Date: Fri, 23 May 2025 11:40:22 +0700
Subject: [PATCH 125/331] fix: enhance validation rules for agency and employer
name fields
---
.../FormBasicInfoAgencies.vue | 16 +++++++++++++++-
.../components/employer/EmployerFormAbout.vue | 15 ++++++++++-----
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/components/07_agencies-management/FormBasicInfoAgencies.vue b/src/components/07_agencies-management/FormBasicInfoAgencies.vue
index 7f3f3c5d..1d80f5c3 100644
--- a/src/components/07_agencies-management/FormBasicInfoAgencies.vue
+++ b/src/components/07_agencies-management/FormBasicInfoAgencies.vue
@@ -68,7 +68,12 @@ type Options = { label: string; value: string };
class="col-md-4 col-12"
:label="$t('agencies.name')"
v-model="name"
- :rules="[(val: string) => !!val || $t('form.error.required')]"
+ :rules="[
+ (val) => !!val || $t('form.error.required'),
+ (val) =>
+ /^[A-Za-z0-9ก-๙\s&.,'-]+$/.test(val) ||
+ $t('form.error.branchNameField'),
+ ]"
/>
(typeof v === 'string' ? (registerNameEN = v.trim()) : '')
"
:rules="[
- (val: string) =>
- val === '' ||
- /^[0-9A-Za-z\s.,]+$/.test(val) ||
- $t('form.error.letterOnly'),
+ (val) => !!val || $t('form.error.required'),
+ (val) =>
+ /^[A-Za-z0-9\s&.,'-]+$/.test(val) ||
+ $t('form.error.branchNameENField'),
]"
/>
From 62ac7503a132ef9f27de0736a4d56d34f118fdae Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Fri, 23 May 2025 17:26:40 +0700
Subject: [PATCH 126/331] fix: update tab management and reset logic in
ProfileBanner and MainPage components
---
src/components/ProfileBanner.vue | 1 +
src/pages/03_customer-management/MainPage.vue | 19 ++++++++++++++-----
src/pages/03_customer-management/form.ts | 2 +-
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/components/ProfileBanner.vue b/src/components/ProfileBanner.vue
index 9c72041c..8e9dddc4 100644
--- a/src/components/ProfileBanner.vue
+++ b/src/components/ProfileBanner.vue
@@ -265,6 +265,7 @@ const smallBanner = ref(false);
class="app-text-muted full-width"
align="left"
v-if="typeof tabsList === 'object'"
+ @update:model-value="(v) => $emit('update:currentTab', v)"
>
Date: Mon, 30 Jun 2025 13:56:44 +0700
Subject: [PATCH 136/331] refactor: set formtype view
---
src/pages/01_branch-management/MainPage.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index a32e32f7..cc4cae06 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -791,6 +791,8 @@ async function onSubmit(submitSelectedItem?: boolean) {
);
if (!res) return;
+
+ formType.value = 'view';
formData.value.codeHeadOffice = formData.value.code = res.code;
imageUrl.value = `${baseUrl}/branch/${res.id}/image/${res.selectedImage}`;
From 57660d799184af24a3c95a08d9dc305758f6a8d8 Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Wed, 2 Jul 2025 14:07:52 +0700
Subject: [PATCH 137/331] fix: make treeFile prop optional in UploadFile
component
---
src/components/upload-file/UploadFile.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/upload-file/UploadFile.vue b/src/components/upload-file/UploadFile.vue
index 1e5bd73a..13d1584e 100644
--- a/src/components/upload-file/UploadFile.vue
+++ b/src/components/upload-file/UploadFile.vue
@@ -31,7 +31,7 @@ const currentIndexDropdownList = ref(0);
const props = withDefaults(
defineProps<{
- treeFile: { label: string; file: { label: string }[] }[];
+ treeFile?: { label: string; file: { label: string }[] }[];
readonly?: boolean;
dropdownList?: { label: string; value: string }[];
hideAction?: boolean;
From 8799799214df13a7b4e2b9361476b74e403dbd0b Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Wed, 2 Jul 2025 14:58:44 +0700
Subject: [PATCH 138/331] refactor: replace role-based access checks with
canAccess utility in menu components
---
src/layouts/DrawerComponent.vue | 71 +++++------------------------
src/pages/MainPage.vue | 25 ++--------
src/router/routes.ts | 65 +++++++++++++-------------
src/stores/utils/index.ts | 81 ++++++++++++++++++++++++++++++++-
4 files changed, 131 insertions(+), 111 deletions(-)
diff --git a/src/layouts/DrawerComponent.vue b/src/layouts/DrawerComponent.vue
index 6875f9e8..9c6572f6 100644
--- a/src/layouts/DrawerComponent.vue
+++ b/src/layouts/DrawerComponent.vue
@@ -7,7 +7,7 @@ import useMyBranch from 'stores/my-branch';
import { getUserId, getRole } from 'src/services/keycloak';
import { useQuasar } from 'quasar';
import { useI18n } from 'vue-i18n';
-import { isRoleInclude } from 'src/stores/utils';
+import { canAccess } from 'src/stores/utils';
type Menu = {
label: string;
@@ -71,82 +71,41 @@ function initMenu() {
{
label: 'branch',
route: '/branch-management',
- hidden: !isRoleInclude([
- 'system',
- 'head_of_admin',
- 'admin',
- 'branch_manager',
- 'head_of_accountant',
- ]),
+ hidden: !canAccess('branch'),
},
{
label: 'personnel',
route: '/personnel-management',
- hidden: !isRoleInclude([
- 'owner',
- 'system',
- 'head_of_admin',
- 'admin',
- 'branch_manager',
- ]),
+ hidden: !canAccess('personnel'),
},
{
label: 'workflow',
route: '/workflow',
- hidden: !isRoleInclude(['system', 'head_of_admin', 'admin']),
+ hidden: !canAccess('workflow'),
},
{
label: 'property',
route: '/property',
- hidden: !isRoleInclude(['system', 'head_of_admin', 'admin']),
+ hidden: !canAccess('workflow'),
},
{
label: 'productService',
route: '/product-service',
- hidden: !isRoleInclude([
- 'system',
- 'head_of_admin',
- 'admin',
- 'branch_manager',
- 'head_of_accountant',
- 'head_of_sale',
- 'sale',
- ]),
},
{
label: 'customer',
route: '/customer-management',
- hidden: !isRoleInclude([
- 'system',
- 'head_of_admin',
- 'admin',
- 'branch_manager',
- 'head_of_accountant',
- 'accountant',
- 'head_of_sale',
- 'sale',
- ]),
+ hidden: !canAccess('customer'),
},
{
label: 'agencies',
route: '/agencies-management',
- hidden: !isRoleInclude(['system', 'head_of_admin', 'admin']),
},
],
},
{
label: 'menu.sales',
icon: 'mdi-store-settings-outline',
- hidden: !isRoleInclude([
- 'system',
- 'head_of_admin',
- 'admin',
- 'branch_manager',
- 'head_of_accountant',
- 'accountant',
- 'head_of_sale',
- 'sale',
- ]),
children: [
{ label: 'quotation', route: '/quotation' },
{ label: 'invoice', route: '/invoice' },
@@ -169,16 +128,7 @@ function initMenu() {
label: 'menu.account',
icon: 'mdi-bank-outline',
disabled: false,
- hidden: !isRoleInclude([
- 'system',
- 'head_of_admin',
- 'admin',
- 'branch_manager',
- 'head_of_accountant',
- 'accountant',
- 'head_of_sale',
- 'sale',
- ]),
+ hidden: !canAccess('account'),
children: [
{ label: 'receipt', route: '/receipt' },
{ label: 'creditNote', route: '/credit-note' },
@@ -200,10 +150,13 @@ function initMenu() {
{
label: 'menu.overall',
icon: 'mdi-monitor-dashboard',
- hidden: !isRoleInclude(['system', 'head_of_admin', 'admin', 'executive']),
children: [
{ label: 'report', route: '/report' },
- { label: 'dashboard', route: '/dash-board' },
+ {
+ label: 'dashboard',
+ route: '/dash-board',
+ hidden: !canAccess('dashBoard'),
+ },
],
},
diff --git a/src/pages/MainPage.vue b/src/pages/MainPage.vue
index 24d2f8fb..de8d1f7d 100644
--- a/src/pages/MainPage.vue
+++ b/src/pages/MainPage.vue
@@ -2,17 +2,15 @@
import MenuItem from 'components/00_home/MenuItem.vue';
import { useNavigator } from 'src/stores/navigator';
import { onMounted, ref } from 'vue';
-import { getRole } from 'src/services/keycloak';
+import { canAccess } from 'src/stores/utils';
const navigatorStore = useNavigator();
const menu = ref['$props']['list']>([]);
-const role = ref();
onMounted(() => {
navigatorStore.current.title = '';
navigatorStore.current.path = [{ text: '' }];
- role.value = getRole();
menu.value = [
{
value: 'branch-management',
@@ -20,14 +18,7 @@ onMounted(() => {
color: 'green',
title: 'menu.branch',
caption: 'menu.branchCaption',
- hidden:
- role.value.includes('admin') ||
- role.value.includes('branch_admin') ||
- role.value.includes('head_of_admin') ||
- role.value.includes('system') ||
- role.value.includes('owner')
- ? false
- : true,
+ hidden: !canAccess('branch'),
},
{
value: 'personnel-management',
@@ -35,15 +26,7 @@ onMounted(() => {
color: 'cyan',
title: 'menu.user',
caption: 'menu.userCaption',
- hidden:
- role.value.includes('admin') ||
- role.value.includes('branch_admin') ||
- role.value.includes('head_of_admin') ||
- role.value.includes('system') ||
- role.value.includes('owner') ||
- role.value.includes('branch_manager')
- ? false
- : true,
+ hidden: !canAccess('personnel'),
},
{
value: 'customer-management',
@@ -52,6 +35,7 @@ onMounted(() => {
title: 'menu.customer',
caption: 'menu.customerCaption',
isax: true,
+ hidden: !canAccess('customer'),
},
{
value: 'product-service',
@@ -115,6 +99,7 @@ onMounted(() => {
title: 'menu.dashboard',
caption: 'menu.dashboardCaption',
isax: true,
+ hidden: !canAccess('dashBoard'),
},
];
});
diff --git a/src/router/routes.ts b/src/router/routes.ts
index c3ef0438..86a7fa2a 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -1,5 +1,5 @@
import { RouteRecordRaw } from 'vue-router';
-import { isRoleInclude } from 'stores/utils';
+import { isRoleInclude, canAccess } from 'stores/utils';
const routes: RouteRecordRaw[] = [
{
@@ -16,21 +16,8 @@ const routes: RouteRecordRaw[] = [
path: '/branch-management',
name: 'BranchManagement',
beforeEnter: (to, from, next) => {
- if (
- isRoleInclude([
- 'admin',
- 'branch_admin',
- 'head_of_admin',
- 'head_of_account',
- 'system',
- 'owner',
- 'branch_manager',
- ])
- ) {
- next();
- } else {
- next('/');
- }
+ if (canAccess('branch')) next();
+ else next('/');
},
component: () => import('pages/01_branch-management/MainPage.vue'),
},
@@ -38,36 +25,36 @@ const routes: RouteRecordRaw[] = [
path: '/personnel-management',
name: 'PersonnelManagement',
beforeEnter: (to, from, next) => {
- if (
- isRoleInclude([
- 'admin',
- 'branch_admin',
- 'head_of_admin',
- 'system',
- 'owner',
- 'branch_manager',
- ])
- ) {
- next();
- } else {
- next('/');
- }
+ if (canAccess('personnel')) next();
+ else next('/');
},
component: () => import('pages/02_personnel-management/MainPage.vue'),
},
{
path: '/customer-management',
name: 'CustomerManagement',
+ beforeEnter: (to, from, next) => {
+ if (canAccess('customer')) next();
+ else next('/');
+ },
component: () => import('pages/03_customer-management/MainPage.vue'),
},
{
path: '/customer-management/:customerId',
name: 'CustomerSpecificManagement',
+ beforeEnter: (to, from, next) => {
+ if (canAccess('customer')) next();
+ else next('/');
+ },
component: () => import('pages/03_customer-management/MainPage.vue'),
},
{
path: '/customer-management/:customerId/branch',
name: 'CustomerBranchManagement',
+ beforeEnter: (to, from, next) => {
+ if (canAccess('customer')) next();
+ else next('/');
+ },
component: () => import('pages/03_customer-management/MainPage.vue'),
},
{
@@ -78,11 +65,19 @@ const routes: RouteRecordRaw[] = [
{
path: '/workflow',
name: 'Workflow',
+ beforeEnter: (to, from, next) => {
+ if (canAccess('workflow')) next();
+ else next('/');
+ },
component: () => import('pages/04_flow-managment/MainPage.vue'),
},
{
path: '/property',
name: 'Property',
+ beforeEnter: (to, from, next) => {
+ if (canAccess('workflow')) next();
+ else next('/');
+ },
component: () => import('pages/04_property-managment/MainPage.vue'),
},
{
@@ -98,6 +93,10 @@ const routes: RouteRecordRaw[] = [
{
path: '/agencies-management',
name: 'agencies-management',
+ beforeEnter: (to, from, next) => {
+ if (canAccess('agencies')) next();
+ else next('/');
+ },
component: () => import('pages/07_agencies-management/MainPage.vue'),
},
{
@@ -138,6 +137,10 @@ const routes: RouteRecordRaw[] = [
{
path: '/dash-board',
name: 'dashBoard',
+ beforeEnter: (to, from, next) => {
+ if (canAccess('dashBoard')) next();
+ else next('/');
+ },
component: () => import('pages/15_dash-board/MainPage.vue'),
},
{
@@ -225,7 +228,7 @@ const routes: RouteRecordRaw[] = [
},
{
path: '/receipt/:id',
- name: 'receiptform',
+ name: 'receiptForm',
component: () => import('pages/13_receipt/MainPage.vue'),
},
{
diff --git a/src/stores/utils/index.ts b/src/stores/utils/index.ts
index 39beb6d6..4b63c72b 100644
--- a/src/stores/utils/index.ts
+++ b/src/stores/utils/index.ts
@@ -221,11 +221,90 @@ export function checkTabBeforeAdd(data: unknown[], except?: string[]) {
export function isRoleInclude(role2check: string[]): boolean {
const roles = getRole() ?? [];
- const isIncluded = role2check.some((r) => roles.includes(r));
+ const filterRole = roles.filter(
+ (role: string) =>
+ role !== 'offline_access' &&
+ role !== 'uma_authorization' &&
+ !role.startsWith('default-roles'),
+ );
+ const isIncluded = role2check.some((r) => filterRole.includes(r));
return isIncluded;
}
+export function canAccess(
+ menu: string,
+ action: 'edit' | 'view' = 'view',
+): boolean {
+ // uma_authorization = all roles
+ const allRoles = [
+ 'head_of_admin',
+ 'admin',
+ 'executive',
+ 'accountant',
+ 'branch_admin',
+ 'branch_manager',
+ 'branch_accountant',
+ 'head_of_sale',
+ 'sale',
+ 'data_entry',
+ 'document_checker',
+ 'messenger',
+ 'corporate_customer',
+ 'agency',
+ ];
+
+ const permissions = {
+ branch: {
+ edit: allRoles.slice(0, 7),
+ view: allRoles.slice(0, 7),
+ },
+ personnel: {
+ edit: allRoles.slice(0, 6).filter((r) => r !== 'accountant'),
+ view: allRoles.slice(0, 6).filter((r) => r !== 'accountant'),
+ },
+ product: {
+ edit: allRoles.slice(0, 7),
+ view: allRoles,
+ },
+ workflow: {
+ edit: allRoles.slice(0, 6),
+ view: allRoles.filter((r) => r !== 'branch_accountant'),
+ },
+ customer: {
+ edit: allRoles.slice(0, 6),
+ view: allRoles.slice(0, 8),
+ },
+ agencies: {
+ edit: allRoles.slice(0, 7),
+ view: allRoles,
+ },
+ related: {
+ // ใช้กับหลายเมนู
+ edit: allRoles.slice(0, 6),
+ view: allRoles,
+ },
+ account: {
+ edit: allRoles.slice(0, 6),
+ view: allRoles.slice(0, 7),
+ },
+ uploadSlip: {
+ edit: allRoles.slice(0, 6),
+ view: allRoles.filter((r) => r !== 'head_of_sale' && r !== 'sale'),
+ },
+ dashBoard: {
+ edit: allRoles.slice(0, 6).filter((r) => r !== 'admin'),
+ view: allRoles.filter((r) => r !== 'admin'),
+ },
+ };
+ const roles = getRole() ?? [];
+ if (roles.includes('system')) return true;
+
+ const allowedRoles = permissions[menu]?.[action] || [];
+
+ return allowedRoles.some((role: string) => roles.includes(role));
+}
+
export function resetScrollBar(elementId: string) {
const element = document.getElementById(elementId);
From 701b90d89a9a5c067b2c46f967aa7602d9b33651 Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Wed, 2 Jul 2025 15:53:20 +0700
Subject: [PATCH 139/331] refactor: enhance role-based access checks in
TreeComponent and MainPage components
---
src/components/TreeComponent.vue | 8 ++++++-
src/pages/01_branch-management/MainPage.vue | 24 +++++++++++++++++++--
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/components/TreeComponent.vue b/src/components/TreeComponent.vue
index ee5130ba..58dd3f5e 100644
--- a/src/components/TreeComponent.vue
+++ b/src/components/TreeComponent.vue
@@ -123,7 +123,13 @@ defineEmits<{
v-if="
node.isHeadOffice &&
typeTree === 'branch' &&
- isRoleInclude(['head_of_admin', 'admin', 'system'])
+ isRoleInclude([
+ 'system',
+ 'head_of_admin',
+ 'admin',
+ 'executive',
+ 'accountant',
+ ])
"
:id="`create-sub-branch-btn-${node.name}`"
@click.stop="$emit('create', node)"
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index cc4cae06..e056b6d4 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -10,7 +10,7 @@ import type { QTableProps, QTableSlots } from 'quasar';
import { resetScrollBar } from 'src/stores/utils';
import useBranchStore from 'stores/branch';
import useFlowStore from 'stores/flow';
-import { isRoleInclude } from 'stores/utils';
+import { isRoleInclude, canAccess } from 'stores/utils';
import {
BranchWithChildren,
BranchCreate,
@@ -1050,7 +1050,7 @@ watch(currentHq, () => {
{{ $t('branch.allBranch') }}
{
(),
{ readonly: false, isEdit: false },
);
@@ -207,7 +208,7 @@ function triggerPropertiesDialog(step: WorkFlowPayloadStep) {
style="position: absolute; z-index: 999; top: 0; right: 0"
>
Date: Thu, 3 Jul 2025 13:31:22 +0700
Subject: [PATCH 141/331] fix: disable toggle button when in readonly mode in
ProfileBanner component
---
src/components/ProfileBanner.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/ProfileBanner.vue b/src/components/ProfileBanner.vue
index 8e9dddc4..2d4b3975 100644
--- a/src/components/ProfileBanner.vue
+++ b/src/components/ProfileBanner.vue
@@ -229,6 +229,7 @@ const smallBanner = ref(false);
Date: Thu, 3 Jul 2025 13:32:21 +0700
Subject: [PATCH 142/331] refactor: implement role-based access control for
customer edit actions in BranchPage and MainPage components
---
.../03_customer-management/BranchPage.vue | 8 ++++----
src/pages/03_customer-management/MainPage.vue | 19 +++++++++++++++----
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/pages/03_customer-management/BranchPage.vue b/src/pages/03_customer-management/BranchPage.vue
index bf1b8fd7..a88d498b 100644
--- a/src/pages/03_customer-management/BranchPage.vue
+++ b/src/pages/03_customer-management/BranchPage.vue
@@ -9,7 +9,7 @@ import { baseUrl } from 'src/stores/utils';
import useCustomerStore from 'stores/customer';
import useFlowStore from 'stores/flow';
import useOptionStore from 'stores/options';
-import { dialog } from 'stores/utils';
+import { dialog, canAccess } from 'stores/utils';
import { Status } from 'stores/types';
import { Employee } from 'stores/employee/types';
@@ -285,7 +285,7 @@ watch(
-
+
@@ -3865,6 +3870,7 @@ const emptyCreateDialog = ref(false);
:on-create="customerFormState.dialogModal"
:default-url="customerFormState.defaultCustomerImageUrl"
:hidden-footer="!customerFormState.isImageEdit"
+ :change-disabled="!canAccess('customer', 'edit')"
@add-image="
async (v) => {
if (!v) return;
@@ -4115,6 +4121,7 @@ const emptyCreateDialog = ref(false);
>
Date: Thu, 3 Jul 2025 13:54:10 +0700
Subject: [PATCH 143/331] refactor: employee role check
---
.../03_customer-management/TableEmpoloyee.vue | 6 +-
src/components/shared/PersonCard.vue | 2 +
src/pages/03_customer-management/MainPage.vue | 73 +++++++++++++++----
3 files changed, 63 insertions(+), 18 deletions(-)
diff --git a/src/components/03_customer-management/TableEmpoloyee.vue b/src/components/03_customer-management/TableEmpoloyee.vue
index e5e49b51..139d2d54 100644
--- a/src/components/03_customer-management/TableEmpoloyee.vue
+++ b/src/components/03_customer-management/TableEmpoloyee.vue
@@ -22,6 +22,7 @@ const prop = withDefaults(
inTable?: boolean;
addButton?: boolean;
prefixId?: string;
+ hideAction?: boolean;
}>(),
{
gridView: false,
@@ -265,7 +266,7 @@ defineEmits<{
@click.stop="$emit('view', props.row)"
/>
-
+
@@ -41,6 +50,7 @@ const state = defineModel({ default: false });
}"
>
user.id === idEdit);
- console.log(foundUser);
if (foundUser) {
currentUser.value = foundUser;
From 2b78abcd3bd5dbb911212b453fcda504be61e7b9 Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Wed, 30 Apr 2025 16:58:40 +0700
Subject: [PATCH 117/331] fix: adjust layout classes for responsive design on
ViewPage
---
src/pages/00_manual/ViewPage.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/pages/00_manual/ViewPage.vue b/src/pages/00_manual/ViewPage.vue
index 05e08147..074a49cf 100644
--- a/src/pages/00_manual/ViewPage.vue
+++ b/src/pages/00_manual/ViewPage.vue
@@ -116,8 +116,8 @@ async function scrollTo(id: string) {
-
+
From bcd54813d148e814f03eefaa86cce94ac4028870 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Wed, 30 Apr 2025 17:03:07 +0700
Subject: [PATCH 118/331] fix: select multiple when remove
---
src/components/shared/select-muliple/SelectOffice.vue | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/components/shared/select-muliple/SelectOffice.vue b/src/components/shared/select-muliple/SelectOffice.vue
index 24437cd1..22a0a327 100644
--- a/src/components/shared/select-muliple/SelectOffice.vue
+++ b/src/components/shared/select-muliple/SelectOffice.vue
@@ -72,7 +72,11 @@ onMounted(async () => {
:option="selectOptions"
:hide-selected="false"
:fill-input="false"
- :rules="[(v: string) => !!v || $t('form.error.required')]"
+ :rules="[
+ (v: string) => {
+ return !!v?.length || $t('form.error.required');
+ },
+ ]"
@filter="filter"
>
From 1efa90816a304560ea6900976195dc9dcb729407 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Mon, 19 May 2025 16:00:21 +0700
Subject: [PATCH 119/331] fix: form not clear
---
src/pages/03_customer-management/form.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/pages/03_customer-management/form.ts b/src/pages/03_customer-management/form.ts
index 2d529a5c..6ce28a18 100644
--- a/src/pages/03_customer-management/form.ts
+++ b/src/pages/03_customer-management/form.ts
@@ -965,6 +965,7 @@ export const useEmployeeForm = defineStore('form-employee', () => {
resetEmployeeData = structuredClone(defaultFormData);
state.value.statusSavePersonal = false;
state.value.profileUrl = '';
+ state.value.currentBranchId = '';
} else {
resetEmployeeData.selectedImage =
currentFromDataEmployee.value.selectedImage;
From 0150f80ba2963c82bc07bd1409c389c1ca852f8b Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Tue, 20 May 2025 11:43:07 +0700
Subject: [PATCH 120/331] =?UTF-8?q?fix:=20update=20label=20from=20'?=
=?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=99=E0=B8=B3=E0=B8=AB=E0=B8=99=E0=B9=89?=
=?UTF-8?q?=E0=B8=B2'=20to=20'Prefix'=20in=20forms=20(english)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/02_personnel-management/FormPerson.vue | 2 +-
.../components/employer/EmployerFormAbout.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/02_personnel-management/FormPerson.vue b/src/components/02_personnel-management/FormPerson.vue
index 7335391d..6d8601a6 100644
--- a/src/components/02_personnel-management/FormPerson.vue
+++ b/src/components/02_personnel-management/FormPerson.vue
@@ -165,7 +165,7 @@ watch(
:id="`${prefixId}-select-prefix-name-en`"
:for="`${prefixId}-select-prefix-name-en`"
:rules="[(val: string) => !!val || $t('form.error.required')]"
- :label="$t('personnel.form.prefixName')"
+ label="Prefix"
class="col-md-1 col-6"
v-model="prefixName"
/>
diff --git a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
index eb131ea9..432228b1 100644
--- a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
+++ b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
@@ -393,7 +393,7 @@ watch(
:readonly="readonly"
:disable="!readonly"
class="col-md-2 col-6"
- label="Title"
+ label="Prefix"
:model-value="
readonly
? capitalize(prefixName || '') || '-'
From 80c8a0d8b4ee69505ee00bc49083602edea8d511 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Mon, 19 May 2025 16:00:21 +0700
Subject: [PATCH 121/331] fix: form not clear
---
src/pages/03_customer-management/form.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/pages/03_customer-management/form.ts b/src/pages/03_customer-management/form.ts
index 2d529a5c..6ce28a18 100644
--- a/src/pages/03_customer-management/form.ts
+++ b/src/pages/03_customer-management/form.ts
@@ -965,6 +965,7 @@ export const useEmployeeForm = defineStore('form-employee', () => {
resetEmployeeData = structuredClone(defaultFormData);
state.value.statusSavePersonal = false;
state.value.profileUrl = '';
+ state.value.currentBranchId = '';
} else {
resetEmployeeData.selectedImage =
currentFromDataEmployee.value.selectedImage;
From 0f252b308017e6884acde064cd4801d0439b0d68 Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Tue, 20 May 2025 11:43:07 +0700
Subject: [PATCH 122/331] =?UTF-8?q?fix:=20update=20label=20from=20'?=
=?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=99=E0=B8=B3=E0=B8=AB=E0=B8=99=E0=B9=89?=
=?UTF-8?q?=E0=B8=B2'=20to=20'Prefix'=20in=20forms=20(english)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/02_personnel-management/FormPerson.vue | 2 +-
.../components/employer/EmployerFormAbout.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/02_personnel-management/FormPerson.vue b/src/components/02_personnel-management/FormPerson.vue
index 7335391d..6d8601a6 100644
--- a/src/components/02_personnel-management/FormPerson.vue
+++ b/src/components/02_personnel-management/FormPerson.vue
@@ -165,7 +165,7 @@ watch(
:id="`${prefixId}-select-prefix-name-en`"
:for="`${prefixId}-select-prefix-name-en`"
:rules="[(val: string) => !!val || $t('form.error.required')]"
- :label="$t('personnel.form.prefixName')"
+ label="Prefix"
class="col-md-1 col-6"
v-model="prefixName"
/>
diff --git a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
index eb131ea9..432228b1 100644
--- a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
+++ b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
@@ -393,7 +393,7 @@ watch(
:readonly="readonly"
:disable="!readonly"
class="col-md-2 col-6"
- label="Title"
+ label="Prefix"
:model-value="
readonly
? capitalize(prefixName || '') || '-'
From cd86e7718a066f125b3741b984ede27701a99361 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Thu, 22 May 2025 11:52:24 +0700
Subject: [PATCH 123/331] fix: id
---
src/pages/04_flow-managment/MainPage.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/04_flow-managment/MainPage.vue b/src/pages/04_flow-managment/MainPage.vue
index f8d45b37..cf17d51a 100644
--- a/src/pages/04_flow-managment/MainPage.vue
+++ b/src/pages/04_flow-managment/MainPage.vue
@@ -763,7 +763,7 @@ watch(
"
/>
import { nextTick, onMounted, ref, watch } from 'vue';
import { DeleteButton, EditButton, SaveButton, UndoButton } from '../button';
-import { scrollToElement } from 'stores/utils';
// import { useI18n } from 'vue-i18n';
// import { storeToRefs } from 'pinia';
@@ -138,11 +137,8 @@ watch(
@click="
() => {
assignClone();
- if (nameList[nameList.length - 1].name === '') {
- $emit('delete', cloneList[cloneList.length - 1].id, true);
- cloneList = cloneList.filter((item) => item.name !== '');
- nameList = nameList.filter((item) => item.name !== '');
- }
+ cloneList = cloneList.filter((item) => item.name !== '');
+ nameList = nameList.filter((item) => item.name !== '');
}
"
/>
diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue
index 88d6746c..47570c55 100644
--- a/src/pages/04_product-service/MainPage.vue
+++ b/src/pages/04_product-service/MainPage.vue
@@ -60,6 +60,7 @@ import {
ServiceById,
WorkItems,
Attributes,
+ WorkCreate,
} from 'stores/product-service/types';
import { computed } from 'vue';
import {
@@ -1448,17 +1449,11 @@ function confirmDeleteWork(id: string, noDialog?: boolean) {
}
}
-function triggerConfirmCloseWork() {
+function triggerConfirmCloseWorkName() {
dialogWarningClose(t, {
message: t('dialog.message.warningClose'),
action: () => {
manageWorkNameDialog.value = false;
- if (workNameItems.value[workNameItems.value.length - 1].name === '') {
- confirmDeleteWork(
- workNameItems.value[workNameItems.value.length - 1].id,
- true,
- );
- }
},
cancel: () => {},
});
@@ -1888,6 +1883,20 @@ async function copy(id: string) {
dialogService.value = true;
}
+function addWorkName(data: { name: string; order: number }) {
+ workNameItems.value.push({ id: '', name: data.name, isEdit: true });
+}
+
+async function submitWorkName(
+ workId: string,
+ data: Partial,
+) {
+ if (workNameItems.value.length === 0) return;
+
+ if (!workId) await createWork({ ...data, order: 1 });
+ else await editWork(workId, data);
+}
+
watch(
() => formService.value.attributes.workflowId,
async (a, b) => {
@@ -4669,7 +4678,7 @@ watch(
? workNameRef.isWorkNameEdit()
: false;
if (isWorkNameEdit) {
- triggerConfirmCloseWork();
+ triggerConfirmCloseWorkName();
return true;
}
return false;
@@ -4681,8 +4690,8 @@ watch(
ref="workNameRef"
v-model:name-list="workNameItems"
@delete="confirmDeleteWork"
- @edit="editWork"
- @add="createWork"
+ @edit="submitWorkName"
+ @add="addWorkName"
/>
diff --git a/src/stores/product-service/index.ts b/src/stores/product-service/index.ts
index 0405bf16..80e32627 100644
--- a/src/stores/product-service/index.ts
+++ b/src/stores/product-service/index.ts
@@ -441,7 +441,7 @@ const useProductServiceStore = defineStore('api-product-service', () => {
...payload,
});
- if (res && res.status < 200) {
+ if (res && res.status < 400) {
await fetchListOfWork();
return res.data;
}
From 0916ce7af2d9296971ff9b7c818d80d0939c480c Mon Sep 17 00:00:00 2001
From: puriphatt
@@ -5477,7 +5487,6 @@ const emptyCreateDialog = ref(false);
"
type="submit"
/>
-
Date: Wed, 11 Jun 2025 10:00:08 +0700
Subject: [PATCH 129/331] fix: can't change branch
---
src/pages/03_customer-management/form.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/03_customer-management/form.ts b/src/pages/03_customer-management/form.ts
index 150c8a8c..a6592304 100644
--- a/src/pages/03_customer-management/form.ts
+++ b/src/pages/03_customer-management/form.ts
@@ -1294,7 +1294,7 @@ export const useEmployeeForm = defineStore('form-employee', () => {
state.value.currentEmployee?.status === 'CREATED'
? 'ACTIVE'
: state.value.currentEmployee?.status,
- customerBranchId: state.value.formDataEmployeeOwner?.id || '',
+ customerBranchId: state.value.currentBranchId || '',
employeeWork: [],
employeeCheckup: [],
employeeOtherInfo: undefined,
From 1b475933da653290d46318e20a99d07f498b91e3 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Fri, 13 Jun 2025 15:08:03 +0700
Subject: [PATCH 130/331] fix: incorrect condition
---
src/pages/08_request-list/RequestListView.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue
index ad7254fe..d82829a7 100644
--- a/src/pages/08_request-list/RequestListView.vue
+++ b/src/pages/08_request-list/RequestListView.vue
@@ -822,14 +822,14 @@ function toEmployee(employee: RequestData['employee']) {
:readonly="
data.requestDataStatus === RequestDataStatus.Canceled ||
(responsibleList &&
+ (!!responsibleList[pageState.currentStep]?.user?.length ||
+ !!responsibleList[pageState.currentStep]?.group?.length) &&
!responsibleList[pageState.currentStep]?.user.find(
(v) => v.id === getUserId(),
) &&
!responsibleList[pageState.currentStep]?.group.some((v) =>
currentUserGroup.includes(v),
- )) ||
- (!!responsibleList[pageState.currentStep]?.user?.length &&
- !!responsibleList[pageState.currentStep]?.user?.length)
+ ))
"
:order-able="value._messengerExpansion"
:installment-info="getInstallmentInfo()"
From 5c01882a34fa6419310ffa2f79b418556c2dad9f Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Fri, 13 Jun 2025 16:06:19 +0700
Subject: [PATCH 131/331] fix: validation not reset
---
src/pages/08_request-list/MessengerExpansion.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/pages/08_request-list/MessengerExpansion.vue b/src/pages/08_request-list/MessengerExpansion.vue
index 4b7958cb..30e81598 100644
--- a/src/pages/08_request-list/MessengerExpansion.vue
+++ b/src/pages/08_request-list/MessengerExpansion.vue
@@ -57,6 +57,7 @@ const formData = ref(defaultForm);
function triggerUndo() {
assignToForm();
state.isEdit = false;
+ refForm.value?.resetValidation();
}
async function triggerSubmit() {
From 19ee1040d49bf4a49af03dcdb611cc69989772b8 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Fri, 13 Jun 2025 16:29:13 +0700
Subject: [PATCH 132/331] fix: validation error when mount
---
src/components/shared/select/SelectUser.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/components/shared/select/SelectUser.vue b/src/components/shared/select/SelectUser.vue
index 64e661f9..b931d07e 100644
--- a/src/components/shared/select/SelectUser.vue
+++ b/src/components/shared/select/SelectUser.vue
@@ -92,7 +92,9 @@ function setDefaultValue() {
:hide-selected="false"
:fill-input="false"
:rules="
- required ? [(v: string) => !!v || $t('form.error.required')] : undefined
+ required && !readonly
+ ? [(v: string) => !!v || $t('form.error.required')]
+ : undefined
"
@filter="filter"
>
From 41d02273ee3aacd86694eb32546b8df98dea9bf8 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Tue, 17 Jun 2025 11:55:00 +0700
Subject: [PATCH 133/331] fix: responsible only edit only
---
src/pages/08_request-list/RequestListView.vue | 53 +++++++++----------
1 file changed, 25 insertions(+), 28 deletions(-)
diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue
index d82829a7..982f3203 100644
--- a/src/pages/08_request-list/RequestListView.vue
+++ b/src/pages/08_request-list/RequestListView.vue
@@ -812,25 +812,32 @@ function toEmployee(employee: RequestData['employee']) {
-
+
Date: Fri, 27 Jun 2025 14:24:10 +0700
Subject: [PATCH 135/331] fix: btn save hide
---
src/components/GlobalDialog.vue | 1 +
src/pages/01_branch-management/MainPage.vue | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/components/GlobalDialog.vue b/src/components/GlobalDialog.vue
index 059f7755..f9df77d4 100644
--- a/src/components/GlobalDialog.vue
+++ b/src/components/GlobalDialog.vue
@@ -46,6 +46,7 @@ defineProps<{
color="grey"
icon="mdi-close"
v-close-popup
+ @click="cancel"
/>
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index 83ddc3c6..a32e32f7 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -865,7 +865,9 @@ async function onSubmit(submitSelectedItem?: boolean) {
actionText: t('dialog.action.ok'),
persistent: true,
title: t('form.warning.title'),
- cancel: () => {},
+ cancel: () => {
+ formType.value = 'create';
+ },
action: async () => {
await createBranch();
},
From 9ab61d8ded530dd7f07d2b109531724d422a66a8 Mon Sep 17 00:00:00 2001
From: Thanaphon Frappet
@@ -5589,7 +5626,7 @@ const emptyCreateDialog = ref(false);
/>
{{ $t('customerEmployee.form.group.visa') }}
@@ -5771,7 +5809,7 @@ const emptyCreateDialog = ref(false);
{{ $t(`customerEmployee.formHealthCheck.title`) }}
Date: Thu, 3 Jul 2025 14:10:32 +0700
Subject: [PATCH 144/331] refactor: agencies role check
---
src/pages/07_agencies-management/AgenciesDialog.vue | 5 ++++-
src/pages/07_agencies-management/MainPage.vue | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/pages/07_agencies-management/AgenciesDialog.vue b/src/pages/07_agencies-management/AgenciesDialog.vue
index 5c32096b..e593bdef 100644
--- a/src/pages/07_agencies-management/AgenciesDialog.vue
+++ b/src/pages/07_agencies-management/AgenciesDialog.vue
@@ -62,6 +62,7 @@ const props = withDefaults(
defineProps<{
readonly?: boolean;
isEdit?: boolean;
+ hideAction?: boolean;
dataId?: string;
}>(),
@@ -411,6 +412,7 @@ watch(
:prefix="data.name"
hide-fade
use-toggle
+ :readonly="hideAction"
:active="data.status !== 'INACTIVE'"
:toggle-title="$t('status.title')"
:icon="'ph-building-office'"
@@ -450,7 +452,7 @@ watch(
style="position: absolute; z-index: 999; top: 0; right: 0"
>
Date: Thu, 3 Jul 2025 14:53:33 +0700
Subject: [PATCH 145/331] refactor: move variable out of function
---
src/stores/utils/index.ts | 123 +++++++++++++++++++-------------------
1 file changed, 62 insertions(+), 61 deletions(-)
diff --git a/src/stores/utils/index.ts b/src/stores/utils/index.ts
index 4b63c72b..76efc0f7 100644
--- a/src/stores/utils/index.ts
+++ b/src/stores/utils/index.ts
@@ -232,71 +232,72 @@ export function isRoleInclude(role2check: string[]): boolean {
return isIncluded;
}
+const allRoles = [
+ 'head_of_admin',
+ 'admin',
+ 'executive',
+ 'accountant',
+ 'branch_admin',
+ 'branch_manager',
+ 'branch_accountant',
+ 'head_of_sale',
+ 'sale',
+ 'data_entry',
+ 'document_checker',
+ 'messenger',
+ 'corporate_customer',
+ 'agency',
+];
+
+const permissions = {
+ branch: {
+ edit: allRoles.slice(0, 7),
+ view: allRoles.slice(0, 7),
+ },
+ personnel: {
+ edit: allRoles.slice(0, 6).filter((r) => r !== 'accountant'),
+ view: allRoles.slice(0, 6).filter((r) => r !== 'accountant'),
+ },
+ product: {
+ edit: allRoles.slice(0, 7),
+ view: allRoles,
+ },
+ workflow: {
+ edit: allRoles.slice(0, 6),
+ view: allRoles.filter((r) => r !== 'branch_accountant'),
+ },
+ customer: {
+ edit: allRoles.slice(0, 6),
+ view: allRoles.slice(0, 8),
+ },
+ agencies: {
+ edit: allRoles.slice(0, 7),
+ view: allRoles,
+ },
+ related: {
+ // ใช้กับหลายเมนู
+ edit: allRoles.slice(0, 6),
+ view: allRoles,
+ },
+ account: {
+ edit: allRoles.slice(0, 6),
+ view: allRoles.slice(0, 7),
+ },
+ uploadSlip: {
+ edit: allRoles.slice(0, 6),
+ view: allRoles.filter((r) => r !== 'head_of_sale' && r !== 'sale'),
+ },
+ dashBoard: {
+ edit: allRoles.slice(0, 6).filter((r) => r !== 'admin'),
+ view: allRoles.filter((r) => r !== 'admin'),
+ },
+};
+
export function canAccess(
- menu: string,
+ menu: keyof typeof permissions,
action: 'edit' | 'view' = 'view',
): boolean {
// uma_authorization = all roles
- const allRoles = [
- 'head_of_admin',
- 'admin',
- 'executive',
- 'accountant',
- 'branch_admin',
- 'branch_manager',
- 'branch_accountant',
- 'head_of_sale',
- 'sale',
- 'data_entry',
- 'document_checker',
- 'messenger',
- 'corporate_customer',
- 'agency',
- ];
-
- const permissions = {
- branch: {
- edit: allRoles.slice(0, 7),
- view: allRoles.slice(0, 7),
- },
- personnel: {
- edit: allRoles.slice(0, 6).filter((r) => r !== 'accountant'),
- view: allRoles.slice(0, 6).filter((r) => r !== 'accountant'),
- },
- product: {
- edit: allRoles.slice(0, 7),
- view: allRoles,
- },
- workflow: {
- edit: allRoles.slice(0, 6),
- view: allRoles.filter((r) => r !== 'branch_accountant'),
- },
- customer: {
- edit: allRoles.slice(0, 6),
- view: allRoles.slice(0, 8),
- },
- agencies: {
- edit: allRoles.slice(0, 7),
- view: allRoles,
- },
- related: {
- // ใช้กับหลายเมนู
- edit: allRoles.slice(0, 6),
- view: allRoles,
- },
- account: {
- edit: allRoles.slice(0, 6),
- view: allRoles.slice(0, 7),
- },
- uploadSlip: {
- edit: allRoles.slice(0, 6),
- view: allRoles.filter((r) => r !== 'head_of_sale' && r !== 'sale'),
- },
- dashBoard: {
- edit: allRoles.slice(0, 6).filter((r) => r !== 'admin'),
- view: allRoles.filter((r) => r !== 'admin'),
- },
- };
const roles = getRole() ?? [];
if (roles.includes('system')) return true;
From 2269038e11b629cbadc602174729a9b8f163a735 Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Thu, 3 Jul 2025 15:17:37 +0700
Subject: [PATCH 146/331] refactor: quotation role check
---
.../05_quotation/TableQuotation.vue | 2 ++
src/pages/05_quotation/MainPage.vue | 17 ++++++++++++++---
src/pages/05_quotation/PaymentForm.vue | 17 ++++++++++++-----
src/pages/05_quotation/QuotationForm.vue | 19 ++++++-------------
4 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/src/components/05_quotation/TableQuotation.vue b/src/components/05_quotation/TableQuotation.vue
index a80a4e40..b219944a 100644
--- a/src/components/05_quotation/TableQuotation.vue
+++ b/src/components/05_quotation/TableQuotation.vue
@@ -19,6 +19,7 @@ const props = withDefaults(
page?: number;
pageSize?: number;
hideBtnPreview?: boolean;
+ hideAction?: boolean;
}>(),
{
row: () => [],
@@ -149,6 +150,7 @@ defineEmits<{
/>
@@ -647,12 +648,20 @@ async function storeDataLocal(id: string) {
class="col surface-2 flex items-center justify-center"
>
();
@@ -521,6 +522,7 @@ onMounted(async () => {
{
{{ $t(`quotation.receiptDialog.${p.paymentStatus}`) }}
- {
})
}}
{
}
:deep(
- .q-expansion-item
- .q-item.q-item-type.row.no-wrap.q-item--clickable.q-link.cursor-pointer.q-focusable.q-hoverable
- .q-focus-helper
- ) {
+ .q-expansion-item
+ .q-item.q-item-type.row.no-wrap.q-item--clickable.q-link.cursor-pointer.q-focusable.q-hoverable
+ .q-focus-helper
+) {
visibility: hidden;
}
diff --git a/src/pages/05_quotation/QuotationForm.vue b/src/pages/05_quotation/QuotationForm.vue
index d3e392a6..72d1a471 100644
--- a/src/pages/05_quotation/QuotationForm.vue
+++ b/src/pages/05_quotation/QuotationForm.vue
@@ -8,6 +8,7 @@ import {
dialogCheckData,
dialogWarningClose,
formatNumberDecimal,
+ canAccess,
} from 'stores/utils';
import { ProductTree, quotationProductTree } from './utils';
@@ -213,17 +214,6 @@ const attachmentData = ref<
url?: string;
}[]
>([]);
-const hideBtnApproveInvoice = computed(() => {
- const role = getRole();
- const allowedRoles = [
- 'system',
- 'head_of_admin',
- 'admin',
- 'head_of_accountant',
- 'accountant',
- ];
- return !role || !role.some((r) => allowedRoles.includes(r));
-});
const getToolbarConfig = computed(() => {
const toolbar = [['left', 'center', 'justify'], ['toggle'], ['clip']];
@@ -1746,7 +1736,7 @@ function covertToNode() {
:readonly="
{
quotation: quotationFormState.mode !== 'edit',
- invoice: false,
+ invoice: !canAccess('related', 'edit'),
accepted: true,
}[view]
"
@@ -1950,6 +1940,7 @@ function covertToNode() {
view !== View.Receipt &&
view !== View.Complete
"
+ :readonly="!canAccess('related', 'edit')"
:data="quotationFormState.source"
v-model:first-code-payment="firstCodePayment"
@fetch-status="
@@ -2281,6 +2272,7 @@ function covertToNode() {
class="q-ml-sm"
v-if="
view === View.Accepted &&
+ canAccess('related', 'edit') &&
quotationFormData.quotationStatus === 'Issued'
"
>
@@ -2320,6 +2312,7 @@ function covertToNode() {
class="q-ml-sm"
v-if="
view === View.Invoice &&
+ canAccess('related', 'edit') &&
((quotationFormData.quotationStatus !== 'PaymentPending' &&
quotationFormData.payCondition !== 'Full') ||
quotationFormData.quotationStatus === 'Accepted') &&
@@ -2327,7 +2320,6 @@ function covertToNode() {
"
>
diff --git a/src/pages/12_debit-note/TableDebitNote.vue b/src/pages/12_debit-note/TableDebitNote.vue
index 4df008ca..72741833 100644
--- a/src/pages/12_debit-note/TableDebitNote.vue
+++ b/src/pages/12_debit-note/TableDebitNote.vue
@@ -6,6 +6,7 @@ import { DebitNote, useDebitNote } from 'src/stores/debit-note';
import { columns } from './constants';
import KebabAction from 'src/components/shared/KebabAction.vue';
+import { canAccess } from 'src/stores/utils';
const debitNote = useDebitNote();
const { data, page, pageSize } = storeToRefs(debitNote);
@@ -80,6 +81,7 @@ const visible = computed(() =>
:id-name="`btn-kebab-${props.row.workName}`"
hide-toggle
hide-edit
+ :hide-delete="!canAccess('related', 'edit')"
@edit="$emit('edit', props.row)"
@delete="$emit('delete', props.row)"
@view="$emit('view', props.row)"
From 48a1800b54597a55c96c59c78a2afd4a7021f999 Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Thu, 3 Jul 2025 16:14:06 +0700
Subject: [PATCH 150/331] refactor: request list role check
---
src/pages/08_request-list/MainPage.vue | 4 +++-
src/pages/08_request-list/RequestListAction .vue | 2 ++
src/pages/08_request-list/RequestListView.vue | 7 +++++--
src/pages/08_request-list/TableRequestList.vue | 11 +++++++++--
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/pages/08_request-list/MainPage.vue b/src/pages/08_request-list/MainPage.vue
index 64b339dc..f62f89b2 100644
--- a/src/pages/08_request-list/MainPage.vue
+++ b/src/pages/08_request-list/MainPage.vue
@@ -21,7 +21,7 @@ import { column } from './constants';
import useFlowStore from 'src/stores/flow';
import { useRequestList } from 'src/stores/request-list';
import { RequestData, RequestDataStatus } from 'src/stores/request-list/types';
-import { dialogWarningClose } from 'src/stores/utils';
+import { dialogWarningClose, canAccess } from 'src/stores/utils';
import { CancelButton, SaveButton } from 'src/components/button';
import { getRole } from 'src/services/keycloak';
import FloatingActionButton from 'src/components/FloatingActionButton.vue';
@@ -473,6 +473,7 @@ watch(
"
>
diff --git a/src/pages/08_request-list/RequestListAction .vue b/src/pages/08_request-list/RequestListAction .vue
index 09f62aa1..93a367f5 100644
--- a/src/pages/08_request-list/RequestListAction .vue
+++ b/src/pages/08_request-list/RequestListAction .vue
@@ -16,6 +16,7 @@ import useAddressStore from 'src/stores/address';
defineProps<{
requestList: RequestData[];
+ noLink?: boolean;
}>();
defineEmits<{
@@ -99,6 +100,7 @@ watch(
hide-action
hide-view
checkable
+ :no-link="noLink"
:list-same-area="listSameArea"
:columns="column"
:rows="requestList"
diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue
index 982f3203..df5af821 100644
--- a/src/pages/08_request-list/RequestListView.vue
+++ b/src/pages/08_request-list/RequestListView.vue
@@ -26,6 +26,7 @@ import {
getEmployeeName,
getCustomerName,
dialogWarningClose,
+ canAccess,
} from 'src/stores/utils';
import { dateFormatJS } from 'src/utils/datetime';
import { useRequestList } from 'src/stores/request-list';
@@ -459,6 +460,7 @@ async function submitRejectCancel() {
}
function toCustomer(customer: RequestData['quotation']['customerBranch']) {
+ if (!canAccess('related', 'edit')) return;
const url = new URL(
`/customer-management?tab=customer&id=${customer.customerId}`,
window.location.origin,
@@ -468,6 +470,7 @@ function toCustomer(customer: RequestData['quotation']['customerBranch']) {
}
function toEmployee(employee: RequestData['employee']) {
+ if (!canAccess('related', 'edit')) return;
const url = new URL(
`/customer-management?tab=employee&id=${employee.id}`,
window.location.origin,
@@ -742,7 +745,7 @@ function toEmployee(employee: RequestData['employee']) {
}"
>
(),
{
row: () => [],
@@ -119,6 +120,7 @@ function getEmployeeName(
}
function toCustomer(customer: RequestData['quotation']['customerBranch']) {
+ if (props.noLink) return;
const url = new URL(
`/customer-management?tab=customer&id=${customer.customerId}`,
window.location.origin,
@@ -128,6 +130,7 @@ function toCustomer(customer: RequestData['quotation']['customerBranch']) {
}
function toEmployee(employee: RequestData['employee']) {
+ if (props.noLink) return;
const url = new URL(
`/customer-management?tab=employee&id=${employee.id}`,
window.location.origin,
@@ -234,7 +237,7 @@ function handleCheckAll() {
{{
@@ -246,7 +249,10 @@ function handleCheckAll() {
-
+
{{ getEmployeeName(props.row, { locale: $i18n.locale }) || '-' }}
@@ -403,6 +409,7 @@ function handleCheckAll() {
hide-kebab-delete
:use-cancel="!hideAction"
class="full-height"
+ :hide-action="hideAction"
:use-reject-cancel="
props.row.customerRequestCancel && !props.row.rejectRequestCancel
"
From 3c4573192f12a0006ae7251885b474d0f71d59c1 Mon Sep 17 00:00:00 2001
From: Thanaphon Frappet
Date: Thu, 3 Jul 2025 16:19:33 +0700
Subject: [PATCH 151/331] refactor: update role task order can edit
---
src/pages/09_task-order/MainPage.vue | 2 ++
src/pages/09_task-order/TableTaskOrder.vue | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/pages/09_task-order/MainPage.vue b/src/pages/09_task-order/MainPage.vue
index cda7d75e..a6b654d7 100644
--- a/src/pages/09_task-order/MainPage.vue
+++ b/src/pages/09_task-order/MainPage.vue
@@ -5,6 +5,7 @@ import { storeToRefs } from 'pinia';
import { useQuasar } from 'quasar';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
+import { canAccess } from 'src/stores/utils';
// NOTE: Components
import StatCardComponent from 'src/components/StatCardComponent.vue';
@@ -172,6 +173,7 @@ watch(
Date: Fri, 4 Jul 2025 11:00:27 +0700
Subject: [PATCH 152/331] fix: workflow hide dropdown icon on responsible
person
---
src/components/04_flow-management/FormFlow.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/04_flow-management/FormFlow.vue b/src/components/04_flow-management/FormFlow.vue
index 711526f2..2568620b 100644
--- a/src/components/04_flow-management/FormFlow.vue
+++ b/src/components/04_flow-management/FormFlow.vue
@@ -609,7 +609,7 @@ onMounted(async () => {
-
+
Date: Fri, 4 Jul 2025 11:00:27 +0700
Subject: [PATCH 153/331] fix: workflow hide dropdown icon on responsible
person
---
src/components/04_flow-management/FormFlow.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/04_flow-management/FormFlow.vue b/src/components/04_flow-management/FormFlow.vue
index 6742c0d7..48ead08c 100644
--- a/src/components/04_flow-management/FormFlow.vue
+++ b/src/components/04_flow-management/FormFlow.vue
@@ -611,7 +611,7 @@ onMounted(async () => {
-
+
Date: Fri, 4 Jul 2025 12:52:47 +0700
Subject: [PATCH 154/331] refactor: add access control for add btn (workflow)
---
src/pages/04_flow-managment/MainPage.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/pages/04_flow-managment/MainPage.vue b/src/pages/04_flow-managment/MainPage.vue
index 8ca62dbf..f2c169ea 100644
--- a/src/pages/04_flow-managment/MainPage.vue
+++ b/src/pages/04_flow-managment/MainPage.vue
@@ -334,6 +334,7 @@ watch(
Date: Fri, 4 Jul 2025 13:17:52 +0700
Subject: [PATCH 155/331] refactor: add conditional delete button visibility in
agencies management
---
src/pages/07_agencies-management/AgenciesDialog.vue | 3 ++-
src/pages/07_agencies-management/MainPage.vue | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/pages/07_agencies-management/AgenciesDialog.vue b/src/pages/07_agencies-management/AgenciesDialog.vue
index e593bdef..e1597b03 100644
--- a/src/pages/07_agencies-management/AgenciesDialog.vue
+++ b/src/pages/07_agencies-management/AgenciesDialog.vue
@@ -63,6 +63,7 @@ const props = withDefaults(
readonly?: boolean;
isEdit?: boolean;
hideAction?: boolean;
+ hideDelete?: boolean;
dataId?: string;
}>(),
@@ -486,7 +487,7 @@ watch(
type="button"
/>
Date: Fri, 4 Jul 2025 13:52:53 +0700
Subject: [PATCH 156/331] refactor: update access control checks for quotation
edit permissions
---
src/pages/05_quotation/MainPage.vue | 8 +++-----
src/pages/05_quotation/QuotationForm.vue | 6 +-----
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/pages/05_quotation/MainPage.vue b/src/pages/05_quotation/MainPage.vue
index cc85be3d..a713178c 100644
--- a/src/pages/05_quotation/MainPage.vue
+++ b/src/pages/05_quotation/MainPage.vue
@@ -413,7 +413,7 @@ async function storeDataLocal(id: string) {
hide-icon
style="z-index: 999"
@click.stop="triggerAddQuotationDialog"
- v-if="canAccess('related', 'edit')"
+ v-if="canAccess('quotation', 'edit')"
/>
Date: Fri, 4 Jul 2025 14:08:11 +0700
Subject: [PATCH 158/331] refactor: update customer and quotation permissions
to include additional roles
---
src/stores/utils/index.ts | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/stores/utils/index.ts b/src/stores/utils/index.ts
index 0c137aa6..290aae02 100644
--- a/src/stores/utils/index.ts
+++ b/src/stores/utils/index.ts
@@ -267,13 +267,17 @@ const permissions = {
view: allRoles.filter((r) => r !== 'branch_accountant'),
},
customer: {
- edit: allRoles.slice(0, 6),
- view: allRoles.slice(0, 8),
+ edit: allRoles.slice(0, 9).filter((r) => r !== 'branch_accountant'),
+ view: allRoles.slice(0, 9),
},
agencies: {
edit: allRoles.slice(0, 7),
view: allRoles,
},
+ quotation: {
+ edit: allRoles.slice(0, 9).filter((r) => r !== 'branch_accountant'),
+ view: allRoles.slice(0, 9),
+ },
related: {
// ใช้กับหลายเมนู
edit: allRoles.slice(0, 6),
@@ -686,7 +690,7 @@ export function getEmployeeName(
return {
['eng']: `${typeof employee.namePrefix === 'string' ? useOptionStore().mapOption(employee.namePrefix) : ''} ${employee.firstNameEN} ${employee.lastNameEN}`,
- ['tha']: `${typeof employee.namePrefix === 'string' ? useOptionStore().mapOption(employee.namePrefix) : ''} ${employee.firstName} ${employee.lastName}`,
+ ['tha']: `${typeof employee.namePrefix === 'string' ? useOptionStore().mapOption(employee.namePrefix) : ''} ${employee.firstName || employee.firstNameEN} ${employee.lastName}`,
}[opts?.locale || 'eng'];
}
From 33e040c21a8e4d74e631e2949438b0647dce0339 Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Fri, 4 Jul 2025 15:06:44 +0700
Subject: [PATCH 159/331] refactor: update responsible user logic and
permissions for task orders
---
src/pages/08_request-list/MessengerExpansion.vue | 6 +++++-
src/pages/08_request-list/RequestListView.vue | 2 +-
src/pages/09_task-order/MainPage.vue | 2 +-
src/stores/utils/index.ts | 4 ++++
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/pages/08_request-list/MessengerExpansion.vue b/src/pages/08_request-list/MessengerExpansion.vue
index 30e81598..b883afee 100644
--- a/src/pages/08_request-list/MessengerExpansion.vue
+++ b/src/pages/08_request-list/MessengerExpansion.vue
@@ -86,7 +86,11 @@ function assignToForm() {
customerDutyCost: attributesForm.value.customerDutyCost ?? 30,
companyDuty: attributesForm.value.companyDuty ?? false,
companyDutyCost: attributesForm.value.companyDutyCost ?? 30,
- responsibleUserLocal: attributesForm.value.responsibleUserLocal ?? true,
+ responsibleUserLocal: attributesForm.value.responsibleUserLocal
+ ? attributesForm.value.responsibleUserLocal
+ : props.responsibleAreaDistrictId
+ ? false
+ : true,
responsibleUserId:
attributesForm.value.responsibleUserId || props.defaultMessenger,
individualDuty: attributesForm.value.individualDuty ?? false,
diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue
index 8b784175..6800cf27 100644
--- a/src/pages/08_request-list/RequestListView.vue
+++ b/src/pages/08_request-list/RequestListView.vue
@@ -867,7 +867,7 @@ function toEmployee(employee: RequestData['employee']) {
requestWorkId: value.id || '',
},
value.stepStatus?.[pageState.currentStep - 1]
- ?.responsibleUserId,
+ ?.responsibleUserId ?? data.defaultMessengerId,
);
}
"
diff --git a/src/pages/09_task-order/MainPage.vue b/src/pages/09_task-order/MainPage.vue
index a6b654d7..30bab6c2 100644
--- a/src/pages/09_task-order/MainPage.vue
+++ b/src/pages/09_task-order/MainPage.vue
@@ -173,7 +173,7 @@ watch(
{
- console.log(group);
if (group !== 'attachment') {
const res = await ocrStore.sendOcr({
file: file,
@@ -245,12 +244,20 @@ withDefaults(
:auto-save="item.id !== ''"
:download="
(obj) => {
- customerStore.getFile({
- parentId: item.id || '',
- group: obj.group,
- fileId: obj._meta.id,
- download: true,
- });
+ if (obj.group === 'citizen') {
+ customerStore.getFile({
+ parentId: item.id || '',
+ group: obj.group,
+ fileId: obj._meta.id,
+ download: true,
+ });
+ } else {
+ customerStore.getAttachment({
+ parentId: item.id || '',
+ name: obj._meta.id,
+ download: true,
+ });
+ }
}
"
:delete-item="
@@ -279,7 +286,7 @@ withDefaults(
_meta: any,
file: File | undefined,
) => {
- if (group !== 'attachment') {
+ if (group === 'citizen') {
if (file !== undefined && item.id) {
const res = await customerStore.postMeta({
parentId: item.id || '',
@@ -347,7 +354,6 @@ withDefaults(
});
const tempValue = resMeta.map(async (v: any) => {
- console.log(v.expireDate);
return {
_meta: { ...v },
name: `${group}-${dateFormat(v.expireDate)}`,
@@ -368,7 +374,6 @@ withDefaults(
});
const tempValue = (res as string[]).map(async (i: any) => {
- console.log(i);
return {
_meta: { id: i, name: i },
name: i || '',
diff --git a/src/pages/03_customer-management/constant.ts b/src/pages/03_customer-management/constant.ts
index 8d633b64..78e63bdc 100644
--- a/src/pages/03_customer-management/constant.ts
+++ b/src/pages/03_customer-management/constant.ts
@@ -69,19 +69,19 @@ export const uploadFileListCustomer: {
}[] = [
{
label: 'customer.typeFile.citizenId',
- value: 'citizen',
group: 'citizen',
+ value: 'citizen',
},
{
label: 'customer.typeFile.registrationBook',
- value: 'attachment',
group: 'houseRegistration',
+ value: 'attachment',
},
{
label: 'customer.typeFile.houseMap',
- value: 'attachment',
group: 'vatRegistration',
+ value: 'attachment',
},
{
@@ -92,7 +92,7 @@ export const uploadFileListCustomer: {
{
label: 'customer.typeFile.dbdCertificate',
- group: 'powerOfAttorney',
+ group: 'dbdCertificate',
value: 'attachment',
},
@@ -144,43 +144,43 @@ export const uploadFileListEmployee: {
},
{
label: 'customerEmployee.fileType.tm6',
- value: 'attachment',
group: 'tm6',
+ value: 'attachment',
},
{
label: 'customerEmployee.fileType.workPermit',
- value: 'attachment',
group: 'workPermit',
+ value: 'attachment',
},
{
label: 'customerEmployee.fileType.noticeJobEmployment',
- value: 'attachment',
group: 'noticeJobEmployment',
+ value: 'attachment',
},
{
label: 'customerEmployee.fileType.noticeJobEntry',
- value: 'attachment',
group: 'noticeJobEntry',
+ value: 'attachment',
},
{
label: 'customerEmployee.fileType.historyJob',
- value: 'attachment',
group: 'historyJob',
+ value: 'attachment',
},
{
label: 'customerEmployee.fileType.acceptJob',
- value: 'attachment',
group: 'acceptJob',
+ value: 'attachment',
},
{
label: 'customerEmployee.fileType.receipt',
- value: 'attachment',
group: 'receipt',
+ value: 'attachment',
},
{
label: 'customerEmployee.fileType.other',
- value: 'attachment',
group: 'other',
+ value: 'attachment',
},
];
diff --git a/src/pages/09_task-order/order_view/MainPage.vue b/src/pages/09_task-order/order_view/MainPage.vue
index 8d459fc8..ba4564be 100644
--- a/src/pages/09_task-order/order_view/MainPage.vue
+++ b/src/pages/09_task-order/order_view/MainPage.vue
@@ -1010,7 +1010,6 @@ watch(
"
/>
- {{ console.log(taskListGroup) }}
-
@@ -650,7 +650,7 @@ async function storeDataLocal(id: string) {
@@ -2312,7 +2310,6 @@ function covertToNode() {
class="q-ml-sm"
v-if="
view === View.Invoice &&
- canAccess('related', 'edit') &&
((quotationFormData.quotationStatus !== 'PaymentPending' &&
quotationFormData.payCondition !== 'Full') ||
quotationFormData.quotationStatus === 'Accepted') &&
@@ -2339,7 +2336,6 @@ function covertToNode() {
style="gap: var(--size-2)"
v-if="
(view === View.Quotation &&
- canAccess('related', 'edit') &&
(quotationFormData.quotationStatus === 'Issued' ||
quotationFormData.quotationStatus === 'Expired')) ||
!quotationFormData.quotationStatus
From e957672c917c6c4ef144d4a2bf8f344b56042773 Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Fri, 4 Jul 2025 14:08:04 +0700
Subject: [PATCH 157/331] refactor: update access control checks for customer
view permissions
---
src/pages/08_request-list/MainPage.vue | 4 ++--
src/pages/08_request-list/RequestListView.vue | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/pages/08_request-list/MainPage.vue b/src/pages/08_request-list/MainPage.vue
index f62f89b2..94a2f358 100644
--- a/src/pages/08_request-list/MainPage.vue
+++ b/src/pages/08_request-list/MainPage.vue
@@ -473,7 +473,7 @@ watch(
"
>
diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue
index df5af821..8b784175 100644
--- a/src/pages/08_request-list/RequestListView.vue
+++ b/src/pages/08_request-list/RequestListView.vue
@@ -460,7 +460,7 @@ async function submitRejectCancel() {
}
function toCustomer(customer: RequestData['quotation']['customerBranch']) {
- if (!canAccess('related', 'edit')) return;
+ if (!canAccess('customer', 'view')) return;
const url = new URL(
`/customer-management?tab=customer&id=${customer.customerId}`,
window.location.origin,
@@ -470,7 +470,7 @@ function toCustomer(customer: RequestData['quotation']['customerBranch']) {
}
function toEmployee(employee: RequestData['employee']) {
- if (!canAccess('related', 'edit')) return;
+ if (!canAccess('customer', 'view')) return;
const url = new URL(
`/customer-management?tab=employee&id=${employee.id}`,
window.location.origin,
@@ -745,7 +745,7 @@ function toEmployee(employee: RequestData['employee']) {
}"
>
-
+
{{ $t('general.expirationDate') }} :
@@ -5432,6 +5433,7 @@ const emptyCreateDialog = ref(false);
v-model:first-name="value.firstName"
v-model:name-prefix="value.namePrefix"
v-model:passport-number="value.number"
+ v-model:file="value.file"
>
{{ $t('general.expirationDate') }} :
diff --git a/src/pages/03_customer-management/form.ts b/src/pages/03_customer-management/form.ts
index a6592304..9c6da739 100644
--- a/src/pages/03_customer-management/form.ts
+++ b/src/pages/03_customer-management/form.ts
@@ -986,12 +986,16 @@ export const useEmployeeForm = defineStore('form-employee', () => {
state.value.currentIndexPassport
].id === undefined
) {
+ const { id, employeeId, updatedAt, createdAt, file, ...payload } =
+ currentFromDataEmployee.value.employeePassport?.[
+ state.value.currentIndexPassport
+ ];
+
const res = await employeeStore.postMeta({
parentId: currentFromDataEmployee.value.id || '',
group: 'passport',
- meta: currentFromDataEmployee.value.employeePassport?.[
- state.value.currentIndexPassport
- ],
+ meta: payload,
+ file: file,
});
if (res) {
@@ -1005,7 +1009,7 @@ export const useEmployeeForm = defineStore('form-employee', () => {
state.value.currentIndexPassport
].id !== undefined
) {
- const { id, employeeId, updatedAt, createdAt, ...payload } =
+ const { id, employeeId, updatedAt, createdAt, file, ...payload } =
currentFromDataEmployee.value.employeePassport?.[
state.value.currentIndexPassport
];
@@ -1018,6 +1022,7 @@ export const useEmployeeForm = defineStore('form-employee', () => {
state.value.currentIndexPassport
].id || '',
meta: payload,
+ file: file || undefined,
});
}
diff --git a/src/stores/employee/types.ts b/src/stores/employee/types.ts
index b2983d61..c479f179 100644
--- a/src/stores/employee/types.ts
+++ b/src/stores/employee/types.ts
@@ -108,7 +108,7 @@ export type EmployeeCreate = {
employeeWork?: EmployeeWorkCreate[];
employeeInCountryNotice?: EmployeeInCountryNoticePayload[];
employeeVisa?: EmployeeVisaPayload[];
- employeePassport?: EmployeePassportPayload[];
+ employeePassport?: (EmployeePassportPayload & { file?: File })[];
employeeOtherInfo?: EmployeeOtherCreate;
From 9dcec6b4c6340a81fce59ed61b7be1fed90ceafe Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Fri, 4 Jul 2025 16:31:17 +0700
Subject: [PATCH 163/331] refactor: streamline access control for task order
actions in the table component
---
src/pages/09_task-order/TableTaskOrder.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pages/09_task-order/TableTaskOrder.vue b/src/pages/09_task-order/TableTaskOrder.vue
index 4411e2e8..e0be68c5 100644
--- a/src/pages/09_task-order/TableTaskOrder.vue
+++ b/src/pages/09_task-order/TableTaskOrder.vue
@@ -216,10 +216,9 @@ const emit = defineEmits<{
/>
Date: Fri, 4 Jul 2025 17:13:07 +0700
Subject: [PATCH 164/331] refactor: credit note role check
---
src/pages/09_task-order/SelectReadyRequestWork.vue | 8 +++++---
src/pages/11_credit-note/FormPage.vue | 6 ++++--
src/pages/11_credit-note/MainPage.vue | 12 ++++++++++--
src/pages/11_credit-note/RefundInformation.vue | 9 +++++----
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/pages/09_task-order/SelectReadyRequestWork.vue b/src/pages/09_task-order/SelectReadyRequestWork.vue
index 34d9dd22..a3cf6856 100644
--- a/src/pages/09_task-order/SelectReadyRequestWork.vue
+++ b/src/pages/09_task-order/SelectReadyRequestWork.vue
@@ -4,6 +4,7 @@ import {
useRequestList,
RequestWork,
RequestWorkStatus,
+ RequestDataStatus,
} from 'src/stores/request-list';
import DialogHeader from 'src/components/dialog/DialogHeader.vue';
import CancelButton from 'src/components/button/CancelButton.vue';
@@ -192,7 +193,8 @@ function submit() {
s.workStatus ===
(props.creditNote
? RequestWorkStatus.Canceled
- : RequestWorkStatus.InProgress),
+ : RequestWorkStatus.InProgress) ||
+ v.request.requestDataStatus === RequestDataStatus.Canceled,
);
if (curr) {
const task: Task = {
@@ -387,8 +389,8 @@ function assignTempGroup() {
}
:deep(
- i.q-icon.mdi.mdi-chevron-down-circle.q-expansion-item__toggle-icon.q-expansion-item__toggle-icon--rotated
- ) {
+ i.q-icon.mdi.mdi-chevron-down-circle.q-expansion-item__toggle-icon.q-expansion-item__toggle-icon--rotated
+) {
color: var(--brand-1);
}
diff --git a/src/pages/11_credit-note/FormPage.vue b/src/pages/11_credit-note/FormPage.vue
index 0dde0352..88d3606c 100644
--- a/src/pages/11_credit-note/FormPage.vue
+++ b/src/pages/11_credit-note/FormPage.vue
@@ -34,7 +34,7 @@ import {
import { RequestWork } from 'src/stores/request-list/types';
import { storeToRefs } from 'pinia';
import useOptionStore from 'src/stores/options';
-import { dialogWarningClose } from 'src/stores/utils';
+import { dialogWarningClose, canAccess } from 'src/stores/utils';
import { useI18n } from 'vue-i18n';
import { QForm } from 'quasar';
import { getName } from 'src/services/keycloak';
@@ -684,6 +684,7 @@ onMounted(async () => {
@@ -376,6 +380,10 @@ watch(
})
"
@delete="() => triggerDelete(item.row.id)"
+ :hide-kebab-delete="
+ pageState.currentTab !== CreditNoteStatus.Waiting ||
+ !canAccess('related', 'edit')
+ "
:title="item.row.quotation.workName"
:code="item.row.code"
:status="$t(`creditNote.status.${item.row.creditNoteStatus}`)"
diff --git a/src/pages/11_credit-note/RefundInformation.vue b/src/pages/11_credit-note/RefundInformation.vue
index a6e0427c..0e42326b 100644
--- a/src/pages/11_credit-note/RefundInformation.vue
+++ b/src/pages/11_credit-note/RefundInformation.vue
@@ -172,11 +172,13 @@ const refundOpts = ref<
>
{{ $t('creditNote.label.refund') }}
(),
{
gridView: false,
@@ -269,6 +270,7 @@ defineEmits<{
v-if="!inTable && !hideAction"
:id-name="props.row.firstName"
:status="props.row.status"
+ :hide-delete="hideDelete"
@view="$emit('view', props.row)"
@edit="$emit('edit', props.row)"
@delete="$emit('delete', props.row)"
@@ -282,6 +284,7 @@ defineEmits<{
();
defineEmits<{
@@ -80,6 +81,7 @@ defineEmits<{
v-if="!hideAction"
:id-name="prefixId"
:status="disabled ? 'INACTIVE' : 'ACTIVE'"
+ :hide-delete="hideDelete"
@view="
separateEnter
? $emit('viewCard', 'INFO')
diff --git a/src/pages/03_customer-management/BranchPage.vue b/src/pages/03_customer-management/BranchPage.vue
index a88d498b..2831bc68 100644
--- a/src/pages/03_customer-management/BranchPage.vue
+++ b/src/pages/03_customer-management/BranchPage.vue
@@ -751,7 +751,7 @@ watch(
})
"
>
-
+
-
+
@@ -5626,7 +5606,7 @@ const emptyCreateDialog = ref(false);
/>
{{ $t('customerEmployee.form.group.visa') }}
@@ -5809,7 +5788,7 @@ const emptyCreateDialog = ref(false);
{{ $t(`customerEmployee.formHealthCheck.title`) }}
('telephoneNo', { default: '' });
class="col-md-6"
:readonly
:disabled="
- !isRoleInclude(['admin', 'system', 'head_of_admin']) && !readonly
+ !isRoleInclude([
+ 'admin',
+ 'system',
+ 'head_of_admin',
+ 'executive',
+ 'accountant',
+ ]) && !readonly
"
:label="$t('customer.form.registeredBranch')"
select-first-value
diff --git a/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue b/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue
index 1b70b651..ddaec803 100644
--- a/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue
+++ b/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue
@@ -51,6 +51,7 @@ withDefaults(
actionDisabled?: boolean;
customerType?: 'CORP' | 'PERS';
hideAction?: boolean;
+ hideDelete?: boolean;
}>(),
{
hideAction: false,
@@ -81,7 +82,7 @@ withDefaults(
/>
Date: Mon, 7 Jul 2025 11:19:57 +0700
Subject: [PATCH 166/331] fix: change status employee
---
src/pages/03_customer-management/MainPage.vue | 31 ++++++++++++++++---
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index e5dd0af1..116555f1 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -397,7 +397,11 @@ async function fetchListEmployee(opt?: {
employeeStats.value = await employeeStore.getStatsEmployee();
}
-async function triggerChangeStatus(id: string, status: string) {
+async function triggerChangeStatus(
+ id: string,
+ status: string,
+ employeeName?: string,
+) {
return await new Promise((resolve, reject) => {
dialog({
color: status !== 'INACTIVE' ? 'warning' : 'info',
@@ -412,7 +416,11 @@ async function triggerChangeStatus(id: string, status: string) {
: t('dialog.message.confirmChangeStatusOn'),
action: async () => {
if (currentTab.value === 'employee') {
- await toggleStatusEmployee(id, status === 'INACTIVE' ? false : true)
+ await toggleStatusEmployee(
+ id,
+ status === 'INACTIVE' ? false : true,
+ employeeName,
+ )
.then(resolve)
.catch(reject);
} else {
@@ -426,9 +434,14 @@ async function triggerChangeStatus(id: string, status: string) {
});
}
-async function toggleStatusEmployee(id: string, status: boolean) {
+async function toggleStatusEmployee(
+ id: string,
+ status: boolean,
+ employeeName: string,
+) {
const res = await employeeStore.editById(id, {
status: !status ? 'ACTIVE' : 'INACTIVE',
+ firstNameEN: employeeName,
});
if (res && employeeFormState.value.drawerModal)
currentFromDataEmployee.value.status = res.status;
@@ -1831,7 +1844,11 @@ const emptyCreateDialog = ref(false);
"
@toggle-status="
async (item: any) => {
- triggerChangeStatus(item.id, item.status);
+ triggerChangeStatus(
+ item.id,
+ item.status,
+ item.firstNameEN,
+ );
}
"
/>
@@ -4585,7 +4602,11 @@ const emptyCreateDialog = ref(false);
@update:toggle-status="
(v) => {
if (currentFromDataEmployee.id !== undefined)
- triggerChangeStatus(currentFromDataEmployee.id, v);
+ triggerChangeStatus(
+ currentFromDataEmployee.id,
+ v,
+ currentFromDataEmployee.firstNameEN,
+ );
}
"
:active="currentFromDataEmployee.status !== 'INACTIVE'"
From c4812666548912ff8aecb2cca5b76c298a3dcedc Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Mon, 7 Jul 2025 12:42:52 +0700
Subject: [PATCH 167/331] refactor: enhance access control and visibility logic
across various components
---
.../04_property-management/FormProperty.vue | 16 +++++++++-------
src/components/TreeComponent.vue | 13 +------------
src/pages/04_property-managment/MainPage.vue | 18 +++++++++++++++---
.../04_property-managment/PropertyDialog.vue | 4 +++-
src/pages/05_quotation/PaymentForm.vue | 2 +-
src/pages/05_quotation/QuotationForm.vue | 4 +++-
src/pages/11_credit-note/FormPage.vue | 4 ++--
src/pages/12_debit-note/FormPage.vue | 12 +++++++++---
8 files changed, 43 insertions(+), 30 deletions(-)
diff --git a/src/components/04_property-management/FormProperty.vue b/src/components/04_property-management/FormProperty.vue
index 34067e8e..6be9f885 100644
--- a/src/components/04_property-management/FormProperty.vue
+++ b/src/components/04_property-management/FormProperty.vue
@@ -48,6 +48,7 @@ defineProps<{
readonly?: boolean;
onDrawer?: boolean;
inputOnly?: boolean;
+ disableToggle?: boolean;
}>();
defineEmits<{
@@ -76,6 +77,7 @@ defineEmits<{
import { BranchWithChildren } from 'stores/branch/types';
import KebabAction from './shared/KebabAction.vue';
-import { isRoleInclude } from 'stores/utils';
const nodes = defineModel<(any | BranchWithChildren)[]>('nodes', {
default: [],
@@ -120,17 +119,7 @@ defineEmits<{
/>
undo()"
@close="() => resetForm()"
@submit="() => submit()"
+ :hide-action="!canAccess('workflow', 'edit')"
:readonly="!pageState.isDrawerEdit"
:isEdit="pageState.isDrawerEdit"
v-model="pageState.addModal"
diff --git a/src/pages/04_property-managment/PropertyDialog.vue b/src/pages/04_property-managment/PropertyDialog.vue
index 333f0ec7..66161d57 100644
--- a/src/pages/04_property-managment/PropertyDialog.vue
+++ b/src/pages/04_property-managment/PropertyDialog.vue
@@ -30,6 +30,7 @@ withDefaults(
defineProps<{
readonly?: boolean;
isEdit?: boolean;
+ hideAction?: boolean;
}>(),
{ readonly: false, isEdit: false },
);
@@ -151,7 +152,7 @@ defineEmits<{
style="position: absolute; z-index: 999; top: 0; right: 0"
>
{
-
+
{{ $t('quotation.receiptDialog.billOfPayment') }}
diff --git a/src/pages/05_quotation/QuotationForm.vue b/src/pages/05_quotation/QuotationForm.vue
index 99d6a124..52e2fc69 100644
--- a/src/pages/05_quotation/QuotationForm.vue
+++ b/src/pages/05_quotation/QuotationForm.vue
@@ -9,6 +9,7 @@ import {
dialogWarningClose,
formatNumberDecimal,
canAccess,
+ isRoleInclude,
} from 'stores/utils';
import { ProductTree, quotationProductTree } from './utils';
@@ -1736,7 +1737,7 @@ function covertToNode() {
:readonly="
{
quotation: quotationFormState.mode !== 'edit',
- invoice: false,
+ invoice: isRoleInclude(['sale', 'head_of_sale']),
accepted: true,
}[view]
"
@@ -1940,6 +1941,7 @@ function covertToNode() {
view !== View.Receipt &&
view !== View.Complete
"
+ :readonly="isRoleInclude(['sale', 'head_of_sale'])"
:data="quotationFormState.source"
v-model:first-code-payment="firstCodePayment"
@fetch-status="
diff --git a/src/pages/11_credit-note/FormPage.vue b/src/pages/11_credit-note/FormPage.vue
index 88d3606c..007dcc84 100644
--- a/src/pages/11_credit-note/FormPage.vue
+++ b/src/pages/11_credit-note/FormPage.vue
@@ -34,7 +34,7 @@ import {
import { RequestWork } from 'src/stores/request-list/types';
import { storeToRefs } from 'pinia';
import useOptionStore from 'src/stores/options';
-import { dialogWarningClose, canAccess } from 'src/stores/utils';
+import { dialogWarningClose, canAccess, isRoleInclude } from 'src/stores/utils';
import { useI18n } from 'vue-i18n';
import { QForm } from 'quasar';
import { getName } from 'src/services/keycloak';
@@ -728,7 +728,7 @@ onMounted(async () => {
diff --git a/src/pages/05_quotation/form.ts b/src/pages/05_quotation/form.ts
index 45801a5a..e44fa747 100644
--- a/src/pages/05_quotation/form.ts
+++ b/src/pages/05_quotation/form.ts
@@ -8,6 +8,7 @@ import {
QuotationPayload,
QuotationFull,
EmployeeWorker,
+ PayCondition,
} from 'src/stores/quotations/types';
import { Employee } from 'src/stores/employee/types';
@@ -29,7 +30,7 @@ export const DEFAULT_DATA: QuotationPayload = {
payBillDate: new Date(),
paySplit: [],
paySplitCount: 0,
- payCondition: 'Full',
+ payCondition: PayCondition.Full,
dueDate: new Date(Date.now() + 86400000),
discount: 0,
contactTel: '',
@@ -40,6 +41,7 @@ export const DEFAULT_DATA: QuotationPayload = {
status: 'CREATED',
remark: '#[quotation-labor]
#[quotation-payment]', agentPrice: false, + sellerId: '', }; const DEFAULT_DATA_INVOICE: InvoicePayload = { diff --git a/src/stores/quotations/index.ts b/src/stores/quotations/index.ts index e7faca39..92257f2e 100644 --- a/src/stores/quotations/index.ts +++ b/src/stores/quotations/index.ts @@ -78,6 +78,7 @@ export const useQuotationStore = defineStore('quotation-store', () => { cancelIncludeDebitNote?: boolean; startDate?: string; endDate?: string; + sellerId?: string; }) { const res = await api.get>('/quotation', {
params,
diff --git a/src/stores/quotations/types.ts b/src/stores/quotations/types.ts
index ce969936..5a1fa672 100644
--- a/src/stores/quotations/types.ts
+++ b/src/stores/quotations/types.ts
@@ -356,6 +356,7 @@ export type QuotationPayload = {
_count: { worker: number };
discount?: number;
payBillDate?: Date | null;
+ sellerId?: string;
paySplit: {
no: number;
amount: number;
From 8b2e3f76c46abccb012a8e75630e70d4f32e1f2b Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Mon, 7 Jul 2025 15:29:18 +0700
Subject: [PATCH 169/331] feat: add group management page and update
translations
---
src/i18n/eng.ts | 1 +
src/i18n/tha.ts | 1 +
src/layouts/DrawerComponent.vue | 5 ++
src/pages/02_group-management/MainPage.vue | 67 ++++++++++++++++++++++
src/router/routes.ts | 5 ++
5 files changed, 79 insertions(+)
create mode 100644 src/pages/02_group-management/MainPage.vue
diff --git a/src/i18n/eng.ts b/src/i18n/eng.ts
index 321e60e3..4e3da82e 100644
--- a/src/i18n/eng.ts
+++ b/src/i18n/eng.ts
@@ -202,6 +202,7 @@ export default {
title: 'Manage',
branch: 'Branch',
personnel: 'Personnel',
+ group: 'group',
productService: 'Product and Service',
workflow: 'Workflow',
property: 'Property',
diff --git a/src/i18n/tha.ts b/src/i18n/tha.ts
index cbe18525..57eeb57d 100644
--- a/src/i18n/tha.ts
+++ b/src/i18n/tha.ts
@@ -202,6 +202,7 @@ export default {
title: 'จัดการ',
branch: 'สาขา',
personnel: 'บุคลากร',
+ group: 'กลุ่ม',
productService: 'สินค้าและบริการ',
workflow: 'ขั้นตอนการทำงาน',
property: 'คุณสมบัติ',
diff --git a/src/layouts/DrawerComponent.vue b/src/layouts/DrawerComponent.vue
index 7305e85f..4d7ea910 100644
--- a/src/layouts/DrawerComponent.vue
+++ b/src/layouts/DrawerComponent.vue
@@ -78,6 +78,11 @@ function initMenu() {
route: '/personnel-management',
hidden: !canAccess('personnel'),
},
+ {
+ label: 'group',
+ route: '/group-management',
+ hidden: !canAccess('personnel'),
+ },
{
label: 'workflow',
route: '/workflow',
diff --git a/src/pages/02_group-management/MainPage.vue b/src/pages/02_group-management/MainPage.vue
new file mode 100644
index 00000000..f185a6d1
--- /dev/null
+++ b/src/pages/02_group-management/MainPage.vue
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 86a7fa2a..d878ff0c 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -90,6 +90,11 @@ const routes: RouteRecordRaw[] = [
name: 'document-management',
component: () => import('pages/06_edm/MainPage.vue'),
},
+ {
+ path: '/group-management',
+ name: '/group-management',
+ component: () => import('pages/02_group-management/MainPage.vue'),
+ },
{
path: '/agencies-management',
name: 'agencies-management',
From 84591ae7191395369e3321a9158703fc0bef1262 Mon Sep 17 00:00:00 2001
From: puriphatt
Date: Mon, 7 Jul 2025 16:17:54 +0700
Subject: [PATCH 170/331] fix: correct iframe source URL format in group
management page
---
src/pages/02_group-management/MainPage.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/02_group-management/MainPage.vue b/src/pages/02_group-management/MainPage.vue
index f185a6d1..f4b46a26 100644
--- a/src/pages/02_group-management/MainPage.vue
+++ b/src/pages/02_group-management/MainPage.vue
@@ -57,7 +57,7 @@ const currentLocale = ref(locale.value);
+
+
+
diff --git a/src/pages/05_quotation/QuotationForm.vue b/src/pages/05_quotation/QuotationForm.vue
index 52e2fc69..ba21c9c8 100644
--- a/src/pages/05_quotation/QuotationForm.vue
+++ b/src/pages/05_quotation/QuotationForm.vue
@@ -2,6 +2,7 @@
import { useI18n } from 'vue-i18n';
import { storeToRefs } from 'pinia';
import { QSelect, useQuasar } from 'quasar';
+import { getUserId } from 'src/services/keycloak';
import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue';
import {
baseUrl,
@@ -78,7 +79,6 @@ import { api } from 'src/boot/axios';
import { RouterLink, useRoute } from 'vue-router';
import { initLang, initTheme, Lang } from 'src/utils/ui';
import { convertTemplate } from 'src/utils/string-template';
-import { getRole } from 'src/services/keycloak';
type Node = {
[key: string]: any;
@@ -616,6 +616,7 @@ async function convertDataToFormSubmit() {
discount: quotationFormData.value.discount,
remark: quotationFormData.value.remark || '',
agentPrice: agentPrice.value,
+ sellerId: quotationFormData.value.sellerId,
};
newWorkerList.value = [];
@@ -1015,6 +1016,7 @@ onMounted(async () => {
quotationFormData.value.customerBranchId = parsed.customerBranchId;
currentQuotationId.value = parsed.quotationId;
agentPrice.value = parsed.agentPrice;
+ quotationFormData.value.sellerId = getUserId();
await fetchQuotation();
await assignWorkerToSelectedWorker();
sessionData.value = parsed;
@@ -1506,6 +1508,7 @@ function covertToNode() {
v-model:contactor="quotationFormData.contactName"
v-model:telephone="quotationFormData.contactTel"
v-model:due-date="quotationFormData.dueDate"
+ v-model:seller-id="quotationFormData.sellerId"
>
import DatePicker from 'src/components/shared/DatePicker.vue';
+import SelectUser from 'src/components/shared/select/SelectUser.vue';
defineProps<{
readonly: boolean;
@@ -13,6 +14,7 @@ const contactor = defineModel('contactor', { required: true });
const telephone = defineModel('telephone', { required: true });
const dueDate = defineModel('dueDate', { required: true });
const createdAt = defineModel('createdAt');
+const sellerId = defineModel('sellerId', { required: true });
@@ -95,5 +97,11 @@ const createdAt = defineModel('createdAt');
dense
outlined
/>
+
{{ $t('general.advanceSearch') }}
diff --git a/src/i18n/eng.ts b/src/i18n/eng.ts
index 73b4b096..321e60e3 100644
--- a/src/i18n/eng.ts
+++ b/src/i18n/eng.ts
@@ -768,6 +768,7 @@ export default {
},
quotation: {
+ ownOnly: 'View Own Quotation Only',
quotationDate: 'Quotation Date',
seller: 'Seller',
paymentChannels: 'Payment Channels',
diff --git a/src/i18n/tha.ts b/src/i18n/tha.ts
index f01b2dca..cbe18525 100644
--- a/src/i18n/tha.ts
+++ b/src/i18n/tha.ts
@@ -766,6 +766,7 @@ export default {
},
quotation: {
+ ownOnly: 'เห็นเฉพาะใบเสนอราคาของตัวเอง',
quotationDate: 'วันที่ใบเสนอราคา',
seller: 'ผู้ขาย',
paymentChannels: 'ช่องทางชำระเงิน',
diff --git a/src/pages/05_quotation/MainPage.vue b/src/pages/05_quotation/MainPage.vue
index a713178c..f1414b70 100644
--- a/src/pages/05_quotation/MainPage.vue
+++ b/src/pages/05_quotation/MainPage.vue
@@ -15,6 +15,7 @@ import { useQuotationForm } from './form';
import { hslaColors } from './constants';
import { pageTabs, columnQuotation } from './constants';
import { toCamelCase, canAccess } from 'stores/utils';
+import { getUserId } from 'src/services/keycloak';
// NOTE Import Types
import { CustomerBranchCreate, CustomerType } from 'stores/customer/types';
@@ -104,6 +105,7 @@ const pageState = reactive({
fieldSelected: [''],
gridView: false,
total: 0,
+ sellerId: '',
currentTab: 'Issued',
addModal: false,
@@ -297,6 +299,7 @@ onMounted(async () => {
pageSize: quotationPageSize.value,
status: 'Issued',
urgentFirst: true,
+ sellerId: pageState.sellerId || undefined,
});
if (ret) {
@@ -331,6 +334,7 @@ async function fetchQuotationList(mobileFetch?: boolean) {
urgentFirst: true,
startDate: pageState.searchDate[0],
endDate: pageState.searchDate[1],
+ sellerId: pageState.sellerId || undefined,
});
if (ret) {
@@ -406,6 +410,11 @@ async function storeDataLocal(id: string) {
window.open(url, '_blank');
}
+
+async function filterBySellerId() {
+ pageState.sellerId = pageState.sellerId ? '' : getUserId();
+ await fetchQuotationList();
+}
@@ -529,7 +538,18 @@ async function storeDataLocal(id: string) {
+
+
+ #[quotation-payment]', agentPrice: false, + sellerId: '', }; const DEFAULT_DATA_INVOICE: InvoicePayload = { diff --git a/src/stores/quotations/index.ts b/src/stores/quotations/index.ts index e7faca39..92257f2e 100644 --- a/src/stores/quotations/index.ts +++ b/src/stores/quotations/index.ts @@ -78,6 +78,7 @@ export const useQuotationStore = defineStore('quotation-store', () => { cancelIncludeDebitNote?: boolean; startDate?: string; endDate?: string; + sellerId?: string; }) { const res = await api.get