From 5c84afa6a8a72e05d29c36947067a0e4f55defc4 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Fri, 26 Jul 2024 17:00:34 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A2=E0=B9=89=E0=B8=B2=E0=B8=A2=E0=B9=84?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=84=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ListRetirement/TableList.vue   |  78 +++++++------
 .../components/1_Proposals/listProposals.vue  |  19 +---
 .../07_insignia/components/2_Manage/Tab1.vue  | 106 +++++++++---------
 .../components/4_Allocate/OrgList.vue         |  33 +++---
 src/modules/09_leave/views/RoundMain.vue      |  23 ++--
 .../SalaryEmployeeLists/TableTypePending.vue  |  55 ++++-----
 .../SalaryLists/TableTypePending.vue          |  64 +++++------
 7 files changed, 181 insertions(+), 197 deletions(-)

diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index 92ff9044a..abf7be3e9 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -590,14 +590,6 @@ function updatemodalPersonal(modal: boolean) {
         >
           <template v-slot:header="props">
             <q-tr :props="props">
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                <div class="text-grey-7 text-weight-medium">
-                  <span class="row">{{ col.title }}</span>
-                  <span class="row" style="font-size: 12px">{{
-                    col.subtitle
-                  }}</span>
-                </div>
-              </q-th>
               <q-th auto-width />
               <q-th
                 auto-width
@@ -609,7 +601,6 @@ function updatemodalPersonal(modal: boolean) {
                   statusUpload !== true
                 "
               />
-              <q-th auto-width v-else></q-th>
               <q-th
                 auto-width
                 v-if="
@@ -620,7 +611,15 @@ function updatemodalPersonal(modal: boolean) {
                   statusUpload !== true
                 "
               />
-              <q-th auto-width v-else></q-th>
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                <div class="text-grey-7 text-weight-medium">
+                  <span class="row">{{ col.title }}</span>
+                  <span class="row" style="font-size: 12px">{{
+                    col.subtitle
+                  }}</span>
+                </div>
+              </q-th>
+
             </q-tr>
           </template>
           <template v-slot:body="props">
@@ -630,34 +629,7 @@ function updatemodalPersonal(modal: boolean) {
               :style="props.row.profileId === profileId && 'color: #26a69a;'"
               @click.stop="onclickViewinfo(props.row.profileId)"
             >
-              <q-td key="order" :props="props">{{ props.row.order }} </q-td>
-              <q-td key="name" :props="props"
-                >{{ props.row.prefix ? props.row.prefix : ""
-                }}{{ props.row.firstName ? props.row.firstName : "" }}
-                {{ props.row.lastName ? props.row.lastName : "" }}</q-td
-              >
-
-              <q-td key="position" :props="props">{{
-                props.row.position ? props.row.position : "-"
-              }}</q-td>
-              <q-td key="positionType" :props="props"
-                >{{ props.row.positionType ? props.row.positionType : "-" }}
-                {{
-                  props.row.positionLevel
-                    ? " (" + props.row.positionLevel + ")"
-                    : ""
-                }}
-              </q-td>
-
-              <q-td key="positionNumber" :props="props">{{
-                props.row.positionNumber ? props.row.positionNumber : "-"
-              }}</q-td>
-
-              <q-td class="table_ellipsis" key="organization" :props="props">{{
-                props.row.organization ? props.row.organization : "-"
-              }}</q-td>
-
-              <q-td auto-width>
+            <q-td auto-width>
                 <q-btn
                   v-if="
                     (props.row.remove === 'EDIT' ||
@@ -704,7 +676,6 @@ function updatemodalPersonal(modal: boolean) {
                   <q-tooltip>กรอกเหตุผล</q-tooltip>
                 </q-btn>
               </q-td>
-              <q-td auto-width v-else></q-td>
               <q-td
                 auto-width
                 v-if="
@@ -730,7 +701,34 @@ function updatemodalPersonal(modal: boolean) {
                   ><q-tooltip>ลบข้อมูล</q-tooltip></q-btn
                 >
               </q-td>
-              <q-td auto-width v-else> </q-td>
+              <q-td key="order" :props="props">{{ props.row.order }} </q-td>
+              <q-td key="name" :props="props"
+                >{{ props.row.prefix ? props.row.prefix : ""
+                }}{{ props.row.firstName ? props.row.firstName : "" }}
+                {{ props.row.lastName ? props.row.lastName : "" }}</q-td
+              >
+
+              <q-td key="position" :props="props">{{
+                props.row.position ? props.row.position : "-"
+              }}</q-td>
+              <q-td key="positionType" :props="props"
+                >{{ props.row.positionType ? props.row.positionType : "-" }}
+                {{
+                  props.row.positionLevel
+                    ? " (" + props.row.positionLevel + ")"
+                    : ""
+                }}
+              </q-td>
+
+              <q-td key="positionNumber" :props="props">{{
+                props.row.positionNumber ? props.row.positionNumber : "-"
+              }}</q-td>
+
+              <q-td class="table_ellipsis" key="organization" :props="props">{{
+                props.row.organization ? props.row.organization : "-"
+              }}</q-td>
+
+
             </q-tr>
           </template>
           <template v-slot:pagination="scope">
diff --git a/src/modules/07_insignia/components/1_Proposals/listProposals.vue b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
index 0e60229a8..5fd87d8bb 100644
--- a/src/modules/07_insignia/components/1_Proposals/listProposals.vue
+++ b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
@@ -284,22 +284,15 @@ onMounted(async () => {
         >
           <template v-slot:header="props">
             <q-tr :props="props">
-              <q-th auto-width />
-              <q-th auto-width />
               <q-th auto-width />
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
                 <span class="text-weight-medium">{{ col.label }}</span>
               </q-th>
-
             </q-tr>
           </template>
           <template v-slot:body="props">
             <q-tr :props="props" class="cursor-pointer">
-              <q-td
-                key="period_isActive"
-                :props="props"
-                @click="clickEdit(props.row)"
-              >
+              <q-td>
                 <q-icon
                   v-if="props.row.period_isActive == true"
                   name="mdi-close"
@@ -314,8 +307,6 @@ onMounted(async () => {
                   class="text-h5"
                   @click="clickEdit(props.row)"
                 />
-              </q-td>
-              <q-td auto-width>
                 <q-btn
                   dense
                   size="12px"
@@ -327,9 +318,8 @@ onMounted(async () => {
                 >
                   <q-tooltip>ผู้ได้รับเครื่องราชฯ</q-tooltip>
                 </q-btn>
-              </q-td>
-              <q-td auto-width v-if="props.row.period_doc !== null">
                 <q-btn
+                  v-if="props.row.period_doc !== null"
                   dense
                   type="a"
                   size="12px"
@@ -342,9 +332,6 @@ onMounted(async () => {
                 >
                   <q-tooltip>ดาวน์โหลดเอกสารประกอบ </q-tooltip>
                 </q-btn>
-              </q-td>
-              <q-td auto-width v-else></q-td>
-              <q-td auto-width>
                 <q-btn
                   dense
                   size="12px"
@@ -357,6 +344,7 @@ onMounted(async () => {
                   <q-tooltip>ลบข้อมูล</q-tooltip>
                 </q-btn>
               </q-td>
+
               <q-td
                 v-for="col in props.cols"
                 :key="col.id"
@@ -366,7 +354,6 @@ onMounted(async () => {
                   {{ col.value }}
                 </div>
               </q-td>
-
             </q-tr>
           </template>
         </d-table>
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 4eb60c01a..3a954ceff 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -59,8 +59,6 @@ const filterOrganizationOP = ref<any>([]);
 
 /** หัวตาราง*/
 const visibleColumns = ref<string[]>([
-  "note",
-  "warn",
   "no",
   "citizenId",
   "name",
@@ -72,26 +70,10 @@ const visibleColumns = ref<string[]>([
   "insigniaSend",
   "insigniaLevel",
   "dateSend",
+  "note",
+  "warn",
 ]);
 const columns = ref<QTableProps["columns"]>([
-  {
-    name: "note",
-    align: "left",
-    label: "หมายเหตุ",
-    sortable: false,
-    field: "",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "warn",
-    align: "left",
-    label: "แจ้งเตือน",
-    sortable: false,
-    field: "",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "no",
     align: "left",
@@ -191,6 +173,24 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "note",
+    align: "left",
+    label: "หมายเหตุ",
+    sortable: false,
+    field: "",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "warn",
+    align: "left",
+    label: "แจ้งเตือน",
+    sortable: false,
+    field: "",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
 ]);
 const columns2 = ref<QTableProps["columns"]>([
   {
@@ -1154,6 +1154,39 @@ onMounted(async () => {
                 />
               </q-td>
 
+              <q-td key="no" :props="props">
+                {{ props.rowIndex + 1 }}
+              </q-td>
+              <q-td key="citizenId" :props="props">
+                {{ props.row.citizenId ?? "-" }}
+              </q-td>
+              <q-td key="name" :props="props">
+                {{ props.row.name }}
+              </q-td>
+              <q-td key="employeeType" :props="props">
+                {{ props.row.employeeType }}
+              </q-td>
+              <q-td key="position" :props="props">
+                {{ props.row.position }}
+              </q-td>
+              <q-td key="level" :props="props">
+                {{ props.row.level }}
+              </q-td>
+              <q-td key="salary" :props="props">
+                {{ Number(props.row.salary).toLocaleString() }}
+              </q-td>
+              <q-td key="insigniaType" :props="props">
+                {{ props.row.insigniaType }}
+              </q-td>
+              <q-td key="insigniaSend" :props="props">
+                {{ props.row.insigniaSend }}
+              </q-td>
+              <q-td key="insigniaLevel" :props="props">
+                {{ props.row.insigniaLevel }}
+              </q-td>
+              <q-td key="dateSend" :props="props">
+                {{ props.row.dateSend }}
+              </q-td>
               <q-td key="note" class="text-center">
                 <q-btn
                   v-if="props.row.reason"
@@ -1188,39 +1221,6 @@ onMounted(async () => {
                   <q-tooltip>แจ้งเตือน</q-tooltip></q-btn
                 >
               </q-td>
-              <q-td key="no" :props="props">
-                {{ props.rowIndex + 1 }}
-              </q-td>
-              <q-td key="citizenId" :props="props">
-                {{ props.row.citizenId ?? "-" }}
-              </q-td>
-              <q-td key="name" :props="props">
-                {{ props.row.name }}
-              </q-td>
-              <q-td key="employeeType" :props="props">
-                {{ props.row.employeeType }}
-              </q-td>
-              <q-td key="position" :props="props">
-                {{ props.row.position }}
-              </q-td>
-              <q-td key="level" :props="props">
-                {{ props.row.level }}
-              </q-td>
-              <q-td key="salary" :props="props">
-                {{ Number(props.row.salary).toLocaleString() }}
-              </q-td>
-              <q-td key="insigniaType" :props="props">
-                {{ props.row.insigniaType }}
-              </q-td>
-              <q-td key="insigniaSend" :props="props">
-                {{ props.row.insigniaSend }}
-              </q-td>
-              <q-td key="insigniaLevel" :props="props">
-                {{ props.row.insigniaLevel }}
-              </q-td>
-              <q-td key="dateSend" :props="props">
-                {{ props.row.dateSend }}
-              </q-td>
             </q-tr>
           </template>
         </d-table>
diff --git a/src/modules/07_insignia/components/4_Allocate/OrgList.vue b/src/modules/07_insignia/components/4_Allocate/OrgList.vue
index 759765d12..f35bae995 100644
--- a/src/modules/07_insignia/components/4_Allocate/OrgList.vue
+++ b/src/modules/07_insignia/components/4_Allocate/OrgList.vue
@@ -399,29 +399,14 @@ onMounted(async () => {
         >
           <template v-slot:header="props">
             <q-tr :props="props">
+              <q-th auto-width></q-th>
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
                 <span class="text-weight-medium">{{ col.label }}</span>
               </q-th>
-              <q-th auto-width></q-th>
             </q-tr>
           </template>
           <template v-slot:body="props">
             <q-tr :props="props" class="cursor-pointer">
-              <q-td key="no" :props="props">
-                {{ props.rowIndex + 1 }}
-              </q-td>
-              <q-td key="organization" :props="props">
-                {{ props.row.organization }}
-              </q-td>
-              <q-td key="total" :props="props">
-                {{ props.row.total }}
-              </q-td>
-              <q-td key="allocate" :props="props">
-                {{ props.row.allocate }}
-              </q-td>
-              <q-td key="remain" :props="props">
-                {{ props.row.remain }}
-              </q-td>
               <q-td auto-width>
                 <q-btn
                   icon="mdi-dots-vertical"
@@ -468,6 +453,22 @@ onMounted(async () => {
                   </q-menu>
                 </q-btn>
               </q-td>
+              <q-td key="no" :props="props">
+                {{ props.rowIndex + 1 }}
+              </q-td>
+              <q-td key="organization" :props="props">
+                {{ props.row.organization }}
+              </q-td>
+              <q-td key="total" :props="props">
+                {{ props.row.total }}
+              </q-td>
+              <q-td key="allocate" :props="props">
+                {{ props.row.allocate }}
+              </q-td>
+              <q-td key="remain" :props="props">
+                {{ props.row.remain }}
+              </q-td>
+
             </q-tr>
           </template>
         </d-table>
diff --git a/src/modules/09_leave/views/RoundMain.vue b/src/modules/09_leave/views/RoundMain.vue
index a0ee5783d..5b0fe8ec6 100644
--- a/src/modules/09_leave/views/RoundMain.vue
+++ b/src/modules/09_leave/views/RoundMain.vue
@@ -189,22 +189,10 @@ onMounted(() => {
             >
               <span class="text-weight-medium">{{ col.label }}</span>
             </q-th>
-
           </q-tr>
         </template>
         <template v-slot:body="props">
           <q-tr :props="props" class="cursor-pointer">
-            <q-td auto-width>
-              
-              <q-icon
-                v-if="props.row.isDefault === true"
-                name="mdi-bookmark"
-                size="xs"
-                color="primary"
-              >
-                <q-tooltip>เวลา Default</q-tooltip>
-              </q-icon>
-            </q-td>
             <q-td>
               <q-btn
                 dense
@@ -215,6 +203,16 @@ onMounted(() => {
                 @click="onClickDelete(props.row.id)"
               />
             </q-td>
+            <q-td auto-width>
+              <q-icon
+                v-if="props.row.isDefault === true"
+                name="mdi-bookmark"
+                size="xs"
+                color="primary"
+              >
+                <q-tooltip>เวลา Default</q-tooltip>
+              </q-icon>
+            </q-td>
             <q-td
               v-for="col in props.cols"
               :key="col.name"
@@ -239,7 +237,6 @@ onMounted(() => {
                 {{ col.value }}
               </div>
             </q-td>
-
           </q-tr>
         </template>
       </d-table>
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue
index b27f18756..c26b59beb 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue
@@ -45,33 +45,7 @@ const props = defineProps({
 
 /** ข้อมูล Table*/
 const columns = ref<QTableProps["columns"]>([
-  {
-    name: "posSalary",
-    align: "center",
-    label: "ประวัติตำแหน่ง/ค่าจ้าง",
-    sortable: false,
-    field: "posSalary",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "discipline",
-    align: "center",
-    label: "วินัย",
-    sortable: false,
-    field: "discipline",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "leave",
-    align: "center",
-    label: "การลา",
-    sortable: false,
-    field: "leave",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+
   {
     name: "no",
     align: "left",
@@ -174,6 +148,33 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "posSalary",
+    align: "center",
+    label: "ประวัติตำแหน่ง/ค่าจ้าง",
+    sortable: false,
+    field: "posSalary",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "discipline",
+    align: "center",
+    label: "วินัย",
+    sortable: false,
+    field: "discipline",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "leave",
+    align: "center",
+    label: "การลา",
+    sortable: false,
+    field: "leave",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
 
 ]);
 const visibleColumns = ref<string[]>([
diff --git a/src/modules/13_salary/components/SalaryLists/TableTypePending.vue b/src/modules/13_salary/components/SalaryLists/TableTypePending.vue
index 16f50d1b3..8961f391f 100644
--- a/src/modules/13_salary/components/SalaryLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/SalaryLists/TableTypePending.vue
@@ -45,33 +45,7 @@ const props = defineProps({
 
 /** ข้อมูล Table*/
 const columns = ref<QTableProps["columns"]>([
-  {
-    name: "posSalary",
-    align: "center",
-    label: "ประวัติตำแหน่ง/เงินเดือน",
-    sortable: false,
-    field: "posSalary",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "discipline",
-    align: "center",
-    label: "วินัย",
-    sortable: false,
-    field: "discipline",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "leave",
-    align: "center",
-    label: "การลา",
-    sortable: false,
-    field: "leave",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+
   {
     name: "no",
     align: "left",
@@ -162,13 +136,37 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-
+  {
+    name: "posSalary",
+    align: "center",
+    label: "ประวัติตำแหน่ง/เงินเดือน",
+    sortable: false,
+    field: "posSalary",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "discipline",
+    align: "center",
+    label: "วินัย",
+    sortable: false,
+    field: "discipline",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "leave",
+    align: "center",
+    label: "การลา",
+    sortable: false,
+    field: "leave",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
 
 ]);
 const visibleColumns = ref<string[]>([
-  "discipline",
-  "leave",
-  "isSuspension",
+
   "no",
   "fullName",
   "posType",
@@ -179,7 +177,9 @@ const visibleColumns = ref<string[]>([
   "organization",
   "result",
   "posSalary",
-
+  "discipline",
+  "leave",
+  "isSuspension",
 ]);
 
 /** modalDialog*/