updated fixed tital of dialog
This commit is contained in:
parent
a9053ada32
commit
4484904042
3 changed files with 28 additions and 53 deletions
|
|
@ -12,6 +12,8 @@ import type {
|
||||||
FromCancelDetail,
|
FromCancelDetail,
|
||||||
} from "@/modules/05_leave/interface/response/leave";
|
} from "@/modules/05_leave/interface/response/leave";
|
||||||
|
|
||||||
|
import DialogHeader from "@/components/DialogHeader.vue";
|
||||||
|
|
||||||
/** import componest*/
|
/** import componest*/
|
||||||
import FormLeave from "@/modules/05_leave/components/formDetail/01_SickForm.vue";
|
import FormLeave from "@/modules/05_leave/components/formDetail/01_SickForm.vue";
|
||||||
import FormChildbirth from "@/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue";
|
import FormChildbirth from "@/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue";
|
||||||
|
|
@ -433,34 +435,15 @@ watch(
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<q-dialog v-model="props.modal" persistent>
|
<q-dialog v-model="props.modal" persistent>
|
||||||
<q-card q-card style="min-width: 70%" v-if="props.leaveStatus != 'DELETE'">
|
<q-card v-if="props.leaveStatus != 'DELETE'">
|
||||||
<q-card-section class="row items-center q-pa-sm">
|
<DialogHeader
|
||||||
<q-toolbar style="padding: 0px;">
|
:tittle="`${titleMain} ${titleName}`"
|
||||||
<q-toolbar-title class="text-bold" style="font-size: 15px;"> {{ titleMain }}{{ titleName }} </q-toolbar-title>
|
:close="props.onClickClose"
|
||||||
|
/>
|
||||||
<q-btn
|
|
||||||
icon="close"
|
|
||||||
unelevated
|
|
||||||
round
|
|
||||||
dense
|
|
||||||
@click="props.onClickClose"
|
|
||||||
style="color: #ff8080; background-color: #ffdede"
|
|
||||||
/>
|
|
||||||
</q-toolbar>
|
|
||||||
|
|
||||||
<!-- <div class="text-bold q-pl-sm">{{ titleMain }}{{ titleName }}</div>
|
|
||||||
<q-space />
|
|
||||||
<q-btn
|
|
||||||
icon="close"
|
|
||||||
unelevated
|
|
||||||
round
|
|
||||||
dense
|
|
||||||
@click="props.onClickClose"
|
|
||||||
style="color: #ff8080; background-color: #ffdede"
|
|
||||||
/> -->
|
|
||||||
</q-card-section>
|
|
||||||
<q-separator />
|
<q-separator />
|
||||||
<q-card-section class="q-pa-sm row q-gutter-y-md">
|
|
||||||
|
<q-card-section class="scroll" style="max-height: 70vh">
|
||||||
<div
|
<div
|
||||||
flat
|
flat
|
||||||
:class="
|
:class="
|
||||||
|
|
@ -560,10 +543,7 @@ watch(
|
||||||
</div>
|
</div>
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
<q-separator />
|
<q-separator />
|
||||||
<q-card-section
|
<q-card-section v-if="props.leaveStatus === 'CANCEL'" align="right">
|
||||||
class="row items-center q-pa-sm"
|
|
||||||
v-if="props.leaveStatus === 'CANCEL'"
|
|
||||||
>
|
|
||||||
<q-space />
|
<q-space />
|
||||||
<q-btn
|
<q-btn
|
||||||
label="ยืนยัน"
|
label="ยืนยัน"
|
||||||
|
|
@ -576,21 +556,12 @@ watch(
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
</q-card>
|
</q-card>
|
||||||
|
|
||||||
<q-card q-card style="min-width: 70%" v-if="props.leaveStatus === 'DELETE'">
|
<q-card q-card v-if="props.leaveStatus === 'DELETE'">
|
||||||
<q-card-section class="row items-center q-pa-sm">
|
<DialogHeader
|
||||||
<div class="text-bold q-pl-sm">
|
:tittle="`${titleMainCancle} ${titleName}`"
|
||||||
{{ titleMainCancle }}{{ titleName }}
|
:close="props.onClickClose"
|
||||||
</div>
|
/>
|
||||||
<q-space />
|
|
||||||
<q-btn
|
|
||||||
icon="close"
|
|
||||||
unelevated
|
|
||||||
round
|
|
||||||
dense
|
|
||||||
@click="props.onClickClose"
|
|
||||||
style="color: #ff8080; background-color: #ffdede"
|
|
||||||
/>
|
|
||||||
</q-card-section>
|
|
||||||
<q-separator />
|
<q-separator />
|
||||||
<q-card-section class="q-p-md row q-gutter-y-md">
|
<q-card-section class="q-p-md row q-gutter-y-md">
|
||||||
<div flat class="col-12">
|
<div flat class="col-12">
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { useCounterMixin } from "@/stores/mixin";
|
import { useCounterMixin } from "@/stores/mixin";
|
||||||
import { useQuasar, type QTableColumn, type QTableProps } from "quasar";
|
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";
|
import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
|
||||||
|
|
||||||
//history dialog
|
//history dialog
|
||||||
|
|
@ -11,7 +11,7 @@ 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();
|
||||||
const { showLoader, hideLoader, messageError, date2Thai } = mixin;
|
const { showLoader, hideLoader, messageError, date2Thai } = mixin;
|
||||||
|
|
@ -222,7 +222,6 @@ const visibleColumnsHistory = ref<string[]>([
|
||||||
"createdAt",
|
"createdAt",
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
||||||
function onHistory() {
|
function onHistory() {
|
||||||
modalHistory.value = true;
|
modalHistory.value = true;
|
||||||
}
|
}
|
||||||
|
|
@ -258,7 +257,10 @@ function getData() {
|
||||||
|
|
||||||
/** get history */
|
/** get history */
|
||||||
function getHistory() {
|
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();
|
showLoader();
|
||||||
http
|
http
|
||||||
.get(url)
|
.get(url)
|
||||||
|
|
|
||||||
|
|
@ -65,10 +65,10 @@ watch(
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<q-dialog v-model="modal" persistent>
|
<q-dialog v-model="modal" persistent>
|
||||||
<q-card style="min-width: 70vw">
|
<q-card>
|
||||||
<DialogHeader :tittle="title" :close="close" />
|
<DialogHeader :tittle="title" :close="close" />
|
||||||
<q-separator />
|
<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="row justify-end q-col-gutter-sm q-mb-sm">
|
||||||
<div class="col-12 col-sm-3">
|
<div class="col-12 col-sm-3">
|
||||||
<q-input
|
<q-input
|
||||||
|
|
@ -209,7 +209,9 @@ watch(
|
||||||
class="fix_top"
|
class="fix_top"
|
||||||
>
|
>
|
||||||
<q-item-label class="text-dark text-weight-medium">
|
<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>
|
||||||
<q-item-section v-else class="fix_top">
|
<q-item-section v-else class="fix_top">
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue