updated & fixing
This commit is contained in:
parent
a39a34b15f
commit
62af9f6a35
24 changed files with 392 additions and 352 deletions
|
|
@ -2,7 +2,7 @@
|
|||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useQuasar, type QTableProps } from "quasar";
|
||||
import { ref, reactive, onMounted } from "vue";
|
||||
import { useRegistryInFormationStore } from '@/modules/10_registry/store/registry'
|
||||
import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
|
||||
|
||||
//history dialog
|
||||
import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
|
||||
|
|
@ -10,7 +10,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
|
|||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
const store = useRegistryInFormationStore()
|
||||
const store = useRegistryInFormationStore();
|
||||
const rowsHistory = ref<any[]>([]);
|
||||
const $q = useQuasar();
|
||||
const mixin = useCounterMixin();
|
||||
|
|
@ -309,7 +309,10 @@ function getData() {
|
|||
|
||||
/** get history */
|
||||
function getHistory() {
|
||||
const url = store.typeProfile == 'OFFICER' ? config.API.dataUserGovernmentHistory(''):config.API.dataUserGovernmentHistory('-employee')
|
||||
const url =
|
||||
store.typeProfile == "OFFICER"
|
||||
? config.API.dataUserGovernmentHistory("")
|
||||
: config.API.dataUserGovernmentHistory("-employee");
|
||||
showLoader();
|
||||
http
|
||||
.get(url)
|
||||
|
|
@ -354,23 +357,31 @@ onMounted(() => {
|
|||
<div class="col-7">
|
||||
{{ formData.org ? formData.org : "-" }}
|
||||
</div>
|
||||
<div class="col-5 text-grey-6 text-weight-medium">ตำแหน่ง</div>
|
||||
<div class="col-5 text-grey-6 text-weight-medium">
|
||||
ตำแหน่งในสายงาน
|
||||
</div>
|
||||
<div class="col-7">
|
||||
{{ formData.position ? formData.position : "-" }}
|
||||
</div>
|
||||
<div class="col-5 text-grey-6 text-weight-medium">
|
||||
เลขที่ตำแหน่ง
|
||||
ตำแหน่งเลขที่
|
||||
</div>
|
||||
<div class="col-7">
|
||||
{{ formData.posMasterNo ? formData.posMasterNo : "-" }}
|
||||
</div>
|
||||
<div v-if="store.typeProfile == 'OFFICER'" class="col-5 text-grey-6 text-weight-medium">
|
||||
<div
|
||||
v-if="store.typeProfile == 'OFFICER'"
|
||||
class="col-5 text-grey-6 text-weight-medium"
|
||||
>
|
||||
ตำแหน่งทางการบริหาร
|
||||
</div>
|
||||
<div v-if="store.typeProfile == 'OFFICER'" class="col-7">
|
||||
{{ formData.posExecutive ? formData.posExecutive : "-" }}
|
||||
</div>
|
||||
<div v-if="store.typeProfile == 'OFFICER'" class="col-5 text-grey-6 text-weight-medium">
|
||||
<div
|
||||
v-if="store.typeProfile == 'OFFICER'"
|
||||
class="col-5 text-grey-6 text-weight-medium"
|
||||
>
|
||||
ด้านทางการบริหาร
|
||||
</div>
|
||||
<div v-if="store.typeProfile == 'OFFICER'" class="col-7">
|
||||
|
|
@ -385,17 +396,26 @@ onMounted(() => {
|
|||
|
||||
<div class="col-12 col-sm-12 col-md-6">
|
||||
<div class="row q-col-gutter-y-sm">
|
||||
<div v-if="store.typeProfile == 'OFFICER'" class="col-5 text-grey-6 text-weight-medium">สายงาน</div>
|
||||
<div
|
||||
v-if="store.typeProfile == 'OFFICER'"
|
||||
class="col-5 text-grey-6 text-weight-medium"
|
||||
>
|
||||
สายงาน
|
||||
</div>
|
||||
<div v-if="store.typeProfile == 'OFFICER'" class="col-7">
|
||||
{{ formData.positionField ? formData.positionField : "-" }}
|
||||
</div>
|
||||
<div class="col-5 text-grey-6 text-weight-medium">
|
||||
{{store.typeProfile == 'OFFICER' ? 'ประเภทตำแหน่ง':'กลุ่มงาน'}}
|
||||
{{
|
||||
store.typeProfile == "OFFICER" ? "ตำแหน่งประเภท" : "กลุ่มงาน"
|
||||
}}
|
||||
</div>
|
||||
<div class="col-7">
|
||||
{{ formData.posType ? formData.posType : "-" }}
|
||||
</div>
|
||||
<div class="col-5 text-grey-6 text-weight-medium">{{store.typeProfile == 'OFFICER' ? 'ระดับตำแหน่ง':'ระดับชั้นงาน'}}</div>
|
||||
<div class="col-5 text-grey-6 text-weight-medium">
|
||||
{{ store.typeProfile == "OFFICER" ? "ระดับ" : "ระดับชั้นงาน" }}
|
||||
</div>
|
||||
<div class="col-7">
|
||||
{{ formData.posLevel ? formData.posLevel : "-" }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
|
|||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
const idByRow = ref<string>('')
|
||||
const idByRow = ref<string>("");
|
||||
const rows = ref<any[]>([]);
|
||||
const filter = ref<string>("");
|
||||
const rowsHistory = ref<any[]>([]);
|
||||
|
|
@ -205,9 +205,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
|
|||
},
|
||||
]);
|
||||
|
||||
function onHistory(id:string) {
|
||||
function onHistory(id: string) {
|
||||
modalHistory.value = true;
|
||||
idByRow.value = id
|
||||
idByRow.value = id;
|
||||
}
|
||||
|
||||
/** get data */
|
||||
|
|
@ -252,9 +252,7 @@ onMounted(() => {
|
|||
<!-- v-if="mode" -->
|
||||
<div class="col-12">
|
||||
<q-toolbar class="q-px-none q-mt-md">
|
||||
<span class="text-blue-6 text-weight-bold text-body1"
|
||||
>วินัย</span
|
||||
>
|
||||
<span class="text-blue-6 text-weight-bold text-body1">วินัย</span>
|
||||
<q-space />
|
||||
<q-input
|
||||
v-if="mode"
|
||||
|
|
@ -329,7 +327,7 @@ onMounted(() => {
|
|||
{{ props.row.status ? props.row.status : "-" }}
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ col.value?col.value:'-' }}
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
<q-td auto-width>
|
||||
|
|
@ -364,7 +362,6 @@ onMounted(() => {
|
|||
<q-tooltip>ประวัติแก้ไขวินัย</q-tooltip>
|
||||
</q-btn>
|
||||
<q-item v-for="col in props.cols" :key="col.name">
|
||||
|
||||
<q-item-section class="fix_top">
|
||||
<q-item-label class="text-grey-6 text-weight-medium">{{
|
||||
col.label
|
||||
|
|
@ -381,10 +378,10 @@ onMounted(() => {
|
|||
</div>
|
||||
</template>
|
||||
<template v-slot:no-data>
|
||||
<div class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium">
|
||||
<span>
|
||||
ไม่พบข้อมูลวินัย
|
||||
</span>
|
||||
<div
|
||||
class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
|
||||
>
|
||||
<span> ไม่พบข้อมูล </span>
|
||||
</div>
|
||||
</template>
|
||||
</d-table>
|
||||
|
|
@ -397,7 +394,6 @@ onMounted(() => {
|
|||
:visibleColumns="visibleColumns"
|
||||
:columns="columns"
|
||||
/>
|
||||
|
||||
</template>
|
||||
<style scoped>
|
||||
.absolute_button {
|
||||
|
|
@ -406,7 +402,7 @@ onMounted(() => {
|
|||
top: -20px;
|
||||
}
|
||||
|
||||
.fix_top{
|
||||
justify-content: start!important;
|
||||
.fix_top {
|
||||
justify-content: start !important;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
|
|||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
const idByRow = ref<string>('')
|
||||
const idByRow = ref<string>("");
|
||||
const rows = ref<any[]>([]);
|
||||
const filter = ref<string>("");
|
||||
const rowsHistory = ref<any[]>([]);
|
||||
|
|
@ -203,9 +203,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
|
|||
},
|
||||
]);
|
||||
|
||||
function onHistory(id:string) {
|
||||
function onHistory(id: string) {
|
||||
modalHistory.value = true;
|
||||
idByRow.value = id
|
||||
idByRow.value = id;
|
||||
}
|
||||
|
||||
/** get data */
|
||||
|
|
@ -225,7 +225,6 @@ function getData() {
|
|||
status: item.status,
|
||||
reason: item.reason,
|
||||
typeLeaveId: item.leaveTypeId,
|
||||
|
||||
}));
|
||||
})
|
||||
.catch((e) => {
|
||||
|
|
@ -415,7 +414,7 @@ onMounted(() => {
|
|||
>
|
||||
<q-tooltip>ประวัติแก้ไขการลา</q-tooltip>
|
||||
</q-btn>
|
||||
<q-item v-for="col in props.cols" :key="col.name" >
|
||||
<q-item v-for="col in props.cols" :key="col.name">
|
||||
<q-item-section class="fix_top">
|
||||
<q-item-label class="text-grey-6 text-weight-medium">{{
|
||||
col.label
|
||||
|
|
@ -434,10 +433,12 @@ onMounted(() => {
|
|||
}}</q-item-label
|
||||
>
|
||||
<q-item-label
|
||||
v-else-if="col.name == 'status'"
|
||||
v-else-if="col.name == 'status'"
|
||||
class="text-dark text-weight-medium"
|
||||
>
|
||||
{{ props.row.status ? statusLeave(props.row.status) : "-" }}</q-item-label
|
||||
{{
|
||||
props.row.status ? statusLeave(props.row.status) : "-"
|
||||
}}</q-item-label
|
||||
>
|
||||
<q-item-label v-else class="text-dark text-weight-medium">{{
|
||||
col.value ? col.value : "-"
|
||||
|
|
@ -450,9 +451,9 @@ onMounted(() => {
|
|||
</template>
|
||||
<template v-slot:no-data>
|
||||
<div
|
||||
class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium"
|
||||
class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
|
||||
>
|
||||
<span> ไม่พบข้อมูลการลา </span>
|
||||
<span> ไม่พบข้อมูล </span>
|
||||
</div>
|
||||
</template>
|
||||
</d-table>
|
||||
|
|
@ -474,7 +475,7 @@ onMounted(() => {
|
|||
top: -20px;
|
||||
}
|
||||
|
||||
.fix_top{
|
||||
justify-content: start!important;
|
||||
.fix_top {
|
||||
justify-content: start !important;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
|
|||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
const idByRow = ref<string>('')
|
||||
const idByRow = ref<string>("");
|
||||
const rows = ref<any[]>([]);
|
||||
const filter = ref<string>("");
|
||||
const rowsHistory = ref<any[]>([]);
|
||||
|
|
@ -206,9 +206,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
|
|||
},
|
||||
]);
|
||||
|
||||
function onHistory(id:string) {
|
||||
function onHistory(id: string) {
|
||||
modalHistory.value = true;
|
||||
idByRow.value = id
|
||||
idByRow.value = id;
|
||||
}
|
||||
|
||||
/** get data */
|
||||
|
|
@ -330,7 +330,7 @@ onMounted(() => {
|
|||
{{ props.row.status ? props.row.status : "-" }}
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ col.value?col.value:'-' }}
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
<q-td auto-width>
|
||||
|
|
@ -365,7 +365,6 @@ onMounted(() => {
|
|||
<q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ</q-tooltip>
|
||||
</q-btn>
|
||||
<q-item v-for="col in props.cols" :key="col.name">
|
||||
|
||||
<q-item-section class="fix_top">
|
||||
<q-item-label class="text-grey-6 text-weight-medium">{{
|
||||
col.label
|
||||
|
|
@ -382,10 +381,10 @@ onMounted(() => {
|
|||
</div>
|
||||
</template>
|
||||
<template v-slot:no-data>
|
||||
<div class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium">
|
||||
<span>
|
||||
ไม่พบข้อมูลปฏิบัติราชการพิเศษ
|
||||
</span>
|
||||
<div
|
||||
class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
|
||||
>
|
||||
<span> ไม่พบข้อมูล </span>
|
||||
</div>
|
||||
</template>
|
||||
</d-table>
|
||||
|
|
@ -398,7 +397,6 @@ onMounted(() => {
|
|||
:visibleColumns="visibleColumnsHistory"
|
||||
:columns="columnsHistory"
|
||||
/>
|
||||
|
||||
</template>
|
||||
<style scoped>
|
||||
.absolute_button {
|
||||
|
|
@ -407,7 +405,7 @@ onMounted(() => {
|
|||
top: -20px;
|
||||
}
|
||||
|
||||
.fix_top{
|
||||
justify-content: start!important;
|
||||
.fix_top {
|
||||
justify-content: start !important;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue