From 77612c141577db87099b6a4d557eb543a4135f2d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 3 Jul 2025 10:27:57 +0700
Subject: [PATCH 1/4] =?UTF-8?q?fix=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3=20workflow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Workflow/Main.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Workflow/Main.vue b/src/components/Workflow/Main.vue
index 3f87280bf..e1ba05fef 100644
--- a/src/components/Workflow/Main.vue
+++ b/src/components/Workflow/Main.vue
@@ -250,7 +250,7 @@ defineExpose({
                   @click.prevent="
                     (modalSelectPerson = true), (typeSelectPerson = 'operate')
                   "
-                  label="ส่งยังไปผู้บังคับบัญชา"
+                  label="ส่งไปยังผู้บังคับบัญชา"
                   color="public"
                 />
                 <q-btn

From 8ea653b6c141e0e4aa0aec7187272e89385a4b01 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 3 Jul 2025 10:35:08 +0700
Subject: [PATCH 2/4] =?UTF-8?q?fix=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=20Class=20text-html=20Popup=20"=E0=B8=AA=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87=E0=B9=84=E0=B8=9B=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87"=20=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A3=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=9A=E0=B9=82=E0=B8=AD=E0=B8=99=20=E0=B8=82=E0=B9=89?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B9=83=E0=B8=99=E0=B8=84?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A5=E0=B8=B1=E0=B8=A1=E0=B8=99=E0=B9=8C=20"?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B4=E0=B8=A1/=E0=B8=AA=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=87=E0=B8=81=E0=B8=B1=E0=B8=94=E0=B9=80=E0=B8=94=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=A1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_placement/components/Receive/DialogOrders.vue     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/modules/05_placement/components/Receive/DialogOrders.vue b/src/modules/05_placement/components/Receive/DialogOrders.vue
index cf552fc72..5751e001e 100644
--- a/src/modules/05_placement/components/Receive/DialogOrders.vue
+++ b/src/modules/05_placement/components/Receive/DialogOrders.vue
@@ -255,7 +255,7 @@ watchEffect(() => {
 </script>
 <template>
   <q-dialog v-model="props.modal" persistent>
-    <q-card style="width: 1200px; max-width: 80vw">
+    <q-card style="min-width: 80vw">
       <DialogHeader :tittle="'ส่งไปออกคำสั่งรับโอน'" :close="clickClose" />
       <q-separator />
       <q-card-section>
@@ -336,6 +336,13 @@ watchEffect(() => {
                       {{ props.rowIndex + 1 }}
                     </div>
 
+                    <div
+                      v-else-if="col.name === 'organizationNameOld'"
+                      class="text-html"
+                    >
+                      {{ col.value ? col.value : "-" }}
+                    </div>
+
                     <div v-else-if="col.name == 'organizationName'">
                       {{ props.row.position !== null ? props.row.position : ""
                       }}{{

From 3e8784eedfd3230740d4b71760c3eff90ad72252 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 3 Jul 2025 10:36:57 +0700
Subject: [PATCH 3/4] =?UTF-8?q?fix=20visibleColumns=20=20=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=B7=E0=B8=A1-=E0=B8=84=E0=B8=B7=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=8A=E0=B8=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/07_insignia/components/5_Borrow/DialogForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
index 30cee4eb5..76ae5e91f 100644
--- a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
+++ b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
@@ -462,6 +462,7 @@ onMounted(() => {
                     ref="table"
                     :columns="columns"
                     :rows="rows"
+                    :visible-columns="visibleColumns"
                     row-key="id"
                     flat
                     bordered

From 23534b8206c06ebcfd96090d09c02a7e96e454cf Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 3 Jul 2025 11:00:46 +0700
Subject: [PATCH 4/4] =?UTF-8?q?fix=20bug=20=E0=B9=82=E0=B8=84=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=20?=
 =?UTF-8?q?=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B8=A3=E0=B9=88=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/02_organization/components/TableMain.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/modules/02_organization/components/TableMain.vue b/src/modules/02_organization/components/TableMain.vue
index 2c6a10901..a22e8c3c8 100644
--- a/src/modules/02_organization/components/TableMain.vue
+++ b/src/modules/02_organization/components/TableMain.vue
@@ -833,6 +833,7 @@ watch(
                   ? `(${props.row.conditionReason})`
                   : ""
               }}
+
               <q-btn
                 v-if="props.row.positionIsSelected != 'ว่าง'"
                 size="12px"
@@ -843,7 +844,10 @@ watch(
                 round
                 @click="
                   (modalPerson = true),
-                    (personalId = props.row.current_holderId)
+                    (personalId =
+                      store.typeOrganizational === 'draft'
+                        ? props.row.next_holderId
+                        : props.row.current_holderId)
                 "
               >
                 <q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>