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

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

@ -257,10 +257,10 @@ watch(
<div class="row q-px-md q-py-sm items-center bg-grey-1"> <div class="row q-px-md q-py-sm items-center bg-grey-1">
<div class="col-12"> <div class="col-12">
<span>{{ <span>{{
type == "capacity" || type == "development" type == "capacity" || type == "development"
? "เหตุการณ์/พฤติกรรม" ? "เหตุการณ์/พฤติกรรม"
: "ความก้าวหน้า" : "ความก้าวหน้า"
}}</span> }}</span>
</div> </div>
</div> </div>
@ -350,157 +350,159 @@ watch(
<q-separator /> <q-separator />
</div> </div>
<!-- ความคิดเห็นของผู้ประเมิน --> <div if="type == 'capacity' || type == 'development'">
<q-form <!-- ความคิดเห็นของผู้ประเมิน -->
v-if="store.dataEvaluation.evaluatorId" <q-form
ref="reasonEvaluatorRef" v-if="store.dataEvaluation.evaluatorId"
greedy ref="reasonEvaluatorRef"
@submit.prevent greedy
@validation-success="onSubmitComment('evaluator')" @submit.prevent
class="full-width q-mt-sm" @validation-success="onSubmitComment('evaluator')"
> class="full-width q-mt-sm"
<div class="row col-12 q-col-gutter-sm"> >
<div class="col-12"> <div class="row col-12 q-col-gutter-sm">
<span class="text-weight-medium text-grey-6" <div class="col-12">
>ความคิดเห็นของผู้ประเมิน</span <span class="text-weight-medium text-grey-6"
> >ความคิดเห็นของผู้ประเมิน</span
</div> >
<div class="col-12"> </div>
<q-input <div class="col-12">
outlined <q-input
dense outlined
:readonly=" dense
formDataView.reasonEvaluator !== null || :readonly="
store.rolePerson !== 'EVALUATOR' formDataView.reasonEvaluator !== null ||
store.rolePerson !== 'EVALUATOR'
"
label="ความคิดเห็นของผู้ประเมิน"
v-model="reasonEvaluator"
type="textarea"
class="inputgreen"
lazy-rules
hide-bottom-space
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้ประเมิน'}`,]"
></q-input>
</div>
<div
v-if="
formDataView.reasonEvaluator == null &&
store.rolePerson == 'EVALUATOR'
" "
label="ความคิดเห็นของผู้ประเมิน" class="col-12"
v-model="reasonEvaluator" align="right"
type="textarea"
class="inputgreen"
lazy-rules
hide-bottom-space
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้ประเมิน'}`,]"
></q-input>
</div>
<div
v-if="
formDataView.reasonEvaluator == null &&
store.rolePerson == 'EVALUATOR'
"
class="col-12"
align="right"
>
<q-btn
label="บันทึกความคิดเห็น"
color="secondary"
type="submit"
><q-tooltip>บันทึกความคิดเห็น</q-tooltip></q-btn
> >
<q-btn
label="บันทึกความคิดเห็น"
color="secondary"
type="submit"
><q-tooltip>บันทึกความคิดเห็น</q-tooltip></q-btn
>
</div>
</div> </div>
</div> </q-form>
</q-form>
<!-- ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป --> <!-- ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป -->
<q-form <q-form
v-if="store.dataEvaluation.commanderId" v-if="store.dataEvaluation.commanderId"
class="full-width q-mt-sm" class="full-width q-mt-sm"
ref="reasonCommanderRef" ref="reasonCommanderRef"
greedy greedy
@submit.prevent @submit.prevent
@validation-success="onSubmitComment('commander')" @validation-success="onSubmitComment('commander')"
> >
<div class="row col-12 q-col-gutter-sm"> <div class="row col-12 q-col-gutter-sm">
<div class="col-12"> <div class="col-12">
<span class="text-weight-medium text-grey-6" <span class="text-weight-medium text-grey-6"
>ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป</span >ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป</span
> >
</div> </div>
<div class="col-12"> <div class="col-12">
<q-input <q-input
outlined outlined
dense dense
label="ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป" label="ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป"
v-model="reasonCommander" v-model="reasonCommander"
type="textarea" type="textarea"
class="inputgreen" class="inputgreen"
lazy-rules lazy-rules
:readonly=" :readonly="
formDataView.reasonCommander !== null || formDataView.reasonCommander !== null ||
store.rolePerson !== 'COMMANDER' store.rolePerson !== 'COMMANDER'
"
hide-bottom-space
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป'}`,]"
></q-input>
</div>
<div
v-if="
formDataView.reasonCommander == null &&
store.rolePerson == 'COMMANDER'
" "
hide-bottom-space class="col-12"
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป'}`,]" align="right"
></q-input>
</div>
<div
v-if="
formDataView.reasonCommander == null &&
store.rolePerson == 'COMMANDER'
"
class="col-12"
align="right"
>
<q-btn
label="บันทึกความคิดเห็น"
color="secondary"
type="submit"
><q-tooltip>บันทึกความคิดเห็น</q-tooltip></q-btn
> >
<q-btn
label="บันทึกความคิดเห็น"
color="secondary"
type="submit"
><q-tooltip>บันทึกความคิดเห็น</q-tooltip></q-btn
>
</div>
</div> </div>
</div> </q-form>
</q-form>
<q-form <q-form
v-if="store.dataEvaluation.commanderHighId" v-if="store.dataEvaluation.commanderHighId"
class="full-width q-mt-sm" class="full-width q-mt-sm"
ref="reasonCommanderHighRef" ref="reasonCommanderHighRef"
greedy greedy
@submit.prevent @submit.prevent
@validation-success="onSubmitComment('commanderhigh')" @validation-success="onSubmitComment('commanderhigh')"
> >
<div class="row col-12 q-col-gutter-sm"> <div class="row col-12 q-col-gutter-sm">
<div class="col-12"> <div class="col-12">
<span class="text-weight-medium text-grey-6" <span class="text-weight-medium text-grey-6"
>ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง</span >ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง</span
> >
</div> </div>
<div class="col-12"> <div class="col-12">
<q-input <q-input
outlined outlined
dense dense
label="ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง" label="ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง"
v-model="reasonCommanderHigh" v-model="reasonCommanderHigh"
type="textarea" type="textarea"
class="inputgreen" class="inputgreen"
lazy-rules lazy-rules
:readonly=" :readonly="
formDataView.reasonCommanderHigh !== null || formDataView.reasonCommanderHigh !== null ||
store.rolePerson !== 'COMMANDERHIGH' store.rolePerson !== 'COMMANDERHIGH'
"
hide-bottom-space
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง'}`,]"
></q-input>
</div>
<div
v-if="
formDataView.reasonCommanderHigh == null &&
store.rolePerson == 'COMMANDERHIGH'
" "
hide-bottom-space class="col-12"
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง'}`,]" align="right"
></q-input>
</div>
<div
v-if="
formDataView.reasonCommanderHigh == null &&
store.rolePerson == 'COMMANDERHIGH'
"
class="col-12"
align="right"
>
<q-btn
label="บันทึกความคิดเห็น"
color="secondary"
type="submit"
><q-tooltip>บันทึกความคิดเห็น</q-tooltip></q-btn
> >
<q-btn
label="บันทึกความคิดเห็น"
color="secondary"
type="submit"
><q-tooltip>บันทึกความคิดเห็น</q-tooltip></q-btn
>
</div>
</div> </div>
</div> </q-form>
</q-form> </div>
</div> </div>
</div> </div>
</template> </template>

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

@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import DialogHeader from "@/components/DialogHeader.vue"; import DialogHeader from "@/components/DialogHeader.vue";
import type { QTableProps } from "quasar"; import type { QTableProps } from "quasar";
import { ref,watch } from "vue"; import { ref, watch } from "vue";
import { useCounterMixin } from "@/stores/mixin"; import { useCounterMixin } from "@/stores/mixin";
import { useQuasar } from "quasar"; import { useQuasar } from "quasar";
import { useRouter, useRoute } from "vue-router"; import { useRouter, useRoute } from "vue-router";
@ -25,7 +25,7 @@ const {
const route = useRoute(); const route = useRoute();
const router = useRouter(); 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 modal = defineModel<boolean>("modal", { required: true });
const filterKeyword = ref<string>(""); const filterKeyword = ref<string>("");
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
@ -56,7 +56,7 @@ const columns = ref<QTableProps["columns"]>([
{ {
name: "posMasterNoOld", name: "posMasterNoOld",
align: "left", align: "left",
label: "เลขที่ตำแหน่ง", label: "ตำแหน่งเลขที่",
sortable: true, sortable: true,
field: "posMasterNoOld", field: "posMasterNoOld",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
@ -77,7 +77,7 @@ const columns = ref<QTableProps["columns"]>([
{ {
name: "positionLevel", name: "positionLevel",
align: "left", align: "left",
label: "ประเภทตำแหน่ง", label: "ตำแหน่งประเภท",
sortable: true, sortable: true,
field: "positionLevel", field: "positionLevel",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
@ -192,24 +192,29 @@ function close() {
modal.value = false; modal.value = false;
} }
function getData(){ function getData() {
showLoader() showLoader();
http http
.get(config.API.placementKeycloak+`/${store.dataProfile.profileId}`) .get(config.API.placementKeycloak + `/${store.dataProfile.profileId}`)
.then((res)=>{ .then((res) => {
const data = res.data.result const data = res.data.result;
rows.value = data rows.value = data;
}).catch((e)=>{
messageError($q,e)
}).finally(()=>{
hideLoader()
}) })
.catch((e) => {
messageError($q, e);
})
.finally(() => {
hideLoader();
});
} }
watch(()=>modal.value,(n)=>{ watch(
if(n == true){ () => modal.value,
getData() (n) => {
if (n == true) {
getData();
} }
}) }
);
</script> </script>
<template> <template>
<q-dialog persistent v-model="modal"> <q-dialog persistent v-model="modal">

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

@ -562,7 +562,7 @@ onMounted(async () => {
</div> </div>
<div class="col-xs-12 col-md-2"> <div class="col-xs-12 col-md-2">
<div :class="$q.screen.gt.sm ? 'column' : 'row'"> <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">{{ <span class="text-weight-medium text-dark col">{{
store.dataEvaluation.posTypeName store.dataEvaluation.posTypeName
}}</span> }}</span>
@ -570,7 +570,7 @@ onMounted(async () => {
</div> </div>
<div class="col-xs-12 col-md-2"> <div class="col-xs-12 col-md-2">
<div :class="$q.screen.gt.sm ? 'column' : 'row'"> <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">{{ <span class="text-weight-medium text-dark col">{{
store.dataEvaluation.posLevelName store.dataEvaluation.posLevelName
}}</span> }}</span>

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

@ -583,11 +583,11 @@ onMounted(async () => {
<div class="col-8 text-weight-medium"> <div class="col-8 text-weight-medium">
{{ dataPerson.firstName ? dataPerson.name : "-" }} {{ dataPerson.firstName ? dataPerson.name : "-" }}
</div> </div>
<div class="col-4 text-grey">ตำแหน่ง</div> <div class="col-4 text-grey">ตำแหน่งในสายงาน</div>
<div class="col-8 text-weight-medium"> <div class="col-8 text-weight-medium">
{{ dataPerson.position ? dataPerson.position : "-" }} {{ dataPerson.position ? dataPerson.position : "-" }}
</div> </div>
<div class="col-4 text-grey">ประเภทตำแหน่ง</div> <div class="col-4 text-grey">ตำแหน่งประเภท</div>
<div class="col-8 text-weight-medium"> <div class="col-8 text-weight-medium">
{{ dataPerson.type ? dataPerson.type : "-" }} {{ dataPerson.type ? dataPerson.type : "-" }}
</div> </div>
@ -595,7 +595,7 @@ onMounted(async () => {
</div> </div>
<div class="col-xs-12 col-md-6"> <div class="col-xs-12 col-md-6">
<div class="row q-col-gutter-md"> <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"> <div class="col-8 text-weight-medium">
{{ dataPerson.level ? dataPerson.level : "-" }} {{ dataPerson.level ? dataPerson.level : "-" }}
</div> </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 modalHistory = ref<boolean>(false);
/** ตัวแปรข้อมูล */ /** ตัวแปรข้อมูล */
const formDataInformation = reactive<any>({ const formDataInformation = reactive<any>({
citizenId: "", //เลขบัตรประจำตัวประชาชน citizenId: "", //เลขประจำตัวประชาชน
prefix: "", prefix: "",
firstName: "", firstName: "",
lastName: "", lastName: "",
@ -304,7 +304,7 @@ onMounted(() => {
<div class="col-12 col-sm-12 col-md-6 q-gutter-y-sm"> <div class="col-12 col-sm-12 col-md-6 q-gutter-y-sm">
<div class="row"> <div class="row">
<div class="col-5 text-grey-6 text-weight-medium"> <div class="col-5 text-grey-6 text-weight-medium">
เลขบัตรประจำตัวประชาชน เลขประจำตัวประชาชน
</div> </div>
<div class="col-7"> <div class="col-7">
{{ {{

19
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 http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
const idByrow = ref<string>('') const idByrow = ref<string>("");
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
const filter = ref<string>(""); const filter = ref<string>("");
const rowsHistory = ref<any[]>([]); const rowsHistory = ref<any[]>([]);
@ -152,9 +152,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
}, },
]); ]);
function onHistory(id:string) { function onHistory(id: string) {
modalHistory.value = true; modalHistory.value = true;
idByrow.value = id idByrow.value = id;
} }
/** get data */ /** get data */
@ -178,7 +178,7 @@ function getData() {
function getHistory() { function getHistory() {
showLoader(); showLoader();
http http
.get(config.API.dataUserChangeNameHistory+`/${idByrow.value}`) .get(config.API.dataUserChangeNameHistory + `/${idByrow.value}`)
.then((res) => { .then((res) => {
const data = res.data.result; const data = res.data.result;
rowsHistory.value = data; rowsHistory.value = data;
@ -273,7 +273,7 @@ onMounted(() => {
{{ props.rowIndex + 1 }} {{ props.rowIndex + 1 }}
</div> </div>
<div v-else> <div v-else>
{{ col.value? col.value:'-' }} {{ col.value ? col.value : "-" }}
</div> </div>
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
@ -308,7 +308,6 @@ onMounted(() => {
<q-tooltip>ประวัติแก้ไขประวัติการศึกษา</q-tooltip> <q-tooltip>ประวัติแก้ไขประวัติการศึกษา</q-tooltip>
</q-btn> </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> <q-item-section>
<q-item-label class="text-grey-6 text-weight-medium">{{ <q-item-label class="text-grey-6 text-weight-medium">{{
col.label col.label
@ -325,10 +324,10 @@ onMounted(() => {
</div> </div>
</template> </template>
<template v-slot:no-data> <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"> <div
<span> class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
ไม่พบข้อมูลประวัติการเปลี่ยนชื่อ-นามสกุล >
</span> <span> ไม่พบข้อมูล </span>
</div> </div>
</template> </template>
</d-table> </d-table>

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

@ -238,7 +238,10 @@ function getData() {
/** get history */ /** get history */
function getHistory() { 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(); showLoader();
http http
.get(url) .get(url)
@ -263,10 +266,19 @@ onMounted(() => {
<q-toolbar class="q-px-none"> <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-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-tooltip>ประวัติข้อมูลที่อยู่</q-tooltip>
</q-btn> </q-btn>
</q-toolbar> </q-toolbar>
<q-card bordered class="bg-grey-1 q-pa-md"> <q-card bordered class="bg-grey-1 q-pa-md">
<div class="row"> <div class="row">
<div class="col-12 col-sm-12 col-md-6 q-gutter-y-sm"> <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 type { FormChildren } from "@/modules/10_registry/interface/index/Family";
import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry"; import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
const idFamily = ref<string>('') const idFamily = ref<string>("");
const store = useRegistryInFormationStore(); const store = useRegistryInFormationStore();
const rowsHistory = ref<any[]>([]); const rowsHistory = ref<any[]>([]);
const $q = useQuasar(); const $q = useQuasar();
@ -41,7 +41,7 @@ const fatherData = reactive<any>({
firstName: "", firstName: "",
lastName: "", lastName: "",
job: "", job: "",
profileId:'' profileId: "",
}); });
const motherData = reactive<any>({ const motherData = reactive<any>({
isLive: null, isLive: null,
@ -50,7 +50,7 @@ const motherData = reactive<any>({
firstName: "", firstName: "",
lastName: "", lastName: "",
job: "", job: "",
profileId:'' profileId: "",
}); });
const coupleData = reactive<any>({ const coupleData = reactive<any>({
isLive: null, isLive: null,
@ -61,7 +61,7 @@ const coupleData = reactive<any>({
job: "", job: "",
lastNameOld: "", lastNameOld: "",
statusMarital: "", statusMarital: "",
profileId:'' profileId: "",
}); });
const childData = ref<FormChildren[]>([]); const childData = ref<FormChildren[]>([]);
@ -79,7 +79,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
{ {
name: "citizenId", name: "citizenId",
align: "left", align: "left",
label: "เลขบัตรประจำตัวประชาชน", label: "เลขประจำตัวประชาชน",
sortable: true, sortable: true,
field: "citizenId", field: "citizenId",
headerStyle: "font-size: 14px", 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; modalHistory.value = true;
typeForm.value = type; typeForm.value = type;
idFamily.value = id ? id:'user' idFamily.value = id ? id : "user";
} }
/** get data */ /** get data */
@ -202,7 +202,14 @@ function getData(type: string) {
/** get history */ /** get history */
function getHistory() { 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(); showLoader();
http http
@ -216,7 +223,8 @@ function getHistory() {
lastName: e[`${typeForm.value}LastName`], lastName: e[`${typeForm.value}LastName`],
job: e[`${typeForm.value}Career`], job: e[`${typeForm.value}Career`],
isLive: e[`${typeForm.value}Live`], isLive: e[`${typeForm.value}Live`],
lastNameOld: typeForm.value === "couple" ? e.coupleLastNameOld : undefined, lastNameOld:
typeForm.value === "couple" ? e.coupleLastNameOld : undefined,
})); }));
}) })
.catch((e) => { .catch((e) => {
@ -242,8 +250,6 @@ onMounted(async () => {
> >
</q-toolbar> </q-toolbar>
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12" v-if="fatherData.profileId !== ''"> <div class="col-12" v-if="fatherData.profileId !== ''">
<q-card bordered class="q-pa-md"> <q-card bordered class="q-pa-md">
<div class="row"> <div class="row">
@ -256,7 +262,7 @@ onMounted(async () => {
dense dense
round round
size="14px" size="14px"
@click="onHistory('father','')" @click="onHistory('father', '')"
> >
<q-tooltip>ประวัติการแก้ไขข้อมูลบิดา</q-tooltip> <q-tooltip>ประวัติการแก้ไขข้อมูลบิดา</q-tooltip>
</q-btn> </q-btn>
@ -266,7 +272,7 @@ onMounted(async () => {
<div class="col-12 col-sm-12 col-md-12 q-gutter-y-sm"> <div class="col-12 col-sm-12 col-md-12 q-gutter-y-sm">
<div class="row"> <div class="row">
<div class="col-5 text-grey-6 text-weight-medium"> <div class="col-5 text-grey-6 text-weight-medium">
เลขบัตรประจำตัวประชาชน เลขประจำตัวประชาชน
</div> </div>
<div class="col-7"> <div class="col-7">
{{ fatherData.citizenId ? fatherData.citizenId : "-" }} {{ fatherData.citizenId ? fatherData.citizenId : "-" }}
@ -329,7 +335,7 @@ onMounted(async () => {
dense dense
round round
size="14px" size="14px"
@click="onHistory('mother','')" @click="onHistory('mother', '')"
> >
<q-tooltip>ประวัติการแก้ไขข้อมูลมารดา</q-tooltip> <q-tooltip>ประวัติการแก้ไขข้อมูลมารดา</q-tooltip>
</q-btn> </q-btn>
@ -339,7 +345,7 @@ onMounted(async () => {
<div class="col-12 col-sm-12 col-md-12 q-gutter-y-sm"> <div class="col-12 col-sm-12 col-md-12 q-gutter-y-sm">
<div class="row"> <div class="row">
<div class="col-5 text-grey-6 text-weight-medium"> <div class="col-5 text-grey-6 text-weight-medium">
เลขบัตรประจำตัวประชาชน เลขประจำตัวประชาชน
</div> </div>
<div class="col-7"> <div class="col-7">
{{ motherData.citizenId ? motherData.citizenId : "-" }} {{ motherData.citizenId ? motherData.citizenId : "-" }}
@ -405,7 +411,7 @@ onMounted(async () => {
dense dense
round round
size="14px" size="14px"
@click="onHistory('couple','')" @click="onHistory('couple', '')"
> >
<q-tooltip>ประวัติการแก้ไขข้อมูลคู่สมรส</q-tooltip> <q-tooltip>ประวัติการแก้ไขข้อมูลคู่สมรส</q-tooltip>
</q-btn> </q-btn>
@ -418,12 +424,16 @@ onMounted(async () => {
สถานภาพการสมรส สถานภาพการสมรส
</div> </div>
<div class="col-7"> <div class="col-7">
{{ coupleData.statusMarital ? coupleData.statusMarital : "-" }} {{
coupleData.statusMarital
? coupleData.statusMarital
: "-"
}}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-5 text-grey-6 text-weight-medium"> <div class="col-5 text-grey-6 text-weight-medium">
เลขบัตรประจำตัวประชาชน เลขประจำตัวประชาชน
</div> </div>
<div class="col-7"> <div class="col-7">
{{ coupleData.citizenId ? coupleData.citizenId : "-" }} {{ coupleData.citizenId ? coupleData.citizenId : "-" }}
@ -448,7 +458,9 @@ onMounted(async () => {
นามสกุลเดิม นามสกุลเดิม
</div> </div>
<div class="col-7"> <div class="col-7">
{{ coupleData.lastNameOld ? coupleData.lastNameOld : "-" }} {{
coupleData.lastNameOld ? coupleData.lastNameOld : "-"
}}
</div> </div>
</div> </div>
</div> </div>
@ -503,7 +515,7 @@ onMounted(async () => {
dense dense
round round
size="14px" size="14px"
@click="onHistory('children',item.id)" @click="onHistory('children', item.id)"
> >
<q-tooltip>ประวัติการแก้ไขข้อมูลบุตร</q-tooltip> <q-tooltip>ประวัติการแก้ไขข้อมูลบุตร</q-tooltip>
</q-btn> </q-btn>
@ -513,7 +525,7 @@ onMounted(async () => {
<div class="col-12 col-sm-12 col-md-12 q-gutter-y-sm"> <div class="col-12 col-sm-12 col-md-12 q-gutter-y-sm">
<div class="row"> <div class="row">
<div class="col-5 text-grey-6 text-weight-medium"> <div class="col-5 text-grey-6 text-weight-medium">
เลขบัตรประจำตัวประชาชน เลขประจำตัวประชาชน
</div> </div>
<div class="col-7"> <div class="col-7">
{{ {{

20
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 http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
const idByRow = ref<string>('') const idByRow = ref<string>("");
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
const filter = ref<string>(""); const filter = ref<string>("");
const rowsHistory = ref<any[]>([]); const rowsHistory = ref<any[]>([]);
@ -428,9 +428,9 @@ const visibleColumnsHistory = ref<string[]>([
"lastUpdatedAt", "lastUpdatedAt",
]); ]);
function onHistory(id:string) { function onHistory(id: string) {
modalHistory.value = true; modalHistory.value = true;
idByRow.value = id idByRow.value = id;
} }
/** get data */ /** get data */
@ -587,7 +587,6 @@ onMounted(() => {
<q-tooltip>ประวัติแก้ไขประวัติการศึกษา</q-tooltip> <q-tooltip>ประวัติแก้ไขประวัติการศึกษา</q-tooltip>
</q-btn> </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-section class="fix_top">
<q-item-label class="text-grey-6 text-weight-medium">{{ <q-item-label class="text-grey-6 text-weight-medium">{{
col.label col.label
@ -604,13 +603,12 @@ onMounted(() => {
</div> </div>
</template> </template>
<template v-slot:no-data> <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"> <div
<span> class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
ไม่พบข้อมูลประวัติการศึกษา >
</span> <span> ไม่พบข้อมูล </span>
</div> </div>
</template> </template>
</d-table> </d-table>
</div> </div>
<DialogHistory <DialogHistory
@ -630,7 +628,7 @@ onMounted(() => {
top: -20px; top: -20px;
} }
.fix_top{ .fix_top {
justify-content: start!important; 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 http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
const idByRow = ref<string>('') const idByRow = ref<string>("");
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
const filter = ref<string>(""); const filter = ref<string>("");
const rowsHistory = ref<any[]>([]); const rowsHistory = ref<any[]>([]);
@ -153,9 +153,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
}, },
]); ]);
function onHistory(id:string) { function onHistory(id: string) {
modalHistory.value = true; modalHistory.value = true;
idByRow.value = id idByRow.value = id;
} }
/** get data */ /** get data */
@ -329,10 +329,10 @@ onMounted(() => {
</div> </div>
</template> </template>
<template v-slot:no-data> <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"> <div
<span> class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
ไม่พบข้อมูลความสามารถพิเศษ >
</span> <span> ไม่พบข้อมูล </span>
</div> </div>
</template> </template>
</d-table> </d-table>
@ -353,7 +353,7 @@ onMounted(() => {
top: -20px; top: -20px;
} }
.fix_top{ .fix_top {
justify-content: start!important; justify-content: start !important;
} }
</style> </style>

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

@ -2,7 +2,7 @@
import { useCounterMixin } from "@/stores/mixin"; import { useCounterMixin } from "@/stores/mixin";
import { useQuasar, type QTableProps } from "quasar"; import { useQuasar, type QTableProps } from "quasar";
import { ref, reactive, onMounted } from "vue"; import { ref, reactive, onMounted } from "vue";
import { useRegistryInFormationStore } from '@/modules/10_registry/store/registry' import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
//history dialog //history dialog
import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue"; 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 http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
const store = useRegistryInFormationStore() const store = useRegistryInFormationStore();
const rowsHistory = ref<any[]>([]); const rowsHistory = ref<any[]>([]);
const $q = useQuasar(); const $q = useQuasar();
const mixin = useCounterMixin(); const mixin = useCounterMixin();
@ -309,7 +309,10 @@ function getData() {
/** get history */ /** get history */
function getHistory() { 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(); showLoader();
http http
.get(url) .get(url)
@ -354,23 +357,31 @@ onMounted(() => {
<div class="col-7"> <div class="col-7">
{{ formData.org ? formData.org : "-" }} {{ formData.org ? formData.org : "-" }}
</div> </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"> <div class="col-7">
{{ formData.position ? formData.position : "-" }} {{ formData.position ? formData.position : "-" }}
</div> </div>
<div class="col-5 text-grey-6 text-weight-medium"> <div class="col-5 text-grey-6 text-weight-medium">
เลขที่ตำแหน่ง ตำแหน่งเลขที่
</div> </div>
<div class="col-7"> <div class="col-7">
{{ formData.posMasterNo ? formData.posMasterNo : "-" }} {{ formData.posMasterNo ? formData.posMasterNo : "-" }}
</div> </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>
<div v-if="store.typeProfile == 'OFFICER'" class="col-7"> <div v-if="store.typeProfile == 'OFFICER'" class="col-7">
{{ formData.posExecutive ? formData.posExecutive : "-" }} {{ formData.posExecutive ? formData.posExecutive : "-" }}
</div> </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>
<div v-if="store.typeProfile == 'OFFICER'" class="col-7"> <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="col-12 col-sm-12 col-md-6">
<div class="row q-col-gutter-y-sm"> <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"> <div v-if="store.typeProfile == 'OFFICER'" class="col-7">
{{ formData.positionField ? formData.positionField : "-" }} {{ formData.positionField ? formData.positionField : "-" }}
</div> </div>
<div class="col-5 text-grey-6 text-weight-medium"> <div class="col-5 text-grey-6 text-weight-medium">
{{store.typeProfile == 'OFFICER' ? 'ประเภทตำแหน่ง':'กลุ่มงาน'}} {{
store.typeProfile == "OFFICER" ? "ตำแหน่งประเภท" : "กลุ่มงาน"
}}
</div> </div>
<div class="col-7"> <div class="col-7">
{{ formData.posType ? formData.posType : "-" }} {{ formData.posType ? formData.posType : "-" }}
</div> </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"> <div class="col-7">
{{ formData.posLevel ? formData.posLevel : "-" }} {{ formData.posLevel ? formData.posLevel : "-" }}
</div> </div>

26
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 http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
const idByRow = ref<string>('') const idByRow = ref<string>("");
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
const filter = ref<string>(""); const filter = ref<string>("");
const rowsHistory = ref<any[]>([]); const rowsHistory = ref<any[]>([]);
@ -205,9 +205,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
}, },
]); ]);
function onHistory(id:string) { function onHistory(id: string) {
modalHistory.value = true; modalHistory.value = true;
idByRow.value = id idByRow.value = id;
} }
/** get data */ /** get data */
@ -252,9 +252,7 @@ onMounted(() => {
<!-- v-if="mode" --> <!-- v-if="mode" -->
<div class="col-12"> <div class="col-12">
<q-toolbar class="q-px-none q-mt-md"> <q-toolbar class="q-px-none q-mt-md">
<span class="text-blue-6 text-weight-bold text-body1" <span class="text-blue-6 text-weight-bold text-body1">วินัย</span>
>วินัย</span
>
<q-space /> <q-space />
<q-input <q-input
v-if="mode" v-if="mode"
@ -329,7 +327,7 @@ onMounted(() => {
{{ props.row.status ? props.row.status : "-" }} {{ props.row.status ? props.row.status : "-" }}
</div> </div>
<div v-else> <div v-else>
{{ col.value?col.value:'-' }} {{ col.value ? col.value : "-" }}
</div> </div>
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
@ -364,7 +362,6 @@ onMounted(() => {
<q-tooltip>ประวัติแก้ไขวินัย</q-tooltip> <q-tooltip>ประวัติแก้ไขวินัย</q-tooltip>
</q-btn> </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-section class="fix_top">
<q-item-label class="text-grey-6 text-weight-medium">{{ <q-item-label class="text-grey-6 text-weight-medium">{{
col.label col.label
@ -381,10 +378,10 @@ onMounted(() => {
</div> </div>
</template> </template>
<template v-slot:no-data> <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"> <div
<span> class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
ไม่พบข้อมูลวินัย >
</span> <span> ไม่พบข้อมูล </span>
</div> </div>
</template> </template>
</d-table> </d-table>
@ -397,7 +394,6 @@ onMounted(() => {
:visibleColumns="visibleColumns" :visibleColumns="visibleColumns"
:columns="columns" :columns="columns"
/> />
</template> </template>
<style scoped> <style scoped>
.absolute_button { .absolute_button {
@ -406,7 +402,7 @@ onMounted(() => {
top: -20px; top: -20px;
} }
.fix_top{ .fix_top {
justify-content: start!important; justify-content: start !important;
} }
</style> </style>

23
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 http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
const idByRow = ref<string>('') const idByRow = ref<string>("");
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
const filter = ref<string>(""); const filter = ref<string>("");
const rowsHistory = ref<any[]>([]); const rowsHistory = ref<any[]>([]);
@ -203,9 +203,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
}, },
]); ]);
function onHistory(id:string) { function onHistory(id: string) {
modalHistory.value = true; modalHistory.value = true;
idByRow.value = id idByRow.value = id;
} }
/** get data */ /** get data */
@ -225,7 +225,6 @@ function getData() {
status: item.status, status: item.status,
reason: item.reason, reason: item.reason,
typeLeaveId: item.leaveTypeId, typeLeaveId: item.leaveTypeId,
})); }));
}) })
.catch((e) => { .catch((e) => {
@ -415,7 +414,7 @@ onMounted(() => {
> >
<q-tooltip>ประวัติแก้ไขการลา</q-tooltip> <q-tooltip>ประวัติแก้ไขการลา</q-tooltip>
</q-btn> </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-section class="fix_top">
<q-item-label class="text-grey-6 text-weight-medium">{{ <q-item-label class="text-grey-6 text-weight-medium">{{
col.label col.label
@ -434,10 +433,12 @@ onMounted(() => {
}}</q-item-label }}</q-item-label
> >
<q-item-label <q-item-label
v-else-if="col.name == 'status'" v-else-if="col.name == 'status'"
class="text-dark text-weight-medium" 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">{{ <q-item-label v-else class="text-dark text-weight-medium">{{
col.value ? col.value : "-" col.value ? col.value : "-"
@ -450,9 +451,9 @@ onMounted(() => {
</template> </template>
<template v-slot:no-data> <template v-slot:no-data>
<div <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> </div>
</template> </template>
</d-table> </d-table>
@ -474,7 +475,7 @@ onMounted(() => {
top: -20px; top: -20px;
} }
.fix_top{ .fix_top {
justify-content: start!important; justify-content: start !important;
} }
</style> </style>

22
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 http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
const idByRow = ref<string>('') const idByRow = ref<string>("");
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
const filter = ref<string>(""); const filter = ref<string>("");
const rowsHistory = ref<any[]>([]); const rowsHistory = ref<any[]>([]);
@ -206,9 +206,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
}, },
]); ]);
function onHistory(id:string) { function onHistory(id: string) {
modalHistory.value = true; modalHistory.value = true;
idByRow.value = id idByRow.value = id;
} }
/** get data */ /** get data */
@ -330,7 +330,7 @@ onMounted(() => {
{{ props.row.status ? props.row.status : "-" }} {{ props.row.status ? props.row.status : "-" }}
</div> </div>
<div v-else> <div v-else>
{{ col.value?col.value:'-' }} {{ col.value ? col.value : "-" }}
</div> </div>
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
@ -365,7 +365,6 @@ onMounted(() => {
<q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ</q-tooltip> <q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ</q-tooltip>
</q-btn> </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-section class="fix_top">
<q-item-label class="text-grey-6 text-weight-medium">{{ <q-item-label class="text-grey-6 text-weight-medium">{{
col.label col.label
@ -382,10 +381,10 @@ onMounted(() => {
</div> </div>
</template> </template>
<template v-slot:no-data> <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"> <div
<span> class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
ไม่พบข้อมูลปฏิบัติราชการพิเศษ >
</span> <span> ไม่พบข้อมูล </span>
</div> </div>
</template> </template>
</d-table> </d-table>
@ -398,7 +397,6 @@ onMounted(() => {
:visibleColumns="visibleColumnsHistory" :visibleColumns="visibleColumnsHistory"
:columns="columnsHistory" :columns="columnsHistory"
/> />
</template> </template>
<style scoped> <style scoped>
.absolute_button { .absolute_button {
@ -407,7 +405,7 @@ onMounted(() => {
top: -20px; top: -20px;
} }
.fix_top{ .fix_top {
justify-content: start!important; justify-content: start !important;
} }
</style> </style>

28
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 http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
const idByRow = ref<string>('') const idByRow = ref<string>("");
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
const filter = ref<string>(""); const filter = ref<string>("");
const rowsHistory = ref<any[]>([]); const rowsHistory = ref<any[]>([]);
@ -90,7 +90,6 @@ const columns = ref<QTableProps["columns"]>([
}, },
]); ]);
const visibleColumnsHistory = ref<string[]>([ const visibleColumnsHistory = ref<string[]>([
"date", "date",
"reference", "reference",
@ -184,10 +183,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
}, },
]); ]);
function onHistory(id: string) {
function onHistory(id:string) {
modalHistory.value = true; modalHistory.value = true;
idByRow.value = id idByRow.value = id;
} }
/** get data */ /** get data */
@ -309,7 +307,7 @@ onMounted(() => {
{{ props.row.status ? props.row.status : "-" }} {{ props.row.status ? props.row.status : "-" }}
</div> </div>
<div v-else> <div v-else>
{{ col.value?col.value:'-' }} {{ col.value ? col.value : "-" }}
</div> </div>
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
@ -341,10 +339,11 @@ onMounted(() => {
class="absolute_button" class="absolute_button"
@click="onHistory(props.row.id)" @click="onHistory(props.row.id)"
> >
<q-tooltip>ประวัติแก้ไขบันทึกวันที่ไม่ได้รับเงินเดือนฯ</q-tooltip> <q-tooltip
>ประวัติแก้ไขบันทึกวันที่ไม่ได้รับเงินเดือนฯ</q-tooltip
>
</q-btn> </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-section class="fix_top">
<q-item-label class="text-grey-6 text-weight-medium">{{ <q-item-label class="text-grey-6 text-weight-medium">{{
col.label col.label
@ -361,10 +360,10 @@ onMounted(() => {
</div> </div>
</template> </template>
<template v-slot:no-data> <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"> <div
<span> class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
ไม่พบข้อมูลบันทึกวันที่ไม่ได้รับเงินเดือนฯ >
</span> <span> ไม่พบข้อมูล </span>
</div> </div>
</template> </template>
</d-table> </d-table>
@ -377,7 +376,6 @@ onMounted(() => {
:visibleColumns="visibleColumnsHistory" :visibleColumns="visibleColumnsHistory"
:columns="columnsHistory" :columns="columnsHistory"
/> />
</template> </template>
<style scoped> <style scoped>
.absolute_button { .absolute_button {
@ -386,7 +384,7 @@ onMounted(() => {
top: -20px; top: -20px;
} }
.fix_top{ .fix_top {
justify-content: start!important; justify-content: start !important;
} }
</style> </style>

12
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 http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
const idByRow = ref<string>('') const idByRow = ref<string>("");
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
const filter = ref<string>(""); const filter = ref<string>("");
const rowsHistory = ref<any[]>([]); const rowsHistory = ref<any[]>([]);
@ -181,9 +181,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
}, },
]); ]);
function onHistory(id:string) { function onHistory(id: string) {
modalHistory.value = true; modalHistory.value = true;
idByRow.value = id idByRow.value = id;
} }
/** get data */ /** get data */
@ -207,7 +207,7 @@ function getData() {
function getHistory() { function getHistory() {
showLoader(); showLoader();
http http
.get(config.API.dataUserCertificateHistory("certificate",idByRow.value)) .get(config.API.dataUserCertificateHistory("certificate", idByRow.value))
.then((res) => { .then((res) => {
const data = res.data.result; const data = res.data.result;
rowsHistory.value = data; rowsHistory.value = data;
@ -357,9 +357,9 @@ onMounted(() => {
</template> </template>
<template v-slot:no-data> <template v-slot:no-data>
<div <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> </div>
</template> </template>
</d-table> </d-table>

12
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 http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
const idByRow = ref<string>('') const idByRow = ref<string>("");
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
const filter = ref<string>(""); const filter = ref<string>("");
const rowsHistory = ref<any[]>([]); const rowsHistory = ref<any[]>([]);
@ -309,9 +309,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
}, },
]); ]);
function onHistory(id:string) { function onHistory(id: string) {
modalHistory.value = true; modalHistory.value = true;
idByRow.value = id idByRow.value = id;
} }
/** get data */ /** get data */
@ -335,7 +335,7 @@ function getData() {
function getHistory() { function getHistory() {
showLoader(); showLoader();
http http
.get(config.API.dataUserCertificateHistory("training",idByRow.value)) .get(config.API.dataUserCertificateHistory("training", idByRow.value))
.then((res) => { .then((res) => {
const data = res.data.result; const data = res.data.result;
rowsHistory.value = data; rowsHistory.value = data;
@ -477,9 +477,9 @@ onMounted(() => {
</template> </template>
<template v-slot:no-data> <template v-slot:no-data>
<div <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> </div>
</template> </template>
</d-table> </d-table>

12
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 config from "@/app.config";
import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry"; import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
const idByRow = ref<string>('') const idByRow = ref<string>("");
const store = useRegistryInFormationStore(); const store = useRegistryInFormationStore();
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
const filter = ref<string>(""); const filter = ref<string>("");
@ -388,9 +388,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
}, },
]); ]);
function onHistory(id:string) { function onHistory(id: string) {
modalHistory.value = true; modalHistory.value = true;
idByRow.value = id idByRow.value = id;
} }
/** get data */ /** get data */
@ -414,7 +414,7 @@ function getData() {
function getHistory() { function getHistory() {
showLoader(); showLoader();
http http
.get(config.API.dataUserCertificateHistory("insignia",idByRow.value)) .get(config.API.dataUserCertificateHistory("insignia", idByRow.value))
.then((res) => { .then((res) => {
const data = res.data.result; const data = res.data.result;
rowsHistory.value = data; rowsHistory.value = data;
@ -577,9 +577,9 @@ onMounted(async () => {
</template> </template>
<template v-slot:no-data> <template v-slot:no-data>
<div <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> </div>
</template> </template>
</d-table> </d-table>

29
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 config from "@/app.config";
import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry"; import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
const idByRow = ref<string>('') const idByRow = ref<string>("");
const store = useRegistryInFormationStore(); const store = useRegistryInFormationStore();
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
const filter = ref<string>(""); const filter = ref<string>("");
@ -183,16 +183,16 @@ const columnsHistory = ref<QTableProps["columns"]>([
}, },
]); ]);
function onHistory(id:string) { function onHistory(id: string) {
modalHistory.value = true; modalHistory.value = true;
idByRow.value = id idByRow.value = id;
} }
/** get data */ /** get data */
function getData() { function getData() {
showLoader(); showLoader();
http http
.get(config.API.dataUserCertificate('honor')) .get(config.API.dataUserCertificate("honor"))
.then((res) => { .then((res) => {
const data = res.data.result; const data = res.data.result;
rows.value = data; rows.value = data;
@ -207,7 +207,10 @@ function getData() {
/** get history */ /** get history */
function getHistory() { 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(); showLoader();
http http
.get(url) .get(url)
@ -308,7 +311,7 @@ onMounted(() => {
{{ props.row.status ? props.row.status : "-" }} {{ props.row.status ? props.row.status : "-" }}
</div> </div>
<div v-else> <div v-else>
{{ col.value?col.value:'-' }} {{ col.value ? col.value : "-" }}
</div> </div>
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
@ -343,7 +346,6 @@ onMounted(() => {
<q-tooltip>ประวัติแก้ไขประกาศเกียรติคุณ</q-tooltip> <q-tooltip>ประวัติแก้ไขประกาศเกียรติคุณ</q-tooltip>
</q-btn> </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-section class="fix_top">
<q-item-label class="text-grey-6 text-weight-medium">{{ <q-item-label class="text-grey-6 text-weight-medium">{{
col.label col.label
@ -360,10 +362,10 @@ onMounted(() => {
</div> </div>
</template> </template>
<template v-slot:no-data> <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"> <div
<span> class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
ไม่พบข้อมูลประกาศเกียรติคุณ >
</span> <span> ไม่พบข้อมูล </span>
</div> </div>
</template> </template>
</d-table> </d-table>
@ -376,7 +378,6 @@ onMounted(() => {
:visibleColumns="visibleColumnsHistory" :visibleColumns="visibleColumnsHistory"
:columns="columnsHistory" :columns="columnsHistory"
/> />
</template> </template>
<style scoped> <style scoped>
.absolute_button { .absolute_button {
@ -385,7 +386,7 @@ onMounted(() => {
top: -20px; top: -20px;
} }
.fix_top{ .fix_top {
justify-content: start!important; justify-content: start !important;
} }
</style> </style>

12
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 http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
const idByRow = ref<string>('') const idByRow = ref<string>("");
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
const filter = ref<string>(""); const filter = ref<string>("");
const rowsHistory = ref<any[]>([]); const rowsHistory = ref<any[]>([]);
@ -244,9 +244,9 @@ const visibleColumns = ref<string[]>([
"date", "date",
]); ]);
function onHistory(id:string) { function onHistory(id: string) {
modalHistory.value = true; modalHistory.value = true;
idByRow.value = id idByRow.value = id;
} }
/** get data */ /** get data */
@ -270,7 +270,7 @@ function getData() {
function getHistory() { function getHistory() {
showLoader(); showLoader();
http http
.get(config.API.dataUserCertificateHistory("assessments",idByRow.value)) .get(config.API.dataUserCertificateHistory("assessments", idByRow.value))
.then((res) => { .then((res) => {
const data = res.data.result; const data = res.data.result;
rowsHistory.value = data; rowsHistory.value = data;
@ -440,9 +440,9 @@ onMounted(() => {
</template> </template>
<template v-slot:no-data> <template v-slot:no-data>
<div <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> </div>
</template> </template>
</d-table> </d-table>

15
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 http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
const idByRow = ref<string>('') const idByRow = ref<string>("");
const rows = ref<any[]>([]); const rows = ref<any[]>([]);
const filter = ref<string>(""); const filter = ref<string>("");
const rowsHistory = ref<any[]>([]); const rowsHistory = ref<any[]>([]);
@ -99,12 +99,11 @@ const columnsHistory = ref<QTableProps["columns"]>([
}, },
]); ]);
function onHistory(id:string) { function onHistory(id: string) {
modalHistory.value = true; modalHistory.value = true;
idByRow.value = id idByRow.value = id;
} }
/** get data */ /** get data */
function getData() { function getData() {
showLoader(); showLoader();
@ -147,9 +146,7 @@ onMounted(() => {
<!-- v-if="mode" --> <!-- v-if="mode" -->
<div class="col-12"> <div class="col-12">
<q-toolbar class="q-px-none"> <q-toolbar class="q-px-none">
<span class="text-blue-6 text-weight-bold text-body1" <span class="text-blue-6 text-weight-bold text-body1">ข้อมูลอื่นๆ</span>
>ข้อมูลอื่นๆ</span
>
<q-space /> <q-space />
<q-input <q-input
v-if="mode" v-if="mode"
@ -268,9 +265,9 @@ onMounted(() => {
</template> </template>
<template v-slot:no-data> <template v-slot:no-data>
<div <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> </div>
</template> </template>
</d-table> </d-table>

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

@ -226,9 +226,9 @@ watch(
</template> </template>
<template v-slot:no-data> <template v-slot:no-data>
<div <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> </div>
</template> </template>
</d-table> </d-table>

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

@ -21,7 +21,7 @@ import { useQuasar } from "quasar";
const store = useRegistryInFormationStore(); const store = useRegistryInFormationStore();
const $q = useQuasar(); const $q = useQuasar();
const mixin = useCounterMixin(); const mixin = useCounterMixin();
const { messageError, dialogConfirm ,showLoader,hideLoader } = mixin; const { messageError, dialogConfirm, showLoader, hideLoader } = mixin;
const profileImg = ref<string>(""); const profileImg = ref<string>("");
const router = useRouter(); const router = useRouter();
const tab = ref<string>("information"); const tab = ref<string>("information");
@ -179,7 +179,7 @@ onMounted(async () => {
</q-item> </q-item>
<q-item> <q-item>
<q-item-section class="text-grey-6">{{ <q-item-section class="text-grey-6">{{
store.typeProfile == "OFFICER" ? "ประเภทตำแหน่ง" : "กลุ่มงาน" store.typeProfile == "OFFICER" ? "ตำแหน่งประเภท" : "กลุ่มงาน"
}}</q-item-section> }}</q-item-section>
<q-item-section>{{ <q-item-section>{{
formData.posTypeName ? formData.posTypeName : "-" formData.posTypeName ? formData.posTypeName : "-"
@ -187,9 +187,7 @@ onMounted(async () => {
</q-item> </q-item>
<q-item> <q-item>
<q-item-section class="text-grey-6">{{ <q-item-section class="text-grey-6">{{
store.typeProfile == "OFFICER" store.typeProfile == "OFFICER" ? "ระดับ" : "ระดับชั้นงาน"
? "ระดับตำแหน่ง"
: "ระดับชั้นงาน"
}}</q-item-section> }}</q-item-section>
<q-item-section>{{ <q-item-section>{{
formData.posLevelName ? formData.posLevelName : "-" formData.posLevelName ? formData.posLevelName : "-"

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

@ -145,7 +145,7 @@ function getList(id: string) {
http http
.get(config.API.probationMain(id)) .get(config.API.probationMain(id))
.then((res) => { .then((res) => {
const data = res.data.data const data = res.data.data;
rows.value = data; rows.value = data;
}) })
.catch((e) => {}) .catch((e) => {})
@ -168,7 +168,6 @@ function onDetail(id: string) {
} }
onMounted(async () => { onMounted(async () => {
await getMain(); await getMain();
}); });
</script> </script>
@ -292,7 +291,7 @@ onMounted(async () => {
dense dense
v-model="filter" v-model="filter"
label="ค้นหา" label="ค้นหา"
:style="mode ? `max-width: 200px`:`max-width: 150px`" :style="mode ? `max-width: 200px` : `max-width: 150px`"
> >
<template v-slot:append> <template v-slot:append>
<q-icon <q-icon
@ -355,7 +354,11 @@ onMounted(async () => {
<template v-if="$q.screen.gt.xs" v-slot:body="props"> <template v-if="$q.screen.gt.xs" v-slot:body="props">
<q-tr :props="props" class="cursor-pointer"> <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'"> <div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }} {{ props.rowIndex + 1 }}
</div> </div>
@ -404,9 +407,9 @@ onMounted(async () => {
</template> </template>
<template v-slot:no-data> <template v-slot:no-data>
<div <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> </div>
</template> </template>
</d-table> </d-table>