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

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

View file

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

View file

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

View file

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