Merge branch 'develop' into devTee
This commit is contained in:
commit
21fb81243c
9 changed files with 75 additions and 82 deletions
|
|
@ -1,7 +1,7 @@
|
|||
<script setup lang="ts">
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useQuasar, type QTableColumn, type QTableProps } from "quasar";
|
||||
import { ref, reactive,onMounted } from "vue";
|
||||
import { ref, reactive, onMounted } from "vue";
|
||||
import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
|
||||
|
||||
//history dialog
|
||||
|
|
@ -11,7 +11,7 @@ import http from "@/plugins/http";
|
|||
import config from "@/app.config";
|
||||
|
||||
const store = useRegistryInFormationStore();
|
||||
const rowsHistory = ref<any[]>([])
|
||||
const rowsHistory = ref<any[]>([]);
|
||||
const $q = useQuasar();
|
||||
const mixin = useCounterMixin();
|
||||
const { showLoader, hideLoader, messageError, date2Thai } = mixin;
|
||||
|
|
@ -222,7 +222,6 @@ const visibleColumnsHistory = ref<string[]>([
|
|||
"createdAt",
|
||||
]);
|
||||
|
||||
|
||||
function onHistory() {
|
||||
modalHistory.value = true;
|
||||
}
|
||||
|
|
@ -258,7 +257,10 @@ function getData() {
|
|||
|
||||
/** get history */
|
||||
function getHistory() {
|
||||
const url = store.typeProfile == 'OFFICER' ? config.API.dataUserInformatioHistory(''):config.API.dataUserInformatioHistory('-employee')
|
||||
const url =
|
||||
store.typeProfile == "OFFICER"
|
||||
? config.API.dataUserInformatioHistory("")
|
||||
: config.API.dataUserInformatioHistory("-employee");
|
||||
showLoader();
|
||||
http
|
||||
.get(url)
|
||||
|
|
|
|||
|
|
@ -65,10 +65,10 @@ watch(
|
|||
</script>
|
||||
<template>
|
||||
<q-dialog v-model="modal" persistent>
|
||||
<q-card style="min-width: 70vw">
|
||||
<q-card>
|
||||
<DialogHeader :tittle="title" :close="close" />
|
||||
<q-separator />
|
||||
<q-card-section>
|
||||
<q-card-section style="max-height: 80vh" class="scroll">
|
||||
<div class="row justify-end q-col-gutter-sm q-mb-sm">
|
||||
<div class="col-12 col-sm-3">
|
||||
<q-input
|
||||
|
|
@ -209,7 +209,9 @@ watch(
|
|||
class="fix_top"
|
||||
>
|
||||
<q-item-label 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-section>
|
||||
<q-item-section v-else class="fix_top">
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import { useQuasar } from "quasar";
|
|||
const store = useRegistryInFormationStore();
|
||||
const $q = useQuasar();
|
||||
const mixin = useCounterMixin();
|
||||
const { messageError,dialogConfirm } = mixin;
|
||||
const { messageError, dialogConfirm } = mixin;
|
||||
const profileImg = ref<string>("");
|
||||
const router = useRouter();
|
||||
const tab = ref<string>("information");
|
||||
|
|
@ -100,7 +100,7 @@ function onClickDownloadKp7(type: string) {
|
|||
* logout keycloak
|
||||
* confirm ก่อนออกจากระบบ
|
||||
*/
|
||||
const doLogout = () => {
|
||||
const doLogout = () => {
|
||||
dialogConfirm(
|
||||
$q,
|
||||
() => {
|
||||
|
|
@ -332,6 +332,12 @@ onMounted(async () => {
|
|||
<q-avatar text-color="info" icon="mdi-chevron-right" />
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
<q-item clickable v-ripple disabled>
|
||||
<q-item-section>เปลี่ยนรหัสผ่าน</q-item-section>
|
||||
<q-item-section avatar>
|
||||
<q-avatar text-color="info" icon="mdi-chevron-right" />
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-card>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue