แก้ไข + เพิ่มเงื่อนไข ทะเบียนประวัติลูกจ้าง

src/modules/02_organizational/views/MainTreeEmployee.vue

@@ -746,7 +746,7 @@ import type { QTableProps } from "quasar";
 
 const $q = useQuasar(); // show dialog
 const mixin = useCounterMixin();
-const { date2Thai, success, modalError, messageError, showLoader, hideLoader } =
+const { fails, success, modalError, messageError, showLoader, hideLoader } =
   mixin;
 const store = useOrganizationalDataStore();
 const { organizationalData, changeOrganizationalColumns } = store;
@@ -974,7 +974,6 @@ onMounted(async () => {
 });
 
 const onSelected = async (id: string) => {
-  //   await fetchPositionNumber(id);
   organizationId.value = id;
 };
 
@@ -1077,7 +1076,10 @@ const fetchData = async () => {
           positionEmployeeStatus: r.positionEmployeeStatus,
           positionMasterUserNote: r.positionMasterUserNote,
           qualification: r.qualification,
-          organizationId: r.organizationId,
+          organizationId:
+            r.organizationId == "00000000-0000-0000-0000-000000000000"
+              ? null
+              : r.organizationId,
         });
       });
     })
@@ -1394,12 +1396,18 @@ const clickSave = async () => {
       if (modalEdit.value) {
         await editData();
       } else {
-        await saveData();
+        if (selected.value == "") {
+          fails($q, "กรุณาเลือกหน่วยงาน");
+        } else {
+          //   console.log("save");
+          await saveData();
+        }
+        // await saveData();
       }
     }
   });
+  console.log(selected.value);
 };
-
 /**
  * บันทึกเพิ่มข้อมูล
  */
@@ -1439,6 +1447,7 @@ const saveData = async () => {
       isActive: isActive.value,
       isCondition: isCondition.value,
       conditionNote: conditionNote.value,
+      organizationId: organizationId.value,
     })
     .then((res) => {
       success($q, "บันทึกข้อมูลร่างสำเร็จ");