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

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">
{{

21
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[]>([]);
@ -152,9 +152,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 */
@ -178,7 +178,7 @@ function getData() {
function getHistory() {
showLoader();
http
.get(config.API.dataUserChangeNameHistory+`/${idByrow.value}`)
.get(config.API.dataUserChangeNameHistory + `/${idByrow.value}`)
.then((res) => {
const data = res.data.result;
rowsHistory.value = 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>
@ -348,4 +347,4 @@ onMounted(() => {
right: 5px;
top: -20px;
}
</style>
</style>

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

54
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",
@ -143,10 +143,10 @@ const columnsHistory = ref<QTableProps["columns"]>([
},
]);
function onHistory(type: string,id:string) {
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">
@ -256,7 +262,7 @@ onMounted(async () => {
dense
round
size="14px"
@click="onHistory('father','')"
@click="onHistory('father', '')"
>
<q-tooltip>ประวัติการแก้ไขข้อมูลบิดา</q-tooltip>
</q-btn>
@ -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 : "-" }}
@ -329,7 +335,7 @@ onMounted(async () => {
dense
round
size="14px"
@click="onHistory('mother','')"
@click="onHistory('mother', '')"
>
<q-tooltip>ประวัติการแก้ไขข้อมูลมารดา</q-tooltip>
</q-btn>
@ -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 : "-" }}
@ -405,7 +411,7 @@ onMounted(async () => {
dense
round
size="14px"
@click="onHistory('couple','')"
@click="onHistory('couple', '')"
>
<q-tooltip>ประวัติการแก้ไขข้อมูลคู่สมรส</q-tooltip>
</q-btn>
@ -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>
@ -503,7 +515,7 @@ onMounted(async () => {
dense
round
size="14px"
@click="onHistory('children',item.id)"
@click="onHistory('children', item.id)"
>
<q-tooltip>ประวัติการแก้ไขข้อมูลบุตร</q-tooltip>
</q-btn>
@ -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">
{{

22
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[]>([]);
@ -428,9 +428,9 @@ const visibleColumnsHistory = ref<string[]>([
"lastUpdatedAt",
]);
function onHistory(id: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
@ -630,7 +628,7 @@ onMounted(() => {
top: -20px;
}
.fix_top{
justify-content: start!important;
.fix_top {
justify-content: start !important;
}
</style>
</style>

18
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[]>([]);
@ -153,9 +153,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 */
@ -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>
@ -353,7 +353,7 @@ onMounted(() => {
top: -20px;
}
.fix_top{
justify-content: start!important;
.fix_top {
justify-content: start !important;
}
</style>