Merge branch 'develop' into devTee

This commit is contained in:
setthawutttty 2024-03-11 14:35:32 +07:00
commit a62ebce427
20 changed files with 271 additions and 165 deletions

View file

@ -13,7 +13,7 @@ const tab = ref<string>("1");
<template>
<div class="row items-center q-mb-lg">
<div class="text-dark row items-center" style="font-size: 22px">
<q-icon name="mdi-cash" class="q-mr-md" />
<q-icon name="mdi-medal" class="q-mr-md" />
<span>อมลผลงานและเครองราชฯ</span>
</div>
</div>
@ -25,7 +25,7 @@ const tab = ref<string>("1");
class="text-grey"
active-color="blue"
indicator-color="white"
align="justify"
align="left"
narrow-indicator
bordered
>

View file

@ -11,7 +11,7 @@ const tab = ref<string>("1");
</script>
<template>
<div class="row items-center q-mb-lg">
<div class="text-dark row items-center" style="font-size: 22px">
<div class="text-dark row items-center text-weight-bold" style="font-size: 20px">
<q-icon name="mdi-account-tie" class="q-mr-md" />
<span>อมลราชการ</span>
</div>
@ -24,7 +24,7 @@ const tab = ref<string>("1");
class="text-grey"
active-color="blue"
indicator-color="white"
align="justify"
align="left"
narrow-indicator
bordered
>

View file

@ -9,7 +9,7 @@ const tab = ref<string>("1");
</script>
<template>
<div class="row items-center q-mb-lg">
<div class="text-dark row items-center" style="font-size: 22px">
<div class="text-dark row items-center text-weight-bold" style="font-size: 20px">
<q-icon name="mdi-bookmark" class="q-mr-md" />
<span>เอกสารหลกฐานและอนๆ</span>
</div>
@ -22,7 +22,7 @@ const tab = ref<string>("1");
class="text-grey"
active-color="blue"
indicator-color="white"
align="justify"
align="left"
narrow-indicator
bordered
>

View file

@ -13,7 +13,10 @@ const tab = ref<string>("1");
</script>
<template>
<div class="row items-center q-mb-lg">
<div class="text-dark row items-center" style="font-size: 22px">
<div
class="text-dark row items-center text-weight-bold"
style="font-size: 20px"
>
<q-icon name="mdi-account" class="q-mr-md" />
<span>อมลสวนต</span>
</div>
@ -26,7 +29,7 @@ const tab = ref<string>("1");
class="text-grey"
active-color="blue"
indicator-color="white"
align="justify"
align="left"
narrow-indicator
bordered
>

View file

@ -9,8 +9,11 @@ const tab = ref<string>("1");
</script>
<template>
<div class="row items-center q-mb-lg">
<div class="text-dark row items-center" style="font-size: 22px">
<q-icon name="mdi-account" class="q-mr-md" />
<div
class="text-dark row items-center text-weight-bold"
style="font-size: 20px"
>
<q-icon name="mdi-cash" class="q-mr-md" />
<span>อมลเงนเดอน/าจาง</span>
</div>
</div>
@ -22,7 +25,7 @@ const tab = ref<string>("1");
class="text-grey"
active-color="blue"
indicator-color="white"
align="justify"
align="left"
narrow-indicator
bordered
>

View file

