From 4c89169e9e61a3d0f3b7554e9e70960215ef7b5e Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 13 Sep 2024 10:24:06 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20list=20=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8=E0=B9=81=E0=B8=95=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87=E0=B8=95=E0=B8=B1=E0=B9=89=E0=B8=87=20&=20=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=20fact=20=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B9=81?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B9=83=E0=B8=95=E0=B9=89=E0=B8=A5=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B9=80=E0=B8=8B=E0=B9=87=E0=B8=99=E0=B8=95=E0=B9=8C?=
 =?UTF-8?q?=E0=B9=83=E0=B8=99=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogFormPosition.vue         | 65 +++++++++++++++----
 .../02_organization/components/TreeTable.vue  |  1 +
 .../02_organization/interface/index/Main.ts   |  2 +
 .../components/PersonalList/Table.vue         |  1 +
 4 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/src/modules/02_organization/components/DialogFormPosition.vue b/src/modules/02_organization/components/DialogFormPosition.vue
index 22d155045..fc6f4c5e1 100644
--- a/src/modules/02_organization/components/DialogFormPosition.vue
+++ b/src/modules/02_organization/components/DialogFormPosition.vue
@@ -54,6 +54,7 @@ const props = defineProps({
   fetchDataTable: Function,
   getSummary: Function,
   shortName: { type: String, required: true },
+  dataTree: { type: Object, default: () => [] },
 });
 
 const isReadonly = ref<boolean>(false); // อ่านได้อย่างเดียว
@@ -83,7 +84,8 @@ const formData = reactive<FormDataPosition>({
   suffixNo: "",
   reason: "",
   isDirector: false,
-  isOfficer: false,
+  isStaff: false,
+  positionSign: "",
 });
 
 //ฟอร์มตำแหน่ง
@@ -222,7 +224,8 @@ async function fetchPosition(id: string) {
       formData.suffixNo = data.posMasterNoSuffix;
       formData.reason = data.reason;
       formData.isDirector = data.isDirector;
-      formData.isOfficer = data.isOfficer;
+      formData.isStaff = data.isStaff;
+      formData.positionSign = data.positionSign;
       rows.value = data.positions;
     })
     .catch((err) => {
@@ -263,7 +266,9 @@ function onSubmit() {
         posMasterNoSuffix: formData.suffixNo, //Suffix หลังตำแหน่งเลขที่ เช่น ช.
         reason: formData.reason, //Suffix หลังตำแหน่งเลขที่ เช่น ช.
         isDirector: formData.isDirector,
-        isOfficer: formData.isOfficer ? formData.isOfficer : false,
+        isStaff: formData.isStaff ? formData.isStaff : false,
+        isOfficer: false,
+        positionSign: formData.positionSign,
         orgRootId: props.orgLevel === 0 ? props.treeId : null, //Id สำนัก
         orgChild1Id: props.orgLevel === 1 ? props.treeId : null,
         orgChild2Id: props.orgLevel === 2 ? props.treeId : null,
@@ -429,6 +434,8 @@ async function clearFormPositionSelect() {
   formData.isDirector = false;
   rowsPositionSelect.value = [];
   isPosition.value = false;
+  formData.isStaff = false;
+  formData.positionSign = "";
 }
 
 /**
@@ -478,6 +485,17 @@ watch(
     }
   }
 );
+
+watch(
+  () => formData.isDirector,
+  (newData, oldData) => {
+    console.log("oldData", oldData);
+    console.log("newData", newData);
+    if (newData === true) {
+      formData.positionSign = "ผู้อำนวยการ" + props.dataTree?.orgTreeName;
+    }
+  }
+);
 </script>
 
 <template>
@@ -644,14 +662,39 @@ watch(
                       </template>
                     </d-table>
 
-                    <div class="row col-12 q-mt-sm">
-                      <q-checkbox
-                        keep-color
-                        color="primary"
-                        dense
-                        v-model="formData.isDirector"
-                        label="ผู้อำนวยการ/หัวหน้า"
-                      />
+                    <div class="row q-mt-sm">
+                      <div class="col-12">
+                        <q-checkbox
+                          keep-color
+                          color="primary"
+                          dense
+                          v-model="formData.isDirector"
+                          label="ผู้อำนวยการ/หัวหน้า"
+                        />
+
+                        <q-checkbox
+                          keep-color
+                          color="primary"
+                          dense
+                          v-model="formData.isStaff"
+                          label="การเจ้าหน้าที่"
+                          class="q-ml-sm"
+                        />
+                      </div>
+
+                      <div
+                        v-if="formData.isDirector"
+                        class="col-6 q-mt-sm q-mb-sm"
+                      >
+                        <q-input
+                          v-model="formData.positionSign"
+                          :class="inputEdit(isReadonly)"
+                          dense
+                          outlined
+                          for="#positionSign"
+                          label="ตำแหน่งใต้ลายเซ็นต์"
+                        />
+                      </div>
                     </div>
                   </div>
                 </div>
diff --git a/src/modules/02_organization/components/TreeTable.vue b/src/modules/02_organization/components/TreeTable.vue
index b395639ac..2759fd81d 100644
--- a/src/modules/02_organization/components/TreeTable.vue
+++ b/src/modules/02_organization/components/TreeTable.vue
@@ -847,6 +847,7 @@ watch(
   <!-- อัตรากำลัง -->
   <DialogFormPosotion
     :modal="dialogPosition"
+    :data-tree="mainTree"
     :shortName="shortName"
     :close="onClickPosition"
     :orgLevel="orgLevel"
diff --git a/src/modules/02_organization/interface/index/Main.ts b/src/modules/02_organization/interface/index/Main.ts
index 284caa057..98447c22c 100644
--- a/src/modules/02_organization/interface/index/Main.ts
+++ b/src/modules/02_organization/interface/index/Main.ts
@@ -39,6 +39,8 @@ interface FormDataPosition {
   reason?: string;
   isDirector?: boolean;
   isOfficer?: boolean;
+  isStaff?: boolean;
+  positionSign?: string;
 }
 
 interface FormDataNewStructure {
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index e9fd76e4c..06793e266 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -876,6 +876,7 @@ onMounted(async () => {
 
                   <q-item
                     v-if="
+                      props.row.bmaOfficer == 'บุคคลภายนอก' &&
                       roleAdmin &&
                       props.row.draft !== 'ส่งตัวแล้ว' &&
                       props.row.statusId !== 'DISCLAIM' &&