From 059c6d3afcaa927e7bdd0b53b649085cd6f29092 Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Wed, 9 Jul 2025 13:17:06 +0700
Subject: [PATCH] feat: update task order permissions to include create access
 and adjust edit logic

---
 src/pages/09_task-order/MainPage.vue          |  2 +-
 .../09_task-order/order_view/MainPage.vue     | 21 +++++++++++--------
 src/stores/utils/index.ts                     |  3 ++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/pages/09_task-order/MainPage.vue b/src/pages/09_task-order/MainPage.vue
index 5576d3d0..23cfd2e4 100644
--- a/src/pages/09_task-order/MainPage.vue
+++ b/src/pages/09_task-order/MainPage.vue
@@ -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="
diff --git a/src/pages/09_task-order/order_view/MainPage.vue b/src/pages/09_task-order/order_view/MainPage.vue
index 2debeebb..26173ed7 100644
--- a/src/pages/09_task-order/order_view/MainPage.vue
+++ b/src/pages/09_task-order/order_view/MainPage.vue
@@ -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) =>
diff --git a/src/stores/utils/index.ts b/src/stores/utils/index.ts
index fbd7fa1f..aab9ffa2 100644
--- a/src/stores/utils/index.ts
+++ b/src/stores/utils/index.ts
@@ -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: {