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

refactor: enhance access control for task order editing and employee name display
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 7s
Details

Browse source
This commit is contained in:
puriphatt 2025-07-04 16:20:44 +07:00
parent 33e040c21a
commit 942449e373
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pages/09_task-order/MainPage.vue
View file

@ -173,7 +173,7 @@ watch(
</script>
<template>
<FloatingActionButton
v-if="canAccess('taskOrder', 'edit')"
v-if="canAccess('taskOrder', 'edit') || pageState.isMessenger"
style="z-index: 999"
:hide-icon="!pageState.isMessenger"
@click.stop="

2
src/pages/09_task-order/TableEmployee.vue
View file

@ -79,7 +79,7 @@ function getEmployeeName(
return (
{
['eng']: `${useOptionStore().mapOption(employee?.namePrefix || '')} ${employee?.firstNameEN} ${employee?.lastNameEN}`,
['tha']: `${useOptionStore().mapOption(employee?.namePrefix || '')} ${employee?.firstName} ${employee?.lastName}`,
['tha']: `${useOptionStore().mapOption(employee?.namePrefix || '')} ${employee?.firstName || employee?.firstNameEN} ${employee?.lastName}`,
}[opts?.locale || 'eng'] || '-'
);
}

8
src/pages/09_task-order/order_view/MainPage.vue
View file

@ -4,7 +4,7 @@ import { useRoute, useRouter } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { api } from 'src/boot/axios';
import { Lang } from 'src/utils/ui';
import { baseUrl } from 'stores/utils';
import { baseUrl, canAccess } from 'stores/utils';
import TaskStatusComponent from '../TaskStatusComponent.vue';
import StateButton from 'src/components/button/StateButton.vue';
@ -1010,7 +1010,6 @@ watch(
"
/>
<!-- TODO: blind remark, urgent -->
{{ console.log(taskListGroup) }}
<RemarkExpansion
v-if="
view === TaskOrderStatus.Pending ||
@ -1176,7 +1175,10 @@ watch(
<template #append="{ props: subProps }">
<TaskStatusComponent
:key="subProps.row.id"
:no-action="view !== TaskOrderStatus.Validate"
:no-action="
view !== TaskOrderStatus.Validate &&
!canAccess('taskOrder', 'edit')
"
type="order"
:readonly="
(() => {