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

src/modules/02_organizationalNew/components/DialogFormDateTime.vue

@@ -88,19 +88,19 @@ function onClickPublish() {
   dialogConfirm(
     $q,
     () => {
-      alert("get");
-      // showLoader()
-      // http
-      // .get(config.API.organizationPublishGet)
-      // .then((res)=>{
-      props.close?.();
-      // })
-      // .catch((e)=>{
-      //   messageError($q,e)
-      // })
-      // .finally(()=>{
-      //   hideLoader()
-      // })
+      showLoader();
+      http
+        .get(config.API.organizationPublishGet)
+        .then((res) => {
+          props.fetchActive();
+          props.close?.();
+        })
+        .catch((e) => {
+          messageError($q, e);
+        })
+        .finally(() => {
+          hideLoader();
+        });
     },
     "ยืนยันการเผยเเพร่ข้อมูล",
     "ต้องการยืนยันการเผยเเพร่ข้อมูลนี้ใช่หรือไม่?"
@@ -174,12 +174,7 @@ watch(
           </q-card-section>
           <q-separator />
           <q-card-actions align="right">
-            <q-btn
-              flat
-              color="blue-7"
-              icon="public"
-              @click="onClickPublish()"
-            >
+            <q-btn flat color="blue-7" icon="public" @click="onClickPublish()">
               <q-tooltip>เผยแพร่ข้อมูลทันที</q-tooltip>
             </q-btn>
             <q-space />

src/modules/02_organizationalNew/components/DialogSortPosition.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive, watch,defineProps } from "vue";
+import { ref, watch, defineProps } from "vue";
 import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -44,7 +44,7 @@ function save() {
   dialogConfirm($q, () => {
     const data = rows.value;
     const dataId = data.map((item: any) => item.id);
-    showLoader()
+    showLoader();
     http
       .post(config.API.orgPosSort, {
         id: store.treeId,
@@ -54,13 +54,13 @@ function save() {
       .then((res) => {
         modal.value = false;
         success($q, "บันทึกข้อมูลสำเร็จ");
-        props.fetchDataTable?.(store.treeId,store.level,false)
+        props.fetchDataTable?.(store.treeId, store.level, false);
       })
       .catch((e) => {
         messageError($q, e);
       })
       .finally(() => {
-        hideLoader()
+        hideLoader();
       });
   });
 }
@@ -95,7 +95,6 @@ function getData() {
     });
 }
 
-
 watch(
   () => modal.value,
   () => {
@@ -136,13 +135,17 @@ watch(
             hide-pagination
             hide-header
           />
-          <div v-else class="bg-grey-1 text-center q-pa-md">
-            ไม่มีข้อมูล
-          </div>
+          <div v-else class="bg-grey-1 text-center q-pa-md">ไม่มีข้อมูล</div>
         </q-card-section>
         <q-separator />
         <q-card-actions align="right" class="bg-white text-teal">
-          <q-btn :disable="rows.length === 0" type="submit" :label="`บันทึก`" color="public" @click="save" />
+          <q-btn
+            :disable="rows.length === 0"
+            type="submit"
+            :label="`บันทึก`"
+            color="public"
+            @click="save"
+          />
         </q-card-actions>
       </q-card>
     </q-dialog>

src/modules/02_organizationalNew/components/tableTree.vue

@@ -568,7 +568,10 @@ function updatePagination(newPagination: NewPagination) {
   />
 
   <!-- จัดลำดับ -->
-  <DialogSort v-model:sort-position="modalSort" />
+  <DialogSort
+    v-model:sort-position="modalSort"
+    :fetchDataTable="props.fetchDataTable"
+  />
 
   <!-- ย้ายตำแหน่ง -->
   <DialogMovePos