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

src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue

@@ -322,5 +322,6 @@ watch(
     v-model:modal="modalCommand"
     :command-type-code="commandType"
     :persons="selected ? dataMapToSend : []"
+    :fetch-data="props.getData"
   />
 </template>

src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue

@@ -46,6 +46,7 @@ const filterKeyword = ref<string>("");
 /** props*/
 const props = defineProps<{
   rows: dataType[];
+  fetchData: Function;
 }>();
 
 /** คอลัมน์ */
@@ -324,5 +325,6 @@ watch(
     v-model:modal="modalCommand"
     :command-type-code="commandType"
     :persons="selected ? dataMapToSend : []"
+    :fetch-data="props.fetchData"
   />
 </template>

src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue

@@ -494,6 +494,10 @@ onMounted(async () => {
     </div>
   </q-card>
 
-  <DialogSendToCommand v-model:modal="modal" :rows="rows2" />
+  <DialogSendToCommand
+    v-model:modal="modal"
+    :rows="rows2"
+    :fetch-data="getList"
+  />
 </template>
 <style scoped lang="scss"></style>

src/modules/11_discipline/components/PopupSendToNext.vue

@@ -243,6 +243,7 @@ watch(
     v-model:modal="modalCommand"
     :command-type-code="'C-PM-32'"
     :persons="selected ? dataMapToSend : []"
+    :fetch-data="props.fetchData"
   />
 </template>