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

fix bug

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-11-04 15:21:23 +07:00
parent aa9b04772b
commit 3b6c22027c
26 changed files with 155 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
View file

@ -33,8 +33,8 @@ const {
/**
* props
*/
const props = defineProps({
isLeave:Boolean
const isLeave = defineModel<boolean>("isLeave", {
required: true,
});
const profileId = ref<string>(route.params.id.toString());
const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
@ -298,7 +298,7 @@ onMounted(() => {
<q-space />
<div class="q-gutter-x-sm">
<q-btn
v-if="!props.isLeave && checkPermission($route)?.attrIsUpdate"
v-if="!isLeave && checkPermission($route)?.attrIsUpdate"
flat
dense
round
@ -326,26 +326,32 @@ onMounted(() => {
<div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
<div>สังกัด</div>
</div>
<div class="col-12 col-sm-12 col-md-7">{{ formMain.ocId ? formMain.ocId:'-' }}</div>
<div class="col-12 col-sm-12 col-md-7">
{{ formMain.ocId ? formMain.ocId : "-" }}
</div>
</div>
<div class="row items-center">
<div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
<div>{{ empType === "" ? `ตำแหน่งในสายงาน` : `ตำแหน่ง` }}</div>
</div>
<div class="col-12 col-sm-12 col-md-7">{{ formMain.positionId ? formMain.positionId:'-' }}</div>
<div class="col-12 col-sm-12 col-md-7">
{{ formMain.positionId ? formMain.positionId : "-" }}
</div>
</div>
<div class="row items-center">
<div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
<div>ตำแหน่งเลขที่</div>
</div>
<div class="col-12 col-sm-12 col-md-7">{{ formMain.numberId? formMain.numberId:'-' }}</div>
<div class="col-12 col-sm-12 col-md-7">
{{ formMain.numberId ? formMain.numberId : "-" }}
</div>
</div>
<div class="row items-center" v-if="empType === ''">
<div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
<div>ตำแหน่งทางการบริหาร</div>
</div>
<div class="col-12 col-sm-12 col-md-7">
{{ formMain.positionExecutive ? formMain.positionExecutive:'-' }}
{{ formMain.positionExecutive ? formMain.positionExecutive : "-" }}
</div>
</div>
<div class="row items-center" v-if="empType === ''">
@ -353,7 +359,11 @@ onMounted(() => {
<div>ด้านทางการบริหาร</div>
</div>
<div class="col-12 col-sm-12 col-md-7">
{{ formMain.positionExecutiveSide ? formMain.positionExecutiveSide:'-' }}
{{
formMain.positionExecutiveSide
? formMain.positionExecutiveSide
: "-"
}}
</div>
</div>
</div>
@ -363,7 +373,7 @@ onMounted(() => {
<div>สายงาน</div>
</div>
<div class="col-12 col-sm-12 col-md-7">
{{ formMain.positionLine ? formMain.positionLine:'-' }}
{{ formMain.positionLine ? formMain.positionLine : "-" }}
</div>
</div>
<div class="row items-center">
@ -371,7 +381,7 @@ onMounted(() => {
<div>{{ empType === "" ? "ตำแหน่งประเภท" : "กลุ่มงาน" }}</div>
</div>
<div class="col-12 col-sm-12 col-md-7">
{{ formMain.positionType ? formMain.positionType:'-' }}
{{ formMain.positionType ? formMain.positionType : "-" }}
</div>
</div>
<div class="row items-center">
@ -379,7 +389,7 @@ onMounted(() => {
<div>{{ empType === "" ? "ระดับ" : "ระดับชั้นงาน" }}</div>
</div>
<div class="col-12 col-sm-12 col-md-7">
{{ formMain.positionLevel ? formMain.positionLevel:'-' }}
{{ formMain.positionLevel ? formMain.positionLevel : "-" }}
</div>
</div>
<div class="row items-center" v-if="empType === ''">
@ -387,7 +397,7 @@ onMounted(() => {
<div>ด้าน/สาขา</div>
</div>
<div class="col-12 col-sm-12 col-md-7">
{{ formMain.positionPathSide ? formMain.positionPathSide:'-' }}
{{ formMain.positionPathSide ? formMain.positionPathSide : "-" }}
</div>
</div>
</div>

10
src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
View file

@ -39,8 +39,8 @@ const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
/**
* props
*/
const props = defineProps({
isLeave:Boolean
const isLeave = defineModel<boolean>("isLeave", {
required: true,
});
//ฟอร์มข้อมูลวินัย
@ -351,7 +351,7 @@ onMounted(() => {
<template>
<div class="row items-center q-gutter-x-sm q-pb-sm">
<q-btn
v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
dense
color="primary"
icon="add"
@ -472,7 +472,7 @@ onMounted(() => {
<q-tooltip>ประวัติแก้ไขวินัย</q-tooltip>
</q-btn>
<q-btn
v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
flat
dense
round
@ -506,7 +506,7 @@ onMounted(() => {
><q-tooltip>ประวิติแก้ไขวินัย</q-tooltip></q-btn
>
<q-btn
v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
color="edit"
icon="edit"
flat

4
src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue
View file

@ -27,9 +27,7 @@ const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
/**
* props
*/
const props = defineProps({
isLeave:Boolean
});
const filterKeyword = ref<string>(""); //คำค้นหา
const rows = ref<RequestItemsObject[]>([]); //รายการประวัติแก้ไขวินัย
const columns = ref<QTableProps["columns"]>([

15
src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
View file

@ -25,8 +25,8 @@ import DialogHistory from "@/modules/04_registryPerson/components/detail/Governm
/**
* props
*/
const props = defineProps({
isLeave:Boolean
const isLeave = defineModel<boolean>("isLeave", {
required: true,
});
const route = useRoute();
@ -449,7 +449,7 @@ onMounted(() => {
<template>
<div class="row items-center q-gutter-x-sm q-pb-sm">
<q-btn
v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
dense
color="primary"
icon="add"
@ -568,7 +568,9 @@ onMounted(() => {
<q-tooltip>ประวัติแก้ไขการลา</q-tooltip>
</q-btn>
<q-btn
v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
v-if="
isLeave == false && checkPermission($route)?.attrIsUpdate
"
flat
dense
round
@ -613,7 +615,10 @@ onMounted(() => {
><q-tooltip>ประวิติแก้ไขการลา</q-tooltip></q-btn
>
<q-btn
v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
v-if="
isLeave == false &&
checkPermission($route)?.attrIsUpdate
"
color="edit"
icon="edit"
flat

6
src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue
View file

@ -26,12 +26,6 @@ const { showLoader, hideLoader, messageError, date2Thai, pathRegistryEmp } =
const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
/**
* props
*/
const props = defineProps({
isLeave:Boolean
});
const filterKeyword = ref<string>("");
const rows = ref<DetailData[]>([]); //data history
const formFilter = reactive<FormFilter>({

15
src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
View file

@ -35,8 +35,8 @@ const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
/**
* props
*/
const props = defineProps({
isLeave:Boolean
const isLeave = defineModel<boolean>("isLeave", {
required: true,
});
const id = ref<string>(""); //id ที่ต้องการแก้ไข
const modal = ref<boolean>(false); //แสดง popup ข้อมูลปฏิบัติราชการพิเศษ
@ -274,7 +274,7 @@ onMounted(() => {
<template>
<div class="row items-center q-gutter-x-sm q-pb-sm">
<q-btn
v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
dense
color="primary"
icon="add"
@ -394,7 +394,9 @@ onMounted(() => {
<q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ</q-tooltip>
</q-btn>
<q-btn
v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
v-if="
isLeave == false && checkPermission($route)?.attrIsUpdate
"
flat
dense
round
@ -428,7 +430,10 @@ onMounted(() => {
><q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ</q-tooltip>
</q-btn>
<q-btn
v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
v-if="
isLeave == false &&
checkPermission($route)?.attrIsUpdate
"
color="edit"
icon="edit"
flat

6
src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
View file

@ -21,12 +21,6 @@ const { showLoader, hideLoader, messageError, date2Thai, pathRegistryEmp } =
const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
/**
* props
*/
const props = defineProps({
isLeave:Boolean
});
const filterKeyword = ref<string>(""); //คำค้นหา
const rows = ref<ResponseObject[]>([]); //data history
const columns = ref<QTableProps["columns"]>([