From 9245500953465c155c53ffdd3e5dc7cd8cf43245 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 9 Feb 2024 11:54:09 +0700
Subject: [PATCH] no message

---
 .../components/DialogAddPosition.vue          | 22 ++++++++--
 .../components/DialogFormPosition.vue         | 42 ++++++++++---------
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogAddPosition.vue b/src/modules/02_organizationalNew/components/DialogAddPosition.vue
index 2e54a91bc..d71360d6d 100644
--- a/src/modules/02_organizationalNew/components/DialogAddPosition.vue
+++ b/src/modules/02_organizationalNew/components/DialogAddPosition.vue
@@ -25,6 +25,8 @@ import type {
 
 const props = defineProps({
   emitSearch: Function,
+  data: Object,
+  levelOp: Object,
 });
 const modal = defineModel<boolean>("modalAdd", { required: true });
 const dataLevel = ref<any>();
@@ -216,10 +218,24 @@ async function fetchExecutive() {
 
 watch(
   () => modal.value,
-  () => {
+ async () => {
     if (modal.value === true) {
-      fetchType();
-      fetchExecutive();
+      await fetchType();
+      await fetchExecutive();
+      if (props.data) {
+        const dataList = props.data;
+        console.log(dataList)
+        updateSelectType(dataList.posTypeId);
+        formPositionSelect.positionId = dataList.id;
+        formPositionSelect.positionName = dataList.positionName;
+        formPositionSelect.positionField = dataList.positionField;
+        formPositionSelect.positionType = dataList.posTypeId;
+        formPositionSelect.positionLevel = dataList.posLevelId;
+        formPositionSelect.positionExecutive = dataList.posExecutiveId;
+        formPositionSelect.positionExecutiveField =
+          dataList.positionExecutiveField;
+        formPositionSelect.positionArea = dataList.positionArea;
+      }
     }
   }
 );
diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
index 32472ecc4..04aaa3f15 100644
--- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
@@ -41,7 +41,7 @@ const isReadonly = ref<boolean>(false); // อ่านได้อย่าง
 const isDisValidate = ref<boolean>(false);
 const isPosition = ref<boolean>(false);
 const succession = ref<boolean>(false);
-
+const dataCopy = ref<any>()
 const $q = useQuasar();
 const mixin = useCounterMixin();
 const {
@@ -51,6 +51,7 @@ const {
   messageError,
   success,
   dialogRemove,
+  dialogMessageNotify
 } = mixin;
 const selected = ref<any>([]);
 const search = ref<string>("");
@@ -70,7 +71,7 @@ const levelOpsMain = ref<DataOption[]>([]);
 const executiveOpsMain = ref<DataOption[]>([]);
 const executiveOps = ref<DataOption[]>([]);
 const typeOps = ref<DataOption[]>([]);
-const levelOps = ref<DataOption[]>([]);
+const levelOps = ref<any[]>([]);
 
 const listMenu = ref<ListMenu[]>([
   {
@@ -314,9 +315,12 @@ function validateForm() {
     }
   }
   if (hasError.every((result) => result === true)) {
-    onSubmit();
-  } else {
-  }
+    if(rows.value.length == 0 ){
+      dialogMessageNotify($q,'กรุณาเลือกตำแหน่งอย่างน้อย 1 ตำแหน่ง')
+    }else{
+      onSubmit();
+    }
+  } 
 }
 
 /** ฟังก์ชั่นตรวจสอบความถูกต้องของข้อมูลในฟอร์ม */
@@ -439,6 +443,7 @@ function onSubmitSelectEdit() {
 /** input ค้นหา */
 const searchRef = ref<any>(null);
 async function searchInput() {
+  console.log(1)
   searchRef.value.validate();
   if (!searchRef.value.hasError) {
     showLoader();
@@ -474,15 +479,9 @@ function updateSelectType(val: string) {
  * @param data ข้อมูลตำแหน่ง
  */
 function copyDetiail(data: RowDetailPositions) {
-  updateSelectType(data.posTypeId);
-  formPositionSelect.positionId = data.positionId;
-  formPositionSelect.positionName = data.positionName;
-  formPositionSelect.positionField = data.positionField;
-  formPositionSelect.positionType = data.posTypeId;
-  formPositionSelect.positionLevel = data.posLevelId;
-  formPositionSelect.positionExecutive = data.posExecutiveId;
-  formPositionSelect.positionExecutiveField = data.positionExecutiveField;
-  formPositionSelect.positionArea = data.positionArea;
+  
+  modalAdd.value = true
+  dataCopy.value = data
 }
 
 /**
@@ -571,10 +570,11 @@ function close() {
   isPosition.value = false;
 }
 
-function emitSearch(keyword: string, typeSelect: string) {
-  search.value = keyword;
-  type.value = typeSelect;
-  searchInput();
+async function emitSearch(keyword: string, typeSelect: string) {
+  search.value = await keyword;
+  type.value = await typeSelect;
+  
+ await searchInput();
 }
 </script>
 
@@ -897,5 +897,9 @@ function emitSearch(keyword: string, typeSelect: string) {
           </q-card-actions> -->
     </q-card>
   </q-dialog>
-  <DialogAddPosition v-model:modalAdd="modalAdd" :emitSearch="emitSearch" />
+  <DialogAddPosition 
+  v-model:modalAdd="modalAdd" 
+  :emitSearch="emitSearch" 
+  :data="dataCopy"
+  />
 </template>