From 345f8f47e9368bb1f8d58260398145ea14d31292 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Wed, 7 Feb 2024 13:49:01 +0700
Subject: [PATCH] no message

---
 .../components/position/DialogAddPosition.vue              | 2 +-
 .../01_metadataNew/interface/request/position/index.ts     | 2 +-
 .../02_organizationalNew/components/DialogFormPosition.vue | 7 +------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/modules/01_metadataNew/components/position/DialogAddPosition.vue b/src/modules/01_metadataNew/components/position/DialogAddPosition.vue
index b28f5455b..d35679ae7 100644
--- a/src/modules/01_metadataNew/components/position/DialogAddPosition.vue
+++ b/src/modules/01_metadataNew/components/position/DialogAddPosition.vue
@@ -86,7 +86,7 @@ function onSubmitSelectEdit() {
         posDictField: formPositionSelect.positionField, //สายงาน
         posTypeId: formPositionSelect.positionType, //*ประเภทตำแหน่ง
         posLevelId: formPositionSelect.positionLevel, //*ระดับตำแหน่ง
-        posExecutiveId: formPositionSelect.positionExecutive, //ตำแหน่งทางการบริหาร
+        posExecutiveId: formPositionSelect.positionExecutive == '' ? null:formPositionSelect.positionExecutive, //ตำแหน่งทางการบริหาร
         posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร
         posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา
       };
diff --git a/src/modules/01_metadataNew/interface/request/position/index.ts b/src/modules/01_metadataNew/interface/request/position/index.ts
index a2e118be1..3471ddd38 100644
--- a/src/modules/01_metadataNew/interface/request/position/index.ts
+++ b/src/modules/01_metadataNew/interface/request/position/index.ts
@@ -13,7 +13,7 @@ interface FormPositionSelectDialog {
   positionField: string;
   positionType: string;
   positionLevel: string;
-  positionExecutive: string;
+  positionExecutive: string|null;
   positionExecutiveField: string;
   positionArea: string;
 }
diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
index ee1f06f8f..9d4811211 100644
--- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
@@ -46,7 +46,6 @@ const {
   messageError,
   success,
   dialogRemove,
-  dialogMessageNotify,
 } = mixin;
 const selected = ref<any>([]);
 const search = ref<string>("");
@@ -310,11 +309,7 @@ function validateForm() {
     }
   }
   if (hasError.every((result) => result === true)) {
-    if (rows.value.length !== 0) {
-      onSubmit();
-    } else {
-      dialogMessageNotify($q, "กรุณาเลือกตำแหน่งอย่างน้อย 1 ตำแหน่ง");
-    }
+    onSubmit();
   } else {
   }
 }