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

feat: update task order permissions to include create access and adjust edit logic
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 6s
Details

Browse source
This commit is contained in:
puriphatt 2025-07-09 13:17:06 +07:00
parent 6117867aba
commit 059c6d3afc
3 changed files with 15 additions and 11 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') || pageState.isMessenger"
v-if="canAccess('taskOrder', 'create') || pageState.isMessenger"
style="z-index: 999"
:hide-icon="!pageState.isMessenger"
@click.stop="

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

@ -1142,13 +1142,15 @@ watch(
validate
step-on
:checkbox-on="
view === TaskOrderStatus.Validate &&
(fullTaskOrder?.userTask.find(
(l) => l.userId === v.responsibleUser.id,
)?.userTaskStatus === UserTaskStatus.Submit ||
fullTaskOrder?.userTask.find(
(l) => l.userId === v.responsibleUser.id,
)?.userTaskStatus === UserTaskStatus.Restart)
canAccess('taskOrder', 'edit')
? view === TaskOrderStatus.Validate &&
(fullTaskOrder?.userTask.find(
(l) => l.userId === v.responsibleUser.id,
)?.userTaskStatus === UserTaskStatus.Submit ||
fullTaskOrder?.userTask.find(
(l) => l.userId === v.responsibleUser.id,
)?.userTaskStatus === UserTaskStatus.Restart)
: false
"
:check-all="
(view === TaskOrderStatus.Validate &&
@ -1176,7 +1178,7 @@ watch(
<TaskStatusComponent
:key="subProps.row.id"
:no-action="
view !== TaskOrderStatus.Validate &&
view !== TaskOrderStatus.Validate ||
!canAccess('taskOrder', 'edit')
"
type="order"
@ -1284,7 +1286,8 @@ watch(
v-if="
state.mode !== 'create' &&
view === TaskOrderStatus.Validate &&
fullTaskOrder?.taskOrderStatus !== TaskOrderStatus.Pending
fullTaskOrder?.taskOrderStatus !== TaskOrderStatus.Pending &&
canAccess('taskOrder', 'edit')
"
:disabled="
!fullTaskOrder?.taskList.some((t) =>

3
src/stores/utils/index.ts
View file

@ -280,7 +280,8 @@ const permissions = {
view: allRoles.slice(0, 9),
},
taskOrder: {
edit: [...allRoles.slice(0, 6), 'data_entry'],
create: [...allRoles.slice(0, 6), 'data_entry'],
edit: [...allRoles.slice(0, 7), 'data_entry'],
view: allRoles,
},
related: {