From 877809c2b441138a8330ae357667dbe4a8943f62 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 12 Jun 2024 18:12:46 +0700
Subject: [PATCH] =?UTF-8?q?updated=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=9C=E0=B8=AD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogFormPosition.vue         | 19 ++++++++++++++++---
 .../interface/index/Main.ts                   |  2 ++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
index d43ecf562..6dedbb399 100644
--- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
@@ -70,11 +70,9 @@ const optionFilter = ref<DataOption[]>([
 ]);
 
 const typeOpsMain = ref<DataOption[]>([]);
-const levelOpsMain = ref<DataOption[]>([]);
 const executiveOpsMain = ref<DataOption[]>([]);
 const executiveOps = ref<DataOption[]>([]);
 const typeOps = ref<DataOption[]>([]);
-const levelOps = ref<any[]>([]);
 
 const listMenu = ref<ListMenu[]>([
   {
@@ -99,7 +97,6 @@ const listMenu = ref<ListMenu[]>([
 
 const rows = ref<RowDetailPositions[]>([]);
 const rowsPositionSelect = ref<RowDetailPositions[]>([]);
-const ocLevelOp = ref<DataOption[]>([]);
 
 const prefixNoRef = ref<Object | null>(null);
 const positionNoRef = ref<Object | null>(null);
@@ -118,6 +115,8 @@ const formData = reactive<FormDataPosition>({
   positionNo: "",
   suffixNo: "",
   reason: "",
+  isDirector: false,
+  isOfficer: false,
 });
 
 const formPositionSelect = reactive<FormPositionSelect>({
@@ -241,6 +240,8 @@ async function fetchPosition(id: string) {
       formData.positionNo = data.posMasterNo;
       formData.suffixNo = data.posMasterNoSuffix;
       formData.reason = data.reason;
+      formData.isDirector = data.isDirector;
+      formData.isOfficer = data.isOfficer;
       rows.value = data.positions;
     })
     .catch((err) => {
@@ -371,6 +372,8 @@ function onSubmit() {
       posMasterNo: Number(formData.positionNo), //*เลขที่ตำแหน่ง เป็นตัวเลข
       posMasterNoSuffix: formData.suffixNo, //Suffix หลังเลขที่ตำแหน่ง เช่น ช.
       reason: formData.reason, //Suffix หลังเลขที่ตำแหน่ง เช่น ช.
+      isDirector: formData.isDirector,
+      isOfficer: formData.isOfficer ? formData.isOfficer : false,
       orgRootId: props.orgLevel === 0 ? props.treeId : null, //Id สำนัก
       orgChild1Id: props.orgLevel === 1 ? props.treeId : null,
       orgChild2Id: props.orgLevel === 2 ? props.treeId : null,
@@ -779,6 +782,16 @@ async function emitSearch(keyword: string, typeSelect: string) {
                         </q-tr>
                       </template>
                     </d-table>
+
+                    <div class="row col-12 q-mt-sm">
+                      <q-checkbox
+                        keep-color
+                        color="primary"
+                        dense
+                        v-model="formData.isDirector"
+                        label="ผู้อำนวยการ"
+                      />
+                    </div>
                   </div>
                 </div>
                 <q-separator />
diff --git a/src/modules/02_organizationalNew/interface/index/Main.ts b/src/modules/02_organizationalNew/interface/index/Main.ts
index cc8103605..bc69b1890 100644
--- a/src/modules/02_organizationalNew/interface/index/Main.ts
+++ b/src/modules/02_organizationalNew/interface/index/Main.ts
@@ -32,6 +32,8 @@ interface FormDataPosition {
   positionNo: string;
   suffixNo: string;
   reason?: string;
+  isDirector?: boolean;
+  isOfficer?: boolean;
 }
 
 interface FormDataNewStructure {