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

no message

Browse source
This commit is contained in:
setthawutttty 2023-12-01 15:55:54 +07:00
parent 4f84341a0b
commit 716aee4939
4 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
View file

@ -14,7 +14,7 @@ import type { ResponseData } from "@/modules/05_placement/interface/response/Tra
import type { OpType } from "@/modules/05_placement/interface/response/Main"; import type { OpType } from "@/modules/05_placement/interface/response/Main";
import type { import type {
DataListRow, DataListRow,
personType, PersonType,
} from "@/modules/11_discipline/interface/request/result"; } from "@/modules/11_discipline/interface/request/result";
import DialogHeader from "@/components/DialogHeader.vue"; import DialogHeader from "@/components/DialogHeader.vue";

2
src/modules/11_discipline/components/4_Result/EditPage.vue
View file

@ -18,7 +18,7 @@ import { useCounterMixin } from "@/stores/mixin";
import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore"; import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore";
import { useQuasar } from "quasar"; import { useQuasar } from "quasar";
import DialogSendToCommand from "@/modules/11_discipline/components/4_Result/DialogSendToCommand.vue"; import DialogSendToCommand from "@/modules/11_discipline/components/4_Result/DialogSendToCommand.vue";
import { useDisciplineMainStore } from "@/modules/11_discipline/store"; import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
const mainStore = useDisciplineMainStore(); const mainStore = useDisciplineMainStore();
const $q = useQuasar(); const $q = useQuasar();

30
src/modules/11_discipline/interface/request/result.ts
View file

@ -25,18 +25,18 @@ interface DataListRow {
resultDescription: string resultDescription: string
} }
interface PersonType{ interface PersonType {
id: string id: string
idcard: string idcard: string
name: string name: string
prefix: string prefix: string
firstName: string firstName: string
lastName: string lastName: string
position: string position: string
positionLevel: string positionLevel: string
salary: number salary: number
personId: string personId: string
posNo: string posNo: string
organization: string organization: string
} }
export type { FormData, FormRef,DataOption,DataOptionRes,personType,DataListRow}; export type { FormData, FormRef, DataOption, DataOptionRes, PersonType, DataListRow };

5
src/modules/11_discipline/store/ResultStore.ts
View file

@ -12,13 +12,8 @@ import type {
} from "@/modules/11_discipline/interface/response/result"; } from "@/modules/11_discipline/interface/response/result";
import { useCounterMixin } from "@/stores/mixin"; import { useCounterMixin } from "@/stores/mixin";
<<<<<<< HEAD
import { useDisciplineMainStore } from "@/modules/11_discipline/store";
=======
import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
import { useCounterMixin } from "@/stores/mixin"; import { useCounterMixin } from "@/stores/mixin";
>>>>>>> develop
const mixin = useCounterMixin(); const mixin = useCounterMixin();
const storeMain = useDisciplineMainStore(); const storeMain = useDisciplineMainStore();
const { date2Thai } = mixin; const { date2Thai } = mixin;