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/4_Result/Form.vue
#	src/modules/11_discipline/store/ResultStore.ts
This commit is contained in:
setthawutttty 2023-12-01 15:53:40 +07:00
commit 4f84341a0b
21 changed files with 617 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/11_discipline/components/4_Result/Form.vue
View file

@ -8,7 +8,7 @@ import { useRouter, useRoute } from "vue-router";
import { useCounterMixin } from "@/stores/mixin";
import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore";
import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore";
import { useDisciplineMainStore } from "@/modules/11_discipline/store";
import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
import type {
FormData,
@ -144,7 +144,6 @@ watch(
async () => {
console.log(props.data);
respondentType.value = props.data.respondentType;
mainStore.rowsAdd = props.data.persons
await fetchDatadetail();
await fetchOrganization();
}