@ -24,12 +24,12 @@ const itemsTab = ref<any>([
},
{
name: "3",
icon: "mail",
icon: "mdi-cash",
label: "ข้อมูลเงินเดือน/ค่าจ้าง",
},
{
name: "4",
icon: "mdi-cash",
icon: "mdi-medal",
label: "ข้อมูลผลงานและเครื่องราชฯ",
},
{
@ -46,6 +46,7 @@ const splitterModel = ref<number>(12);
<template v-slot:before>
<q-tabs v-model="store.tabMain" vertical class="text-blue">
<q-tab
class="hover-tab"
v-for="(tab, index) in itemsTab"
:key="index"
:name="tab.name"
@ -80,4 +81,10 @@ const splitterModel = ref<number>(12);
</q-splitter>
</template>
<style scoped></style>
<style scoped>
.hover-tab:hover {
background-color: #0793f1;
color: white !important;
opacity: 1 !important;
}
</style>

View file

@ -1,4 +1,3 @@
const mainPage = () => import("@/modules/04_registryNew/views/main.vue");
const listPage = () => import("@/modules/04_registryNew/views/list.vue");
const detailPage = () =>
import("@/modules/04_registryNew/views/detailView.vue");

View file

@ -1,9 +1,70 @@
<script setup lang="ts">
import { useRouter } from "vue-router";
import { ref, onMounted } from "vue";
import { useRoute, useRouter } from "vue-router";
import http from "@/plugins/http";
import config from "@/app.config";
import type { DataOption } from "@/modules/04_registryNew/interface/index/Main";
import type { DataPerson } from "@/modules/04_registryNew/interface/response/Main";
import TabMain from "@/modules/04_registryNew/components/detail/TabMain.vue";
const router = useRouter();
const route = useRoute();
const profileId = ref<string>(route.params.id.toString());
const formDetail = ref<DataPerson>();
const itemsMenu = ref<DataOption[]>([
{
id: "1",
name: "ช่วยราชการ",
},
{
id: "2",
name: "ส่งตัวกลับ",
},
{
id: "3",
name: "แต่งตั้ง-เลื่อน-ย้าย",
},
{
id: "4",
name: "ถึงแก่กรรม",
},
{
id: "5",
name: "ให้ออกจากราชการ",
},
{
id: "6",
name: "อื่นๆ",
},
]);
function fetchDataPersonal() {
const data = {
id: "1526d9d3-d8b1-43ab-81b5-a84dfbe99201",
prefix: "นาย",
firstName: "ณัฐพงศ์",
lastName: "ดิษยบุตร",
citizenId: "0000000000001",
position: "นักบริหาร",
posLevelId: "1526d9d3-d8b1-43ab-81b5-a84dfbe09362",
posTypeId: "1526d9d3-d8b1-43ab-81b5-a84dfbe08091",
};
formDetail.value = data;
}
function onClickDownloadKp7(type: string) {
if (type === "FULL") {
window.open(config.API.profileReportId(profileId.value));
} else if (type === "SHORT") {
window.open(config.API.profileKp7ShortId(profileId.value));
}
}
onMounted(() => {
fetchDataPersonal();
});
</script>
<template>
<div class="row items-center q-gutter-sm">
@ -30,49 +91,53 @@ const router = useRouter();
icon="mdi-home-export-outline"
dropdown-icon="mdi-chevron-down"
>
<q-list>
<q-list v-for="(item, index) in itemsMenu" key="index">
<q-item clickable v-close-popup>
<q-item-section avatar>
<q-avatar icon="folder" color="primary" text-color="white" />
</q-item-section>
<q-item-section>
<q-item-label>Photos</q-item-label>
<q-item-label caption>February 22, 2016</q-item-label>
</q-item-section>
<q-item-section side>
<q-icon name="info" color="amber" />
</q-item-section>
</q-item>
<q-item clickable v-close-popup>
<q-item-section avatar>
<q-avatar icon="assignment" color="secondary" text-color="white" />
</q-item-section>
<q-item-section>
<q-item-label>Vacation</q-item-label>
<q-item-label caption>February 22, 2016</q-item-label>
</q-item-section>
<q-item-section side>
<q-icon name="info" color="amber" />
</q-item-section>
<q-item-section>{{ item.name }}</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
<q-btn
unelevated
round
color="grey-4"
text-color="primary"
icon="mdi-file-eye-outline"
/>
>
<q-tooltip>ดาวนไฟล</q-tooltip>
<q-menu>
<q-list style="min-width: 120px">
<q-item clickable v-close-popup @click="onClickDownloadKp7('FULL')">
<q-item-section class="text-blue">..7/..1</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="onClickDownloadKp7('SHORT')">
<q-item-section class="text-primary">ประวแบบย</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
</div>
<q-card>
<div class="column" style="height: 150px; position: relative">
<div class="col justify-center"></div>
<div class="column" style="height: 170px">
<div class="col row items-center">
<div class="row col-12">
<div class="col-sm-3 col-md-2"></div>
<div class="col">
<div class="col-12 text-primary" style="font-size: 20px">
{{
`${formDetail?.prefix}${formDetail?.firstName} ${formDetail?.lastName}`
}}
</div>
<div class="col-12">{{ formDetail?.position }}</div>
</div>
</div>
</div>
<div class="absolute-center-left q-ml-lg">
<q-avatar size="130px">
<img src="https://cdn.quasar.dev/img/avatar2.jpg" />
<img src="@/assets/avatar_user.jpg" />
</q-avatar>
<q-btn
round
@ -82,7 +147,30 @@ const router = useRouter();
style="position: absolute; bottom: 0; right: 0"
/>
</div>
<div class="col bg-teal-2"></div>
<div class="col row items-center bg-teal-1">
<div class="row col-12">
<div class="col-sm-3 col-md-2"></div>
<div class="col-2">
<div class="col-sm-3 col-md-3">
<div class="col text-grey-5">ตำแหนงในสายงาน</div>
<div class="col">วหนาสำนกงาน</div>
</div>
</div>
<div class="col-2">
<div class="col-sm-3 col-md-3">
<div class="col text-grey-5">ประเภทตำแหน</div>
<div class="col">บรหาร</div>
</div>
</div>
<div class="col-2">
<div class="col-sm-3 col-md-3">
<div class="col text-grey-5">ระดบตำแหนงง</div>
<div class="col">สำนาญการพเศษ</div>
</div>
</div>
</div>
</div>
</div>
</q-card>

View file

@ -141,6 +141,13 @@ function onClickShowFilter() {
}
function onclickSearch() {
isShowFilter.value = true;
isShowBtnFilter.value = false;
if (isShowFilter.value) {
fetchType();
fetchLevel();
fetchYearOption();
}
formFilter.keyword = formFilter.keyword === null ? "" : formFilter.keyword;
fetchDataPerson();
}

View file

@ -1,12 +0,0 @@
<script setup lang="ts">
import Registry from "@/modules/04_registryNew/components/registry/registry.vue";
</script>
<template>
<div class="toptitle text-dark col-12 row items-center">
อมลทะเบยนประว
</div>
<q-card flat bordered class="q-pa-md"> <Registry /> </q-card>
</template>
<style scoped></style>