From 07b1e6cd443c6323a73214737b5eea71c1ceb0dc Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Fri, 20 Dec 2024 10:38:25 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=9C=E0=B8=A5?=
 =?UTF-8?q?=20=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/2_InvestigateFacts/CalandarDialog.vue          | 4 ++++
 .../components/3_InvestigateDisciplinary/Form.vue             | 4 ++--
 src/modules/18_command/components/DialogCreateCommand.vue     | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue b/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue
index 2484ad824..ec8805462 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue
@@ -69,6 +69,7 @@ const calendarOptions = ref<CalendarOptions>({
   eventTextColor: "#000000",
   eventBorderColor: "#50a5fc",
   displayEventTime: false,
+  eventStartEditable: false,
   editable: true,
   events: [],
 });
@@ -233,6 +234,9 @@ watch(
   </q-dialog>
 </template>
 <style scope lang="scss">
+:deep(.fc-daygrid-event-harness) {
+  pointer-events: none;
+}
 .main-content {
   height: 85vh;
 }
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 98afee391..fea7065a4 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -398,8 +398,8 @@ function returnCount(num: number) {
   countNum.value = num;
 }
 
-async function addPerson(data: any) {
-  await mainStore.fetchData(data);
+async function addPerson(data: any,type?:string) {
+  await mainStore.fetchData(data,type);
   changeFormData();
   toggleModal();
 }
diff --git a/src/modules/18_command/components/DialogCreateCommand.vue b/src/modules/18_command/components/DialogCreateCommand.vue
index 4f69b1630..1bfc31e58 100644
--- a/src/modules/18_command/components/DialogCreateCommand.vue
+++ b/src/modules/18_command/components/DialogCreateCommand.vue
@@ -209,7 +209,10 @@ function addPersonalToCommand(isRedirect: boolean) {
       firstName: e.firstName,
       lastName: e.lastName,
       citizenId: e.citizenId,
+      profileId: e.profileId,
       rootId: e.rootId,
+      ...(e.remarkVertical ? { remarkVertical: e.remarkVertical } : {}),
+      ...(e.remarkHorizontal ? { remarkHorizontal: e.remarkHorizontal } : {}),
     }));
     const body = {
       commandId: selected.value[0].id,