From ced8a9c61fae4a18793916fae1574d5cd062be06 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Mon, 25 Sep 2023 14:58:38 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=96=E0=B8=B2=E0=B8=99=E0=B8=B0=E0=B9=83=E0=B8=99?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=A3=E0=B8=AD=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=AA=E0=B8=99=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=82=E0=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/1_Proposals/listProposals.vue  | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/modules/07_insignia/components/1_Proposals/listProposals.vue b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
index bfc27cf7f..511a9c20d 100644
--- a/src/modules/07_insignia/components/1_Proposals/listProposals.vue
+++ b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
@@ -75,7 +75,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "statusRoyal",
     align: "center",
-    label: "สถานะราชกิจจานุเบกษา",
+    label: "สถานะ",
     sortable: false,
     field: "statusRoyal",
     headerStyle: "font-size: 14px",
@@ -108,6 +108,7 @@ const fetchData = async () => {
         period_isActive: e.period_isActive,
         period_doc: e.period_doc,
         period_status: e.period_status.result,
+        statusRoyal: 'กำลังดำเนินการ'
       }));
     })
     .catch((e) => {
@@ -311,6 +312,13 @@ const paginationLabel = (start: string, end: string, total: string) => {
               >
                 {{ props.row.period_end }}
               </q-td>
+              <q-td
+                key="statusRoyal"
+                :props="props"
+                @click="clickEdit(props.row)"
+              >
+                {{ props.row.statusRoyal }}
+              </q-td>
               <q-td
                 key="period_isActive"
                 :props="props"
@@ -331,22 +339,6 @@ const paginationLabel = (start: string, end: string, total: string) => {
                   @click="clickEdit(props.row)"
                 />
               </q-td>
-              <q-td key="statusRoyal" :props="props">
-                <q-icon
-                  v-if="props.row.statusRoyal == 'ยังไม่ได้เสนอ'"
-                  name="mdi-timer-sand"
-                  color="orange"
-                  class="text-h5"
-                  @click="clickEdit(props.row)"
-                />
-                <q-icon
-                  v-else
-                  name="mdi-check"
-                  color="positive"
-                  class="text-h5"
-                  @click="clickEdit(props.row)"
-                />
-              </q-td>
               <q-td auto-width>
                 <q-btn
                   dense