From 18022fcfb707a0c3f2b3577de7aa73575d478c1e Mon Sep 17 00:00:00 2001
From: Thanaphon Frappet <thanaphon@frappet.com>
Date: Mon, 24 Feb 2025 11:26:22 +0700
Subject: [PATCH] refactor: move field quotation code

---
 src/pages/09_task-order/TableEmployee.vue | 23 +++++++++++++----------
 src/pages/09_task-order/constants.ts      | 12 ++++++------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/pages/09_task-order/TableEmployee.vue b/src/pages/09_task-order/TableEmployee.vue
index 33e685bf..ea78c7d4 100644
--- a/src/pages/09_task-order/TableEmployee.vue
+++ b/src/pages/09_task-order/TableEmployee.vue
@@ -232,14 +232,14 @@ function disableCheckAll() {
     :columns="
       stepOn
         ? [
-            ...employeeColumn.slice(0, 2),
+            ...employeeColumn.slice(0, 3),
             {
               name: 'periodNo',
               align: 'center',
               label: 'flow.step',
               field: (v) => v.product.code,
             },
-            ...employeeColumn.slice(2),
+            ...employeeColumn.slice(3),
           ]
         : statusOn
           ? [
@@ -463,6 +463,16 @@ function disableCheckAll() {
             {{ props.row.request.code }}
           </span>
         </q-td>
+
+        <q-td>
+          <span
+            class="cursor-pointer link"
+            @click="goToQuotation(props.row.request.quotation)"
+          >
+            {{ props.row.request.quotation?.code }}
+          </span>
+        </q-td>
+
         <q-td v-if="stepOn" class="text-left">
           <div v-if="props.row._template" class="column text-left">
             <span>{{ props.row._template.templateName }}</span>
@@ -528,14 +538,7 @@ function disableCheckAll() {
             :expiration-date="new Date(props.row.request.quotation?.dueDate)"
           />
         </q-td>
-        <q-td>
-          <span
-            class="cursor-pointer link"
-            @click="goToQuotation(props.row.request.quotation)"
-          >
-            {{ props.row.request.quotation?.code }}
-          </span>
-        </q-td>
+
         <q-td>
           <BadgeComponent
             v-if="props.row.request.quotation?.urgent"
diff --git a/src/pages/09_task-order/constants.ts b/src/pages/09_task-order/constants.ts
index 07bc01d5..d497cef2 100644
--- a/src/pages/09_task-order/constants.ts
+++ b/src/pages/09_task-order/constants.ts
@@ -170,6 +170,12 @@ export const employeeColumn = [
     label: 'requestList.requestListCode',
     field: 'code',
   },
+  {
+    name: 'quotationCode',
+    align: 'center',
+    label: 'requestList.quotationCode',
+    field: 'quotationCode',
+  },
   {
     name: 'fullName',
     align: 'center',
@@ -200,12 +206,6 @@ export const employeeColumn = [
     label: 'general.numberOfDay',
     field: 'day',
   },
-  {
-    name: 'quotationCode',
-    align: 'center',
-    label: 'requestList.quotationCode',
-    field: 'quotationCode',
-  },
 ] as const satisfies QTableProps['columns'];
 
 export const productColumn = [