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

updated & fixing

Browse source
This commit is contained in:
Warunee Tamkoo 2024-06-26 14:35:19 +07:00
parent a39a34b15f
commit 62af9f6a35
24 changed files with 392 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/08_KPI/components/Tab/Dialog/DialogCommentProgress.vue
View file

@ -350,6 +350,7 @@ watch(
<q-separator />
</div>
<div if="type == 'capacity' || type == 'development'">
<!-- ความคิดเห็นของผู้ประเมิน -->
<q-form
v-if="store.dataEvaluation.evaluatorId"
@ -503,6 +504,7 @@ watch(
</q-form>
</div>
</div>
</div>
</template>
</q-splitter>
</q-card-section>

31
src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue
View file

@ -25,7 +25,7 @@ const {
const route = useRoute();
const router = useRouter();
const id = ref<string>(route.params.id as string)
const id = ref<string>(route.params.id as string);
const modal = defineModel<boolean>("modal", { required: true });
const filterKeyword = ref<string>("");
const rows = ref<any[]>([]);
@ -56,7 +56,7 @@ const columns = ref<QTableProps["columns"]>([
{
name: "posMasterNoOld",
align: "left",
label: "เลขที่ตำแหน่ง",
label: "ตำแหน่งเลขที่",
sortable: true,
field: "posMasterNoOld",
headerStyle: "font-size: 14px",
@ -77,7 +77,7 @@ const columns = ref<QTableProps["columns"]>([
{
name: "positionLevel",
align: "left",
label: "ประเภทตำแหน่ง",
label: "ตำแหน่งประเภท",
sortable: true,
field: "positionLevel",
headerStyle: "font-size: 14px",
@ -193,23 +193,28 @@ function close() {
}
function getData() {
showLoader()
showLoader();
http
.get(config.API.placementKeycloak + `/${store.dataProfile.profileId}`)
.then((res) => {
const data = res.data.result
rows.value = data
}).catch((e)=>{
messageError($q,e)
}).finally(()=>{
hideLoader()
const data = res.data.result;
rows.value = data;
})
.catch((e) => {
messageError($q, e);
})
.finally(() => {
hideLoader();
});
}
watch(()=>modal.value,(n)=>{
watch(
() => modal.value,
(n) => {
if (n == true) {
getData()
getData();
}
})
}
);
</script>
<template>
<q-dialog persistent v-model="modal">

4
src/modules/08_KPI/views/form.vue
View file

@ -562,7 +562,7 @@ onMounted(async () => {
</div>
<div class="col-xs-12 col-md-2">
<div :class="$q.screen.gt.sm ? 'column' : 'row'">
<span class="text-grey-6 col">ประเภทตำแหน่ง</span>
<span class="text-grey-6 col">ตำแหน่งประเภท</span>
<span class="text-weight-medium text-dark col">{{
store.dataEvaluation.posTypeName
}}</span>
@ -570,7 +570,7 @@ onMounted(async () => {
</div>
<div class="col-xs-12 col-md-2">
<div :class="$q.screen.gt.sm ? 'column' : 'row'">
<span class="text-grey-6 col">ระดับตำแหน่ง</span>
<span class="text-grey-6 col">ระดับ</span>
<span class="text-weight-medium text-dark col">{{
store.dataEvaluation.posLevelName
}}</span>

6
src/modules/09_scholarship/views/detail.vue
View file

@ -583,11 +583,11 @@ onMounted(async () => {
<div class="col-8 text-weight-medium">
{{ dataPerson.firstName ? dataPerson.name : "-" }}
</div>
<div class="col-4 text-grey">ตำแหน่ง</div>
<div class="col-4 text-grey">ตำแหน่งในสายงาน</div>
<div class="col-8 text-weight-medium">
{{ dataPerson.position ? dataPerson.position : "-" }}
</div>
<div class="col-4 text-grey">ประเภทตำแหน่ง</div>
<div class="col-4 text-grey">ตำแหน่งประเภท</div>
<div class="col-8 text-weight-medium">
{{ dataPerson.type ? dataPerson.type : "-" }}
</div>
@ -595,7 +595,7 @@ onMounted(async () => {
</div>
<div class="col-xs-12 col-md-6">
<div class="row q-col-gutter-md">
<div class="col-4 text-grey">ระดับตำแหน่ง</div>
<div class="col-4 text-grey">ระดับ</div>
<div class="col-8 text-weight-medium">
{{ dataPerson.level ? dataPerson.level : "-" }}
</div>

4
src/modules/10_registry/01_Information/01_Information.vue
View file

@ -19,7 +19,7 @@ const { showLoader, hideLoader, messageError, date2Thai } = mixin;
const modalHistory = ref<boolean>(false);
/** ตัวแปรข้อมูล */
const formDataInformation = reactive<any>({
citizenId: "", //เลขบัตรประจำตัวประชาชน
citizenId: "", //เลขประจำตัวประชาชน
prefix: "",
firstName: "",
lastName: "",
@ -304,7 +304,7 @@ onMounted(() => {
<div class="col-12 col-sm-12 col-md-6 q-gutter-y-sm">
<div class="row">
<div class="col-5 text-grey-6 text-weight-medium">
เลขบัตรประจำตัวประชาชน
เลขประจำตัวประชาชน
</div>
<div class="col-7">
{{

15
src/modules/10_registry/01_Information/02_ChangeName.vue
View file

@ -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[]>([]);
@ -154,7 +154,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
function onHistory(id: string) {
modalHistory.value = true;
idByrow.value = id
idByrow.value = id;
}
/** get data */
@ -273,7 +273,7 @@ onMounted(() => {
{{ props.rowIndex + 1 }}
</div>
<div v-else>
{{ col.value? col.value:'-' }}
{{ col.value ? col.value : "-" }}
</div>
</q-td>
<q-td auto-width>
@ -308,7 +308,6 @@ onMounted(() => {
<q-tooltip>ประวัติแก้ไขประวัติการศึกษา</q-tooltip>
</q-btn>
<q-item v-for="col in props.cols" :key="col.name">
<q-item-section>
<q-item-label class="text-grey-6 text-weight-medium">{{
col.label
@ -325,10 +324,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>

16
src/modules/10_registry/01_Information/03_Address.vue
View file

@ -238,7 +238,10 @@ function getData() {
/** get history */
function getHistory() {
const url = store.typeProfile == 'OFFICER' ? config.API.dataUserHistory(''):config.API.dataUserHistory('-employee')
const url =
store.typeProfile == "OFFICER"
? config.API.dataUserHistory("")
: config.API.dataUserHistory("-employee");
showLoader();
http
.get(url)
@ -263,10 +266,19 @@ onMounted(() => {
<q-toolbar class="q-px-none">
<span class="text-blue-6 text-weight-bold text-body1">ข้อมูลที่อยู่</span>
<q-space />
<q-btn icon="mdi-history" color="info" flat dense round size="14px" @click="onHistory">
<q-btn
icon="mdi-history"
color="info"
flat
dense
round
size="14px"
@click="onHistory"
>
<q-tooltip>ประวัติข้อมูลที่อยู่</q-tooltip>
</q-btn>
</q-toolbar>
<q-card bordered class="bg-grey-1 q-pa-md">
<div class="row">
<div class="col-12 col-sm-12 col-md-6 q-gutter-y-sm">

44
src/modules/10_registry/01_Information/04_Family.vue
View file

@ -11,7 +11,7 @@ import config from "@/app.config";
import type { FormChildren } from "@/modules/10_registry/interface/index/Family";
import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
const idFamily = ref<string>('')
const idFamily = ref<string>("");
const store = useRegistryInFormationStore();
const rowsHistory = ref<any[]>([]);
const $q = useQuasar();
@ -41,7 +41,7 @@ const fatherData = reactive<any>({
firstName: "",
lastName: "",
job: "",
profileId:''
profileId: "",
});
const motherData = reactive<any>({
isLive: null,
@ -50,7 +50,7 @@ const motherData = reactive<any>({
firstName: "",
lastName: "",
job: "",
profileId:''
profileId: "",
});
const coupleData = reactive<any>({
isLive: null,
@ -61,7 +61,7 @@ const coupleData = reactive<any>({
job: "",
lastNameOld: "",
statusMarital: "",
profileId:''
profileId: "",
});
const childData = ref<FormChildren[]>([]);
@ -79,7 +79,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
{
name: "citizenId",
align: "left",
label: "เลขบัตรประจำตัวประชาชน",
label: "เลขประจำตัวประชาชน",
sortable: true,
field: "citizenId",
headerStyle: "font-size: 14px",
@ -146,7 +146,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
function onHistory(type: string, id: string) {
modalHistory.value = true;
typeForm.value = type;
idFamily.value = id ? id:'user'
idFamily.value = id ? id : "user";
}
/** get data */
@ -202,7 +202,14 @@ function getData(type: string) {
/** get history */
function getHistory() {
const url = store.typeProfile == 'OFFICER' ? config.API.dataUserFamilyHistory(typeForm.value,'',idFamily.value):config.API.dataUserFamilyHistory(typeForm.value,'-employee',idFamily.value)
const url =
store.typeProfile == "OFFICER"
? config.API.dataUserFamilyHistory(typeForm.value, "", idFamily.value)
: config.API.dataUserFamilyHistory(
typeForm.value,
"-employee",
idFamily.value
);
showLoader();
http
@ -216,7 +223,8 @@ function getHistory() {
lastName: e[`${typeForm.value}LastName`],
job: e[`${typeForm.value}Career`],
isLive: e[`${typeForm.value}Live`],
lastNameOld: typeForm.value === "couple" ? e.coupleLastNameOld : undefined,
lastNameOld:
typeForm.value === "couple" ? e.coupleLastNameOld : undefined,
}));
})
.catch((e) => {
@ -242,8 +250,6 @@ onMounted(async () => {
>
</q-toolbar>
<div class="row q-col-gutter-sm">
<div class="col-12" v-if="fatherData.profileId !== ''">
<q-card bordered class="q-pa-md">
<div class="row">
@ -266,7 +272,7 @@ onMounted(async () => {
<div class="col-12 col-sm-12 col-md-12 q-gutter-y-sm">
<div class="row">
<div class="col-5 text-grey-6 text-weight-medium">
เลขบัตรประจำตัวประชาชน
เลขประจำตัวประชาชน
</div>
<div class="col-7">
{{ fatherData.citizenId ? fatherData.citizenId : "-" }}
@ -339,7 +345,7 @@ onMounted(async () => {
<div class="col-12 col-sm-12 col-md-12 q-gutter-y-sm">
<div class="row">
<div class="col-5 text-grey-6 text-weight-medium">
เลขบัตรประจำตัวประชาชน
เลขประจำตัวประชาชน
</div>
<div class="col-7">
{{ motherData.citizenId ? motherData.citizenId : "-" }}
@ -418,12 +424,16 @@ onMounted(async () => {
สถานภาพการสมรส
</div>
<div class="col-7">
{{ coupleData.statusMarital ? coupleData.statusMarital : "-" }}
{{
coupleData.statusMarital
? coupleData.statusMarital
: "-"
}}
</div>
</div>
<div class="row">
<div class="col-5 text-grey-6 text-weight-medium">
เลขบัตรประจำตัวประชาชน
เลขประจำตัวประชาชน
</div>
<div class="col-7">
{{ coupleData.citizenId ? coupleData.citizenId : "-" }}
@ -448,7 +458,9 @@ onMounted(async () => {
นามสกุลเดิม
</div>
<div class="col-7">
{{ coupleData.lastNameOld ? coupleData.lastNameOld : "-" }}
{{
coupleData.lastNameOld ? coupleData.lastNameOld : "-"
}}
</div>
</div>
</div>
@ -513,7 +525,7 @@ onMounted(async () => {
<div class="col-12 col-sm-12 col-md-12 q-gutter-y-sm">
<div class="row">
<div class="col-5 text-grey-6 text-weight-medium">
เลขบัตรประจำตัวประชาชน
เลขประจำตัวประชาชน
</div>
<div class="col-7">
{{

14
src/modules/10_registry/01_Information/05_Educations.vue
View file

@ -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[]>([]);
@ -430,7 +430,7 @@ const visibleColumnsHistory = ref<string[]>([
function onHistory(id: string) {
modalHistory.value = true;
idByRow.value = id
idByRow.value = id;
}
/** get data */
@ -587,7 +587,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
@ -604,13 +603,12 @@ 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>
</div>
<DialogHistory

12
src/modules/10_registry/01_Information/06_Ability.vue
View file

@ -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[]>([]);
@ -155,7 +155,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
function onHistory(id: string) {
modalHistory.value = true;
idByRow.value = id
idByRow.value = id;
}
/** get data */
@ -329,10 +329,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>

40
src/modules/10_registry/02_Government/01_Government.vue
View file

@ -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>

20
src/modules/10_registry/02_Government/02_Discipline.vue
View file

@ -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[]>([]);
@ -207,7 +207,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
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 {

13
src/modules/10_registry/02_Government/03_Leave.vue
View file

@ -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,7 +205,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
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) => {
@ -437,7 +436,9 @@ onMounted(() => {
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>

16
src/modules/10_registry/02_Government/04_Duty.vue
View file

@ -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[]>([]);
@ -208,7 +208,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
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 {

22
src/modules/10_registry/03_Salary/02_Nopaid.vue
View file

@ -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[]>([]);
@ -90,7 +90,6 @@ const columns = ref<QTableProps["columns"]>([
},
]);
const visibleColumnsHistory = ref<string[]>([
"date",
"reference",
@ -184,10 +183,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
},
]);
function onHistory(id: string) {
modalHistory.value = true;
idByRow.value = id
idByRow.value = id;
}
/** get data */
@ -309,7 +307,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>
@ -341,10 +339,11 @@ onMounted(() => {
class="absolute_button"
@click="onHistory(props.row.id)"
>
<q-tooltip>ประวัติแก้ไขบันทึกวันที่ไม่ได้รับเงินเดือนฯ</q-tooltip>
<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
@ -361,10 +360,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>
@ -377,7 +376,6 @@ onMounted(() => {
:visibleColumns="visibleColumnsHistory"
:columns="columnsHistory"
/>
</template>
<style scoped>
.absolute_button {

8
src/modules/10_registry/04_Achievement/01_Certificate.vue
View file

@ -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[]>([]);
@ -183,7 +183,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
]);
function onHistory(id: string) {
modalHistory.value = true;
idByRow.value = id
idByRow.value = id;
}
/** get data */
@ -357,9 +357,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>

8
src/modules/10_registry/04_Achievement/02_Training.vue
View file

@ -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[]>([]);
@ -311,7 +311,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
]);
function onHistory(id: string) {
modalHistory.value = true;
idByRow.value = id
idByRow.value = id;
}
/** get data */
@ -477,9 +477,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>

8
src/modules/10_registry/04_Achievement/03_Insignia.vue
View file

@ -10,7 +10,7 @@ import http from "@/plugins/http";
import config from "@/app.config";
import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
const idByRow = ref<string>('')
const idByRow = ref<string>("");
const store = useRegistryInFormationStore();
const rows = ref<any[]>([]);
const filter = ref<string>("");
@ -390,7 +390,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
function onHistory(id: string) {
modalHistory.value = true;
idByRow.value = id
idByRow.value = id;
}
/** get data */
@ -577,9 +577,9 @@ onMounted(async () => {
</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>

23
src/modules/10_registry/04_Achievement/04_Honor.vue
View file

@ -10,7 +10,7 @@ import http from "@/plugins/http";
import config from "@/app.config";
import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
const idByRow = ref<string>('')
const idByRow = ref<string>("");
const store = useRegistryInFormationStore();
const rows = ref<any[]>([]);
const filter = ref<string>("");
@ -185,14 +185,14 @@ const columnsHistory = ref<QTableProps["columns"]>([
function onHistory(id: string) {
modalHistory.value = true;
idByRow.value = id
idByRow.value = id;
}
/** get data */
function getData() {
showLoader();
http
.get(config.API.dataUserCertificate('honor'))
.get(config.API.dataUserCertificate("honor"))
.then((res) => {
const data = res.data.result;
rows.value = data;
@ -207,7 +207,10 @@ function getData() {
/** get history */
function getHistory() {
const url = store.typeProfile == 'OFFICER' ? config.API.dataUserHonorHistory('honor','',idByRow.value):config.API.dataUserHonorHistory('honor','-employee',idByRow.value)
const url =
store.typeProfile == "OFFICER"
? config.API.dataUserHonorHistory("honor", "", idByRow.value)
: config.API.dataUserHonorHistory("honor", "-employee", idByRow.value);
showLoader();
http
.get(url)
@ -308,7 +311,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>
@ -343,7 +346,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
@ -360,10 +362,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>
@ -376,7 +378,6 @@ onMounted(() => {
:visibleColumns="visibleColumnsHistory"
:columns="columnsHistory"
/>
</template>
<style scoped>
.absolute_button {

8
src/modules/10_registry/04_Achievement/05_Assessments.vue
View file

@ -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[]>([]);
@ -246,7 +246,7 @@ const visibleColumns = ref<string[]>([
function onHistory(id: string) {
modalHistory.value = true;
idByRow.value = id
idByRow.value = id;
}
/** get data */
@ -440,9 +440,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>

13
src/modules/10_registry/05_Other/01_Other.vue
View file

@ -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[]>([]);
@ -101,10 +101,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
function onHistory(id: string) {
modalHistory.value = true;
idByRow.value = id
idByRow.value = id;
}
/** get data */
function getData() {
showLoader();
@ -147,9 +146,7 @@ onMounted(() => {
<!-- v-if="mode" -->
<div class="col-12">
<q-toolbar class="q-px-none">
<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"
@ -268,9 +265,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>

4
src/modules/10_registry/Dialog/DialogHistory.vue
View file

@ -226,9 +226,9 @@ watch(
</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>

6
src/modules/10_registry/views/main.vue
View file

@ -179,7 +179,7 @@ onMounted(async () => {
</q-item>
<q-item>
<q-item-section class="text-grey-6">{{
store.typeProfile == "OFFICER" ? "ประเภทตำแหน่ง" : "กลุ่มงาน"
store.typeProfile == "OFFICER" ? "ตำแหน่งประเภท" : "กลุ่มงาน"
}}</q-item-section>
<q-item-section>{{
formData.posTypeName ? formData.posTypeName : "-"
@ -187,9 +187,7 @@ onMounted(async () => {
</q-item>
<q-item>
<q-item-section class="text-grey-6">{{
store.typeProfile == "OFFICER"
? "ระดับตำแหน่ง"
: "ระดับชั้นงาน"
store.typeProfile == "OFFICER" ? "ระดับ" : "ระดับชั้นงาน"
}}</q-item-section>
<q-item-section>{{
formData.posLevelName ? formData.posLevelName : "-"

13
src/modules/11_probation/views/main.vue
View file

@ -145,7 +145,7 @@ function getList(id: string) {
http
.get(config.API.probationMain(id))
.then((res) => {
const data = res.data.data
const data = res.data.data;
rows.value = data;
})
.catch((e) => {})
@ -168,7 +168,6 @@ function onDetail(id: string) {
}
onMounted(async () => {
await getMain();
});
</script>
@ -355,7 +354,11 @@ onMounted(async () => {
<template v-if="$q.screen.gt.xs" v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td v-for="(col, index) in props.cols" :key="col.name" @click="onDetail(props.row.id)">
<q-td
v-for="(col, index) in props.cols"
:key="col.name"
@click="onDetail(props.row.id)"
>
<div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</div>
@ -404,9 +407,9 @@ onMounted(async () => {
</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>