Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

src/modules/11_discipline/components/1_Complaint/EditPage.vue

@@ -207,6 +207,7 @@ async function onSubmit(data: any) {
       messageError($q, e);
     })
     .finally(async () => {
+      getData();
       hideLoader();
     });
   // router.push(`/discipline/complaints`);

src/modules/11_discipline/components/1_Complaint/Form.vue

@@ -184,10 +184,9 @@ function onSubmit() {
     $q,
     async () => {
       if (mainStore.rowsAdd) {
-        formData.persons = mainStore.rowsAdd;
-        props.onSubmit(formData);
-      } else props.onSubmit(formData);
-      // props.onSubmit(formData);
+        formData.persons = await mainStore.rowsAdd;
+      } 
+      await props.onSubmit(formData);
       isSave.value = false;
     },
     "ยืนยันการบันทึกข้อมูล",
@@ -321,10 +320,10 @@ function getOc() {
  */
 function deletePerson(id: string) {
   // dialogRemove($q, () => {
-  changeFormData();
   const dataRow = mainStore.rowsAdd;
   const updatedRows = dataRow.filter((item: any) => item.personId !== id);
   mainStore.rowsAdd = updatedRows;
+  changeFormData();
   // });
 }
 
@@ -984,11 +983,11 @@ onMounted(() => {
   <!-- Popup ผู้ถูกร้องเรียน -->
   <DialogAddPersonal
     title="ผู้ถูกร้องเรียน"
-    :mainData="mainStore.rowsAdd"
     :modal="modal"
     btn-title="เพิ่มรายชื่อผู้ถูกร้องเรียน"
     :close="toggleModal"
     :save="addPerson"
+    :selected-data="mainStore.rowsAdd"
     @returnData="handleSave"
   />
 </template>

src/modules/11_discipline/components/1_Complaint/MainPage.vue

@@ -9,7 +9,6 @@ import { useComplainstDataStore } from "@/modules/11_discipline/store/Complaints
 import TableComplaint from "@/modules/11_discipline/components/1_Complaint/TableComplaint.vue";
 import config from "@/app.config";
 import http from "@/plugins/http";
-import { max } from "moment";
 
 const $q = useQuasar();
 const mixin = useCounterMixin();