Merge branch 'develop' of github.com:Frappet/hrms-mgt into develop

src/modules/05_placement/components/AppointEmployee/DialogOrders.vue

@@ -490,5 +490,6 @@ watch(
     v-model:modal="modalCommand"
     :command-type-code="commandType"
     :persons="dataMapToSend"
+    :fetch-data="props.fetchData"
   />
 </template>

src/modules/05_placement/components/AppointMent/DialogOrders.vue

@@ -534,5 +534,6 @@ watch(
     v-model:modal="modalCommand"
     :command-type-code="commandType"
     :persons="dataMapToSend"
+    :fetch-data="props.fetchData"
   />
 </template>

src/modules/05_placement/components/Help-Government/DialogOrders.vue

@@ -334,5 +334,6 @@ function onSearch() {
     v-model:modal="modalCommand"
     :command-type-code="'C-PM-15'"
     :persons="dataMapToSend"
+    :fetch-data="props.getData"
   />
 </template>

src/modules/05_placement/components/Other/DialogOrders.vue

@@ -422,5 +422,6 @@ watch(
     v-model:modal="modalCommand"
     :command-type-code="commandType"
     :persons="dataMapToSend"
+    :fetch-data="props.fecthlistOthet"
   />
 </template>

src/modules/05_placement/components/PersonalList/DialogOrders.vue

@@ -484,5 +484,6 @@ watch(
     v-model:modal="modalCommand"
     :command-type-code="commandType"
     :persons="dataMapToSend"
+    :fetch-data="props.fetchData"
   />
 </template>

src/modules/05_placement/components/PersonalList/Table.vue

@@ -832,13 +832,13 @@ async function getWorkFlow() {
           "positionCandidate",
         ];
       }
-      hideLoader();
     })
     .catch((e) => {
       messageError($q, e);
-      hideLoader();
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 function onclickViewinfo(id: string) {
@@ -1716,7 +1716,11 @@ onMounted(async () => {
     </q-card>
   </q-dialog>
 
-  <DialogOrders v-model:modal="modalOrder" :rows="rowsOrder" />
+  <DialogOrders
+    v-model:modal="modalOrder"
+    :rows="rowsOrder"
+    :fetch-data="getTable"
+  />
   <PopupPersonal
     :modal="modalPersonal"
     :id="personalId"

src/modules/05_placement/components/Receive/DialogOrders.vue

@@ -398,5 +398,6 @@ watchEffect(() => {
     v-model:modal="modalCommand"
     :command-type-code="'C-PM-14'"
     :persons="dataMapToSend"
+    :fetch-data="props.fecthlistRecevice"
   />
 </template>

src/modules/05_placement/components/Repatriate/DialogOrders.vue

@@ -16,8 +16,7 @@ import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCom
 const $q = useQuasar();
 const { statusText } = useTransferDataStore();
 const mixin = useCounterMixin();
-const { dialogConfirm, findPosMasterNoOld, date2Thai, onSearchDataTable } =
-  mixin;
+const { dialogConfirm, date2Thai, onSearchDataTable } = mixin;
 
 /** props*/
 const props = defineProps({
@@ -298,5 +297,6 @@ watch(
     v-model:modal="modalCommand"
     :command-type-code="'C-PM-16'"
     :persons="dataMapToSend"
+    :fetch-data="props.getData"
   />
 </template>

src/modules/05_placement/components/Transfer/DialogOrders.vue

@@ -292,5 +292,6 @@ watch(
     v-model:modal="modalCommand"
     command-type-code="C-PM-13"
     :persons="dataMapToSend"
+    :fetch-data="props.fetchData"
   />
 </template>

src/modules/05_placement/components/probation/DialogOrder.vue

@@ -3,8 +3,6 @@ import { ref, watch, computed } from "vue";
 import { useQuasar } from "quasar";
 import { useRoute } from "vue-router";
 
-import avatar from "@/assets/avatar_user.jpg";
-
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
@@ -15,11 +13,7 @@ import { useTransferDataStore } from "@/modules/05_placement/store";
 import type { QTableProps } from "quasar";
 import type { ResponseData } from "@/modules/05_placement/interface/response/Transfer";
 import type { ListCommand } from "@/modules/18_command/interface/index/Main";
-import type {
-  FormMainProbation,
-  FormMainProbation2,
-  OpfillterType,
-} from "@/modules/05_placement/interface/request/Main";
+import type { FormMainProbation } from "@/modules/05_placement/interface/request/Main";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCommand.vue";
@@ -33,6 +27,14 @@ const storeCommand = useCommandMainStore();
 const { dialogConfirm, dateText, showLoader, hideLoader, messageError } = mixin;
 
 const modal = defineModel<boolean>("modal", { required: true });
+const props = defineProps({
+  fetchData: {
+    type: Function,
+    default: () => {
+      console.warn("fetchData function is not ");
+    },
+  },
+});
 
 const examId = route.params.examId;
 const rows = ref<FormMainProbation[]>([]);
@@ -212,13 +214,13 @@ async function getList() {
       rows.value = data;
       totalList.value = Math.ceil(resTotal / pagination.value.rowsPerPage);
       total.value = resTotal;
-      hideLoader();
     })
     .catch((e) => {
       messageError($q, e);
-      hideLoader();
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 function updatePagination(newPagination: any) {
@@ -426,5 +428,6 @@ watch(
     v-model:modal="modalCommand"
     :command-type-code="commandType"
     :persons="selected ? dataMapToSend : []"
+    :fetch-data="props.fetchData"
   />
 </template>

src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue

@@ -261,5 +261,6 @@ watchEffect(() => {
     :command-type-code="'C-PM-10'"
     :persons="selected ? dataMapToSend : []"
     :not-person="false"
+    :fetch-data="props.getData"
   />
 </template>

src/modules/05_placement/components/probation/MainProbation.vue

@@ -866,5 +866,5 @@ onMounted(() => {
     </q-card>
   </q-dialog>
 
-  <DialogOrder v-model:modal="modalCommand" />
+  <DialogOrder v-model:modal="modalCommand" :fetch-data="fetchProbationPersonalList" />
 </template>