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

วินัยรองรับลูกจ้างประจำ กทม.

Browse source
This commit is contained in:
setthawutttty 2024-12-18 16:39:42 +07:00
parent 77a3e7b57f
commit 9bb81be90d
20 changed files with 370 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import config from "@/app.config";
import { useCounterMixin } from "@/stores/mixin";
import { useRoute } from "vue-router";
import { useCommandMainStore } from "@/modules/18_command/store/Main";
import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
import type { ListCommand } from "@/modules/18_command/interface/index/Main";
import type { ResponseData } from "@/modules/05_placement/interface/response/Transfer";
@ -18,6 +19,8 @@ import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCom
const $q = useQuasar();
const route = useRoute();
const mainStore = useDisciplineMainStore();
const storeCommand = useCommandMainStore();
const mixin = useCounterMixin();
const {
@ -278,7 +281,13 @@ watch(
<div v-else-if="col.name === 'salary'">
{{ props.row.salary.toLocaleString() }}
</div>
<div v-else-if="col.name === 'profileType'">
{{
props.row.profileType
? mainStore.convertType(props.row.profileType)
: "-"
}}
</div>
<div v-else>
{{ col.value ?? "-" }}
</div>

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

@ -9,13 +9,13 @@ import { useCounterMixin } from "@/stores/mixin";
import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore";
import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
import type { DataListRow } from "@/modules/11_discipline/interface/request/result";
import type { DataListRow } from "@/modules/11_discipline/interface/request/Result";
import type {
FormData as FormDataComplaint,
ArrayPerson,
ArrayFileList,
} from "@/modules/11_discipline/interface/request/complaint";
import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/investigateFact";
import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/InvestigateFact";
import DialogSendToCommand from "@/modules/11_discipline/components/4_Result/DialogSendToCommand.vue";
import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน

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

@ -13,13 +13,14 @@ import type {
FormData,
FormRef,
DataOption,
} from "@/modules/11_discipline/interface/request/result";
} from "@/modules/11_discipline/interface/request/Result";
import DialogHistory from "@/modules/11_discipline/components/4_Result/DialogHistory.vue";
import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
const mainStore = useDisciplineMainStore();
const isEmpType = ref<string>('')
const dataStore = useDisciplineResultStore();
const mixin = useCounterMixin();
const {
@ -227,9 +228,10 @@ function closeDetail() {
}
/** เปิดรายละเอียด */
function onclickViewinfo(id: string) {
function onclickViewinfo(id: string,type:string) {
modalPersonal.value = true;
personId.value = id;
isEmpType.value = type
}
function updatemodalPersonal(modal: boolean) {
@ -394,7 +396,7 @@ watch(
round
color="info"
icon="mdi-eye"
@click="onclickViewinfo(props.row.personId)"
@click="onclickViewinfo(props.row.personId,props.row.profileType)"
>
<q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
</q-btn>
@ -431,6 +433,13 @@ watch(
: ""
}}
</div>
<div v-else-if="col.name === 'profileType'">
{{
props.row.profileType
? mainStore.convertType(props.row.profileType)
: "-"
}}
</div>
<div v-else>
{{ col.value }}
</div>
@ -644,6 +653,7 @@ watch(
<PopupPersonal
:modal="modalPersonal"
:id="personId"
v-model:is-employee="isEmpType"
@update:modal="updatemodalPersonal"
/>