hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into devTee

Browse source 
# Conflicts:
#	src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
#	src/modules/11_discipline/components/PopupSendToNext.vue
This commit is contained in:
STW_TTTY\stwtt 2024-10-03 15:06:51 +07:00
commit fddb0f7dc4
19 changed files with 274 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/11_discipline/components/PopupSendToNext.vue
View file

@ -61,7 +61,7 @@ const props = defineProps({
const modalCommand = ref<boolean>(false);
const emit = defineEmits(["returnPerson"]);
const selected = ref<any>([]);
const selected = ref<any[]>([]);
const inspectionResults = ref<string>("");
const filter = ref<string>("");
const initialPagination = ref<any>({