no message
This commit is contained in:
setthawutttty
parent
47f84f444b
commit
c9e8f3b89c
9 changed files with 1150 additions and 217 deletions
|
|
@ -434,7 +434,7 @@ const fieldLabels = {
|
|||
:key="index"
|
||||
>
|
||||
<div class="col-12 col-sm-12 col-md-4">
|
||||
<span class="text-grey-7">{{
|
||||
<span class="text-grey-6 text-weight-medium">{{
|
||||
fieldLabels[field as keyof typeof fieldLabels]
|
||||
}}</span>
|
||||
</div>
|
||||
|
|
@ -450,7 +450,7 @@ const fieldLabels = {
|
|||
:key="index"
|
||||
>
|
||||
<div class="col-12 col-sm-12 col-md-4">
|
||||
<span class="text-grey-7">{{
|
||||
<span class="text-grey-6 text-weight-medium">{{
|
||||
fieldLabels[field as keyof typeof fieldLabels]
|
||||
}}</span>
|
||||
</div>
|
||||
|
|
@ -466,7 +466,7 @@ const fieldLabels = {
|
|||
<div class="col-12 col-sm-6 col-md-6">
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-12 col-md-4">
|
||||
<span class="text-grey-7">วันที่สั่งบรรจุ</span>
|
||||
<span class="text-grey-6 text-weight-medium">วันที่สั่งบรรจุ</span>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-8">
|
||||
<span>{{
|
||||
|
|
@ -478,7 +478,7 @@ const fieldLabels = {
|
|||
<div class="col-12 col-sm-6 col-md-6">
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-12 col-md-4">
|
||||
<span class="text-grey-7">วันที่เริ่มปฏิบัติราชการ</span>
|
||||
<span class="text-grey-6 text-weight-medium">วันที่เริ่มปฏิบัติราชการ</span>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-8">
|
||||
<span>{{
|
||||
|
|
@ -495,7 +495,7 @@ const fieldLabels = {
|
|||
>
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-12 col-md-4">
|
||||
<span class="text-grey-7">เหตุผลที่วันที่ไม่ตรงกัน</span>
|
||||
<span class="text-grey-6 text-weight-medium">เหตุผลที่วันที่ไม่ตรงกัน</span>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-8">
|
||||
<span>{{
|
||||
|
|
@ -507,7 +507,7 @@ const fieldLabels = {
|
|||
<div class="col-12 col-sm-6 col-md-6">
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-12 col-md-4">
|
||||
<span class="text-grey-7">วันเกษียณอายุ</span>
|
||||
<span class="text-grey-6 text-weight-medium">วันเกษียณอายุ</span>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-8">
|
||||
<span>{{
|
||||
|
|
@ -523,7 +523,7 @@ const fieldLabels = {
|
|||
<div class="col-12 col-sm-6 col-md-6">
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-12 col-md-4">
|
||||
<span class="text-grey-7">อายุราชการ</span>
|
||||
<span class="text-grey-6 text-weight-medium">อายุราชการ</span>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-8">
|
||||
<span>{{ formMain.ageAll !== "" ? formMain.ageAll : "-" }}</span>
|
||||
|
|
@ -533,7 +533,7 @@ const fieldLabels = {
|
|||
<div class="col-12 col-sm-6 col-md-6">
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-12 col-md-4">
|
||||
<span class="text-grey-7">ขาดราชการ</span>
|
||||
<span class="text-grey-6 text-weight-medium">ขาดราชการ</span>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-8">
|
||||
<span>{{ formMain.absent ? formMain.absent : 0 }}</span>
|
||||
|
|
@ -543,7 +543,7 @@ const fieldLabels = {
|
|||
<div class="col-12 col-sm-6 col-md-6">
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-12 col-md-4">
|
||||
<span class="text-grey-7">อายุราชการเกื้อกูล</span>
|
||||
<span class="text-grey-6 text-weight-medium">อายุราชการเกื้อกูล</span>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-8">
|
||||
<span>{{ formMain.age ? formMain.age : 0 }}</span>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ const {
|
|||
} = mixin;
|
||||
|
||||
const rows = ref<RequestItemsObject[]>([]);
|
||||
const mode = ref<string>("card");
|
||||
const mode = ref<string>("table");
|
||||
const filterKeyword = ref<string>("");
|
||||
const formFilter = reactive<FormFilter>({
|
||||
page: 1,
|
||||
|
|
@ -416,13 +416,13 @@ function getData() {
|
|||
rows.value = data;
|
||||
}
|
||||
|
||||
|
||||
onMounted(() => {
|
||||
getData();
|
||||
});
|
||||
</script>
|
||||
<template>
|
||||
<div class="row items-center q-gutter-x-sm q-py-sm">
|
||||
|
||||
<q-btn color="teal-5" icon="add" flat round @click="openDialogAdd()"
|
||||
><q-tooltip>เพิ่มข้อมูล</q-tooltip></q-btn
|
||||
>
|
||||
|
|
@ -560,17 +560,9 @@ onMounted(() => {
|
|||
</q-tr>
|
||||
</template>
|
||||
<template v-slot:item="props" v-else>
|
||||
<div class="col-xs-12 col-sm-6 col-md-4">
|
||||
<q-card flat bordered class="q-pa-md">
|
||||
<div class="row q-pb-sm">
|
||||
<div class="column">
|
||||
<div class="text-weight-bold">
|
||||
{{ props.row.level !== "" ? props.row.level : "-" }}
|
||||
</div>
|
||||
<div class="text-weight-light full-width text-left text-grey-9">
|
||||
{{ date2Thai(props.row.date) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-6 col-md-6">
|
||||
<q-card flat bordered class="q-pa-none">
|
||||
<div class="row bg-grey-3">
|
||||
<q-space />
|
||||
<div class="q-gutter-x-sm">
|
||||
<q-btn
|
||||
|
|
@ -593,62 +585,49 @@ onMounted(() => {
|
|||
</div>
|
||||
<q-separator />
|
||||
<q-card-section class="q-pa-none">
|
||||
<q-list>
|
||||
<q-item class="q-pa-none">
|
||||
<q-item-section>
|
||||
<q-item-label>รายละเอียด</q-item-label>
|
||||
</q-item-section>
|
||||
<q-item-section side>
|
||||
<q-item-label caption>{{
|
||||
props.row.detail !== "" ? props.row.detail : "-"
|
||||
}}</q-item-label>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
<div class="row q-pa-sm">
|
||||
<div class="col text-grey-6 text-weight-medium">
|
||||
ระดับการลงโทษทางวินัย
|
||||
</div>
|
||||
<div class="col">
|
||||
{{ props.row.level !== "" ? props.row.level : "-" }}
|
||||
</div>
|
||||
<div class="col text-grey-6 text-weight-medium">วัน/เดือน/ปี</div>
|
||||
<div class="col">
|
||||
{{ props.row.date ? date2Thai(props.row.date) : "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<q-separator />
|
||||
<div class="row q-pa-sm bg-grey-2">
|
||||
<div class="col text-grey-6 text-weight-medium">รายละเอียด</div>
|
||||
<div class="col">
|
||||
{{ props.row.detail !== "" ? props.row.detail : "-" }}
|
||||
</div>
|
||||
<div class="col text-grey-6 text-weight-medium">ล้างมลทิน</div>
|
||||
<div class="col">
|
||||
{{ props.row.unStigma !== "" ? props.row.unStigma : "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<q-separator />
|
||||
<div class="row q-pa-sm">
|
||||
<div class="col text-grey-6 text-weight-medium">เลขที่คำสั่ง</div>
|
||||
<div class="col">
|
||||
{{
|
||||
props.row.refCommandNo !== "" ? props.row.refCommandNo : "-"
|
||||
}}
|
||||
</div>
|
||||
<div class="col text-grey-6 text-weight-medium">
|
||||
เอกสารอ้างอิง (ลงวันที่)
|
||||
</div>
|
||||
<div class="col">
|
||||
{{
|
||||
props.row.refCommandDate
|
||||
? date2Thai(props.row.refCommandDate)
|
||||
: "-"
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<q-item class="q-pa-none">
|
||||
<q-item-section>
|
||||
<q-item-label>ล้างมลทิน</q-item-label>
|
||||
</q-item-section>
|
||||
<q-item-section side>
|
||||
<q-item-label caption>
|
||||
{{
|
||||
props.row.unStigma !== "" ? props.row.unStigma : "-"
|
||||
}}</q-item-label
|
||||
>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
|
||||
<q-item class="q-pa-none">
|
||||
<q-item-section>
|
||||
<q-item-label>เลขที่คำสั่ง</q-item-label>
|
||||
</q-item-section>
|
||||
<q-item-section side>
|
||||
<q-item-label caption>
|
||||
{{
|
||||
props.row.refCommandNo !== ""
|
||||
? props.row.refCommandNo
|
||||
: "-"
|
||||
}}</q-item-label
|
||||
>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
<q-item class="q-pa-none">
|
||||
<q-item-section>
|
||||
<q-item-label
|
||||
>เอกสารอ้างอิง (ลงวันที่)</q-item-label
|
||||
></q-item-section
|
||||
>
|
||||
<q-item-section side>
|
||||
<q-item-label caption>
|
||||
{{
|
||||
props.row.refCommandDate
|
||||
? date2Thai(props.row.refCommandDate)
|
||||
: "-"
|
||||
}}</q-item-label
|
||||
>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ import DialogHistory from "@/modules/04_registryNew/components/detail/Government
|
|||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
|
||||
const rowsTotal = ref<ResponseTotalObject[]>([]);
|
||||
const id = ref<string>("");
|
||||
const route = useRoute();
|
||||
|
|
@ -38,7 +37,7 @@ const {
|
|||
dateToISO,
|
||||
} = mixin;
|
||||
|
||||
const mode = ref<string>("card");
|
||||
const mode = ref<string>("table");
|
||||
const filterKeyword = ref<string>("");
|
||||
const currentPage = ref<number>(1);
|
||||
const maxPage = ref<number>(1);
|
||||
|
|
@ -479,7 +478,6 @@ onMounted(() => {
|
|||
</script>
|
||||
<template>
|
||||
<div class="row items-center q-gutter-x-sm q-py-sm">
|
||||
|
||||
<q-btn color="teal-5" icon="add" flat round @click="openDialogAdd()"
|
||||
><q-tooltip>เพิ่มข้อมูล</q-tooltip></q-btn
|
||||
>
|
||||
|
|
@ -619,13 +617,8 @@ onMounted(() => {
|
|||
</template>
|
||||
<template v-slot:item="props" v-else>
|
||||
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-6">
|
||||
<q-card flat bordered class="q-pa-md">
|
||||
<div class="row q-pb-sm items-center">
|
||||
<div class="column">
|
||||
<div class="text-weight-bold">
|
||||
{{ props.row.typeLeave !== "" ? props.row.typeLeave : "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<q-card flat bordered class="q-pa-none">
|
||||
<div class="row bg-grey-3">
|
||||
<q-space />
|
||||
<div class="q-gutter-x-sm">
|
||||
<q-btn
|
||||
|
|
@ -648,94 +641,51 @@ onMounted(() => {
|
|||
</div>
|
||||
<q-separator />
|
||||
<q-card-section class="q-pa-none">
|
||||
<q-list>
|
||||
<q-item class="q-pa-none">
|
||||
<q-item-section>
|
||||
<q-item-label>วัน/เดือน/ปี ที่ลา</q-item-label>
|
||||
</q-item-section>
|
||||
<q-item-section side>
|
||||
<q-item-label caption>{{
|
||||
dateThaiRange([props.row.dateStartLeave, props.row.dateEndLeave])
|
||||
}}</q-item-label>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
|
||||
<q-item class="q-pa-none">
|
||||
<q-item-section>
|
||||
<q-item-label>จำนวนวันลา</q-item-label>
|
||||
</q-item-section>
|
||||
<q-item-section side>
|
||||
<q-item-label caption>
|
||||
{{
|
||||
props.row.numLeave ? props.row.numLeave : "-"
|
||||
}}</q-item-label
|
||||
>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
|
||||
<q-item class="q-pa-none">
|
||||
<q-item-section>
|
||||
<q-item-label>ลามาเเล้ว</q-item-label>
|
||||
</q-item-section>
|
||||
<q-item-section side>
|
||||
<q-item-label caption>
|
||||
{{
|
||||
props.row.sumLeave
|
||||
? props.row.sumLeave
|
||||
: "-"
|
||||
}}</q-item-label
|
||||
>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
<q-item class="q-pa-none">
|
||||
<q-item-section>
|
||||
<q-item-label
|
||||
>รวมเป็น</q-item-label
|
||||
></q-item-section
|
||||
>
|
||||
<q-item-section side>
|
||||
<q-item-label caption>
|
||||
{{
|
||||
props.row.totalLeave
|
||||
? props.row.totalLeave
|
||||
: "-"
|
||||
}}</q-item-label
|
||||
>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
<q-item class="q-pa-none">
|
||||
<q-item-section>
|
||||
<q-item-label
|
||||
>สถานะ</q-item-label
|
||||
></q-item-section
|
||||
>
|
||||
<q-item-section side>
|
||||
<q-item-label caption>
|
||||
{{
|
||||
props.row.status
|
||||
? statusLeave(props.row.status)
|
||||
: "-"
|
||||
}}</q-item-label
|
||||
>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
<q-item class="q-pa-none">
|
||||
<q-item-section>
|
||||
<q-item-label
|
||||
>เหตุผล</q-item-label
|
||||
></q-item-section
|
||||
>
|
||||
<q-item-section side>
|
||||
<q-item-label caption>
|
||||
{{
|
||||
props.row.reason
|
||||
!== ''? props.row.reason
|
||||
: "-"
|
||||
}}</q-item-label
|
||||
>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
<div class="row q-pa-sm">
|
||||
<div class="col text-grey-6 text-weight-medium">ประเภทการลา</div>
|
||||
<div class="col">
|
||||
{{ props.row.typeLeave !== "" ? props.row.typeLeave : "-" }}
|
||||
</div>
|
||||
<div class="col text-grey-6 text-weight-medium">
|
||||
วัน/เดือน/ปี ที่ลา
|
||||
</div>
|
||||
<div class="col">
|
||||
{{
|
||||
props.row.dateStartLeave
|
||||
? date2Thai(props.row.dateStartLeave)
|
||||
: "-"
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
<q-separator />
|
||||
<div class="row q-pa-sm bg-grey-2">
|
||||
<div class="col text-grey-6 text-weight-medium">จำนวนวันลา</div>
|
||||
<div class="col">
|
||||
{{ props.row.numLeave ? props.row.numLeave : "-" }}
|
||||
</div>
|
||||
<div class="col text-grey-6 text-weight-medium">ลามาเเล้ว</div>
|
||||
<div class="col">
|
||||
{{ props.row.sumLeave ? props.row.sumLeave : "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<q-separator />
|
||||
<div class="row q-pa-sm">
|
||||
<div class="col text-grey-6 text-weight-medium">รวมเป็น</div>
|
||||
<div class="col">
|
||||
{{ props.row.totalLeave ? props.row.totalLeave : "-" }}
|
||||
</div>
|
||||
<div class="col text-grey-6 text-weight-medium">สถานะ</div>
|
||||
<div class="col">
|
||||
{{ props.row.status ? statusLeave(props.row.status) : "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<q-separator />
|
||||
<div class="row q-pa-sm bg-grey-2">
|
||||
<div class="col-3 text-grey-6 text-weight-medium">เหตุผล</div>
|
||||
<div class="col-3">
|
||||
{{ props.row.reason !== "" ? props.row.reason : "-" }}
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ const objectRef: MyObjectRef = {
|
|||
|
||||
const rows = ref<RequestItemsObject[]>([]);
|
||||
const filterKeyword = ref<string>("");
|
||||
const mode = ref<string>("card");
|
||||
const mode = ref<string>("table");
|
||||
|
||||
const formFilter = reactive<FormFilter>({
|
||||
page: 1,
|
||||
|
|
@ -446,17 +446,9 @@ onMounted(() => {
|
|||
</q-tr>
|
||||
</template>
|
||||
<template v-slot:item="props" v-else>
|
||||
<div class="col-xs-12 col-sm-6 col-md-4">
|
||||
<q-card flat bordered class="q-pa-md">
|
||||
<div class="row q-pb-sm">
|
||||
<div class="column">
|
||||
<div class="text-weight-bold">
|
||||
{{ props.row.level !== "" ? props.row.level : "-" }}
|
||||
</div>
|
||||
<div class="text-weight-light full-width text-left text-grey-9">
|
||||
{{ date2Thai(props.row.date) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-6 col-md-6">
|
||||
<q-card flat bordered class="q-pa-none">
|
||||
<div class="row bg-grey-3">
|
||||
<q-space />
|
||||
<div class="q-gutter-x-sm">
|
||||
<q-btn
|
||||
|
|
@ -478,31 +470,45 @@ onMounted(() => {
|
|||
</div>
|
||||
</div>
|
||||
<q-separator />
|
||||
<q-list>
|
||||
<q-item
|
||||
v-for="col in props.cols.filter((col) => col.name !== 'desc')"
|
||||
:key="col.name"
|
||||
>
|
||||
<q-item-section>
|
||||
<q-item-label>{{ col.label }}</q-item-label>
|
||||
</q-item-section>
|
||||
<q-item-section side>
|
||||
<q-item-label
|
||||
caption
|
||||
v-if="
|
||||
col.name === 'refCommandDate' ||
|
||||
col.name == 'dateStart' ||
|
||||
col.name == 'dateEnd'
|
||||
"
|
||||
>
|
||||
{{ col.value ? date2Thai(col.value) : "-" }}
|
||||
</q-item-label>
|
||||
<q-item-label caption v-else>{{
|
||||
col.value ? col.value : "-"
|
||||
}}</q-item-label>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
<q-card-section class="q-pa-none">
|
||||
<div class="row q-pa-sm">
|
||||
<div class="col text-grey-6 text-weight-medium">เริ่มต้น</div>
|
||||
<div class="col">
|
||||
{{ props.row.dateStart ? date2Thai(props.row.dateStart) : "-" }}
|
||||
</div>
|
||||
<div class="col text-grey-6 text-weight-medium">สิ้นสุด</div>
|
||||
<div class="col">
|
||||
{{ props.row.dateEnd ? date2Thai(props.row.dateEnd) : "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<q-separator />
|
||||
<div class="row q-pa-sm bg-grey-2">
|
||||
<div class="col text-grey-6 text-weight-medium">
|
||||
เอกสารอ้างอิง
|
||||
</div>
|
||||
<div class="col">
|
||||
{{ props.row.reference ? props.row.reference : "-" }}
|
||||
</div>
|
||||
<div class="col text-grey-6 text-weight-medium">รายละเอียด</div>
|
||||
<div class="col">
|
||||
{{ props.row.detail ? props.row.detail : "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<q-separator />
|
||||
<div class="row q-pa-sm">
|
||||
<div class="col text-grey-6 text-weight-medium">เลขที่คำสั่ง</div>
|
||||
<div class="col">
|
||||
{{ props.row.refCommandNo ? props.row.refCommandNo : "-" }}
|
||||
</div>
|
||||
<div class="col text-grey-6 text-weight-medium">
|
||||
เอกสารอ้างอิง (ลงวันที่)
|
||||
</div>
|
||||
<div class="col">
|
||||
{{ props.row.refCommandDate ? date2Thai(props.row.refCommandDate) : "-" }}
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
|
||||
</q-card>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue