ปรับ css ระบบทะเบียนประวัติลูกจ้าง,พ้นจากราชการ

This commit is contained in:
Tanyalak 2023-07-14 15:38:09 +07:00
parent a4966331e5
commit 332e61599b
10 changed files with 286 additions and 286 deletions

View file

@ -299,7 +299,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
รายการสอบแขงข / ดเลอก รายการสอบแขงข / ดเลอก
</div> </div>
<q-card flat bordered class="col-12 q-mt-sm q-pa-md"> <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
<div class="row q-col-gutter-md"> <div class="row q-col-gutter-sm">
<div class="row col-12 q-col-gutter-sm"> <div class="row col-12 q-col-gutter-sm">
<q-select <q-select
class="col-xs-12 col-sm-3 col-md-2" class="col-xs-12 col-sm-3 col-md-2"
@ -422,7 +422,8 @@ const paginationLabel = (start: number, end: number, total: number) => {
<template v-slot:pagination="scope"> <template v-slot:pagination="scope">
<q-pagination <q-pagination
v-model="pagination.page" v-model="pagination.page"
color="primary" active-color="primary"
color="dark"
:max="scope.pagesNumber" :max="scope.pagesNumber"
:max-pages="5" :max-pages="5"
size="sm" size="sm"

View file

@ -138,7 +138,8 @@
<template v-slot:pagination="scope"> <template v-slot:pagination="scope">
<q-pagination <q-pagination
v-model="pagination.page" v-model="pagination.page"
color="primary" active-color="primary"
color="dark"
:max="scope.pagesNumber" :max="scope.pagesNumber"
:max-pages="5" :max-pages="5"
size="sm" size="sm"

View file

@ -130,7 +130,8 @@
<template v-slot:pagination="scope"> <template v-slot:pagination="scope">
<q-pagination <q-pagination
v-model="pagination.page" v-model="pagination.page"
color="primary" active-color="primary"
color="dark"
:max="scope.pagesNumber" :max="scope.pagesNumber"
:max-pages="5" :max-pages="5"
size="sm" size="sm"
@ -306,7 +307,8 @@
<template v-slot:pagination="scope"> <template v-slot:pagination="scope">
<q-pagination <q-pagination
v-model="paginationModal.page" v-model="paginationModal.page"
color="primary" active-color="primary"
color="dark"
:max="scope.pagesNumber" :max="scope.pagesNumber"
:max-pages="5" :max-pages="5"
size="sm" size="sm"

View file

@ -23,7 +23,7 @@
<q-table ref="table" flat bordered class="custom-header-table" v-bind="attrs" virtual-scroll <q-table ref="table" flat bordered class="custom-header-table" v-bind="attrs" virtual-scroll
:virtual-scroll-sticky-size-start="48" dense :pagination-label="paginationLabel" v-model:pagination="pagination"> :virtual-scroll-sticky-size-start="48" dense :pagination-label="paginationLabel" v-model:pagination="pagination">
<template v-slot:pagination="scope"> <template v-slot:pagination="scope">
<q-pagination v-model="pagination.page" color="primary" :max="scope.pagesNumber" :max-pages="5" size="sm" <q-pagination v-model="pagination.page" active-color="primary" color="dark" :max="scope.pagesNumber" :max-pages="5" size="sm"
boundary-links direction-links></q-pagination> boundary-links direction-links></q-pagination>
</template> </template>
<template v-slot:header="props"> <template v-slot:header="props">

View file

@ -2,168 +2,169 @@
<div class="toptitle text-dark col-12 row items-center"> <div class="toptitle text-dark col-12 row items-center">
ประกาศเกษยณอายราชการ ประกาศเกษยณอายราชการ
</div> </div>
<q-card flat bordered class="col-12 q-mt-sm q-pa-md"> <q-card flat bordered class="col-12 q-mt-sm">
<div class="row q-col-gutter-sm"> <div class="row col-12">
<div class="row col-12 q-col-gutter-sm"> <q-tabs
<q-select v-model="tab"
class="col-xs-12 col-sm-3 col-md-1" dense
v-model="fiscalyear" class="text-grey"
label="ปีงบประมาณ" active-color="primary"
dense active-class="bg-teal-1"
emit-value indicator-color="primary"
map-options align="left"
:options="fiscalyearOP" >
option-value="id" <q-tab name="samun" label="ขรก.กทม.สามัญ" />
option-label="name" <q-tab name="employee" label="ลูกจ้างประจำ" />
lazy-rules </q-tabs>
hide-bottom-space </div>
:readonly="false" <q-separator/>
:borderless="false" <div class="col-12 row q-pa-md">
:outlined="true" <div class="row col-12">
:hide-dropdown-icon="false" <div class="row col-12 q-col-gutter-sm">
@update:model-value="searchFilterTable" <q-select
/> v-model="fiscalyear"
<div> label="ปีงบประมาณ"
<q-btn
@click="clickAdd()"
size="12px"
flat
round
color="add"
icon="mdi-plus"
>
<q-tooltip>เพมผทดลองปฏหนาทราชการ</q-tooltip>
</q-btn>
<q-menu>
<q-list style="min-width: 100px">
<q-item clickable @click="clickAdd">
<q-item-section>ขรก.กทม.สาม</q-item-section>
</q-item>
<q-item clickable @click="clickAdd">
<q-item-section>กจางประจำ</q-item-section>
</q-item>
</q-list>
</q-menu>
</div>
<q-space />
<q-input
class="col-xs-12 col-sm-3 col-md-2"
standout
dense
v-model="filterKeyword"
ref="filterRef"
outlined
debounce="300"
placeholder="ค้นหา"
>
<template v-slot:append>
<q-icon v-if="filterKeyword == ''" name="search" />
<q-icon
v-if="filterKeyword !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
</template>
</q-input>
<q-select
v-model="visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns"
option-value="name"
options-cover
style="min-width: 150px"
class="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<div class="col-12">
<div class="q-pa-sm">
<q-tabs
v-model="tab"
dense dense
class="text-grey" emit-value
active-color="primary" map-options
indicator-color="primary" :options="fiscalyearOP"
align="left" option-value="id"
narrow-indicator option-label="name"
> lazy-rules
<q-tab name="samun" label="ขรก.กทม.สามัญ" /> hide-bottom-space
<q-tab name="employee" label="ลูกจ้างประจำ" /> :readonly="false"
</q-tabs> :borderless="false"
</div> :outlined="true"
:hide-dropdown-icon="false"
style="min-width: 150px;"
@update:model-value="searchFilterTable"
/>
<div>
<q-btn
@click="clickAdd()"
size="12px"
flat
round
color="add"
icon="mdi-plus"
>
<q-tooltip>เพมผทดลองปฏหนาทราชการ</q-tooltip>
</q-btn>
<!-- <q-menu>
<q-list style="min-width: 100px">
<q-item clickable @click="clickAdd">
<q-item-section>ขรก.กทม.สาม</q-item-section>
</q-item>
<q-item clickable @click="clickAdd">
<q-item-section>กจางประจำ</q-item-section>
</q-item>
</q-list>
</q-menu> -->
</div>
<q-space />
<q-space /> <q-input
<q-table class="col-xs-12 col-sm-3 col-md-2"
ref="table" standout
:columns="columns" dense
:rows="rows" v-model="filterKeyword"
:filter="filterKeyword" ref="filterRef"
row-key="name" outlined
flat debounce="300"
bordered placeholder="ค้นหา"
:paging="true" >
dense <template v-slot:append>
class="custom-header-table" <q-icon v-if="filterKeyword == ''" name="search" />
v-bind="attrs" <q-icon
:visible-columns="visibleColumns" v-if="filterKeyword !== ''"
:pagination-label="paginationLabel" name="clear"
v-model:pagination="pagination" class="cursor-pointer"
> @click="resetFilter"
<template v-slot:header="props"> />
<q-tr :props="props"> </template>
<q-th v-for="col in props.cols" :key="col.name" :props="props"> </q-input>
<span class="text-weight-medium">{{ col.label }}</span>
</q-th> <q-select
<q-th auto-width /> v-model="visibleColumns"
</q-tr> multiple
</template> outlined
<template v-slot:body="props"> dense
<q-tr :props="props" class="cursor-pointer"> options-dense
<q-td key="no" :props="props"> :display-value="$q.lang.table.columns"
{{ props.rowIndex + 1 }} emit-value
</q-td> map-options
<q-td key="Date" :props="props"> :options="columns"
{{ props.row.Date }} option-value="name"
</q-td> options-cover
<q-td key="retireNumber" :props="props"> style="min-width: 150px"
{{ props.row.retireNumber }} class="col-xs-12 col-sm-3 col-md-2"
</q-td> />
<q-td auto-width> </div>
<q-btn <div class="col-12 q-pt-sm">
dense <q-table
size="12px" ref="table"
flat :columns="columns"
round :rows="rows"
color="red" :filter="filterKeyword"
@click="clickDelete(props.row.id)" row-key="name"
icon="mdi-delete" flat
> bordered
<q-tooltip>ลบขอม</q-tooltip> :paging="true"
</q-btn> dense
</q-td> class="custom-header-table"
</q-tr> v-bind="attrs"
</template> :visible-columns="visibleColumns"
<template v-slot:pagination="scope"> :pagination-label="paginationLabel"
<q-pagination v-model:pagination="pagination"
v-model="pagination.page" >
active-color="primary" <template v-slot:header="props">
color="primary" <q-tr :props="props">
:max="scope.pagesNumber" <q-th v-for="col in props.cols" :key="col.name" :props="props">
:max-pages="5" <span class="text-weight-medium">{{ col.label }}</span>
size="sm" </q-th>
boundary-links <q-th auto-width />
direction-links </q-tr>
></q-pagination> </template>
</template> <template v-slot:body="props">
</q-table> <q-tr :props="props" class="cursor-pointer">
<q-td key="no" :props="props">
{{ props.rowIndex + 1 }}
</q-td>
<q-td key="Date" :props="props">
{{ props.row.Date }}
</q-td>
<q-td key="retireNumber" :props="props">
{{ props.row.retireNumber }}
</q-td>
<q-td auto-width>
<q-btn
dense
size="12px"
flat
round
color="red"
@click="clickDelete(props.row.id)"
icon="mdi-delete"
>
<q-tooltip>ลบขอม</q-tooltip>
</q-btn>
</q-td>
</q-tr>
</template>
<template v-slot:pagination="scope">
<q-pagination
v-model="pagination.page"
active-color="primary"
color="primary"
:max="scope.pagesNumber"
:max-pages="5"
size="sm"
boundary-links
direction-links
></q-pagination>
</template>
</q-table>
</div>
</div> </div>
</div> </div>
</q-card> </q-card>
@ -176,8 +177,6 @@ import type {
FormMainProbation, FormMainProbation,
FormMainProbation2, FormMainProbation2,
} from "@/modules/05_placement/interface/request/Main"; } from "@/modules/05_placement/interface/request/Main";
import DialogHeader from "@/modules/04_registry/components/DialogHeader.vue";
import router from "@/router";
import { useQuasar } from "quasar"; import { useQuasar } from "quasar";
const $q = useQuasar(); // noti quasar const $q = useQuasar(); // noti quasar

View file

@ -14,7 +14,7 @@ const Detail = defineAsyncComponent(
export default [ export default [
{ {
path: "/registry-employee", path: "/registryEmployee",
name: "registryEmployee", name: "registryEmployee",
component: Main, component: Main,
meta: { meta: {

View file

@ -150,10 +150,10 @@
<div class="row items-center text-dark q-ml-md"> <div class="row items-center text-dark q-ml-md">
<div class="column"> <div class="column">
<div class="text-bold q-pb-xs text-name"> <div class="text-bold q-pb-xs text-name">
{{ "เพิ่มข้อมูลทะเบียนประวัติ" }} เพมขอมลทะเบยนประว
</div> </div>
<div class="text-bold q-pb-xs text-sub"> <div class="text-bold q-pb-xs text-sub">
{{ "ลูกจ้างชั่วคราว" }} กจางชวคราว
</div> </div>
</div> </div>
</div> </div>
@ -1000,12 +1000,12 @@ const Retire = async () => {
} }
.text-name { .text-name {
font-size: 1.5em; font-size: 1.3em;
overflow: hidden; overflow: hidden;
} }
.text-sub { .text-sub {
font-size: 1.5em; font-size: 1.2em;
overflow: hidden; overflow: hidden;
color: var(--q-primary); color: var(--q-primary);
} }

View file

@ -2,9 +2,8 @@
<div class="toptitle text-dark col-12 row items-center"> <div class="toptitle text-dark col-12 row items-center">
รายชอลกจางชวคราว รายชอลกจางชวคราว
</div> </div>
<div> <q-card flat bordered class="q-pa-md">
<div class="q-pa-md" style="min-height: 70vh; overflow-y: scroll"> <div class="col-12 row items-center">
<div class="col-12 row q-py-sm items-center">
<q-btn flat round color="primary" @click="clickAdd" icon="mdi-plus"> <q-btn flat round color="primary" @click="clickAdd" icon="mdi-plus">
<q-tooltip>เพมขอม</q-tooltip> <q-tooltip>เพมขอม</q-tooltip>
</q-btn> </q-btn>
@ -49,116 +48,111 @@
/> />
</div> </div>
</div> </div>
<q-table <div class="col-12 q-pt-sm">
flat <q-table
bordered flat
dense bordered
:rows="rows" dense
:columns="columns" :rows="rows"
:visible-columns="visibleColumns" :columns="columns"
:filter="filter" :visible-columns="visibleColumns"
row-key="name" :filter="filter"
class="custom-header-table" row-key="name"
:pagination-label="paginationLabel" class="custom-header-table"
v-model:pagination="pagination" :pagination-label="paginationLabel"
> v-model:pagination="pagination"
<template v-slot:header="props"> >
<q-tr :props="props"> <template v-slot:header="props">
<q-th v-for="col in props.cols" :key="col.name" :props="props"> <q-tr :props="props">
<span class="text-weight-medium">{{ col.label }}</span> <q-th v-for="col in props.cols" :key="col.name" :props="props">
</q-th> <span class="text-weight-medium">{{ col.label }}</span>
<q-th auto-width /> </q-th>
</q-tr> <q-th auto-width />
</template> </q-tr>
<template v-slot:body="props"> </template>
<q-tr :props="props" class="cursor-pointer"> <template v-slot:body="props">
<q-td key="no" :props="props"> <q-tr :props="props" class="cursor-pointer">
{{ props.rowIndex + 1 }} <q-td key="no" :props="props">
</q-td> {{ props.rowIndex + 1 }}
<q-td key="positionNum" :props="props"> </q-td>
{{ props.row.positionNum }} <q-td key="positionNum" :props="props">
</q-td> {{ props.row.positionNum }}
<q-td key="name" :props="props"> </q-td>
{{ props.row.name }} <q-td key="name" :props="props">
</q-td> {{ props.row.name }}
<q-td key="position" :props="props"> </q-td>
{{ props.row.position }} <q-td key="position" :props="props">
</q-td> {{ props.row.position }}
<q-td key="path" :props="props"> </q-td>
{{ props.row.path }} <q-td key="path" :props="props">
</q-td> {{ props.row.path }}
<q-td key="type" :props="props"> </q-td>
{{ props.row.type }} <q-td key="type" :props="props">
</q-td> {{ props.row.type }}
<q-td key="level" :props="props"> </q-td>
{{ props.row.level }} <q-td key="level" :props="props">
</q-td> {{ props.row.level }}
<q-td key="affiliation" :props="props"> </q-td>
{{ props.row.affiliation }} <q-td key="affiliation" :props="props">
</q-td> {{ props.row.affiliation }}
<q-td key="yearly" :props="props"> </q-td>
{{ props.row.yearly }} <q-td key="yearly" :props="props">
</q-td> {{ props.row.yearly }}
<q-td key="pay" :props="props"> </q-td>
{{ props.row.pay }} <q-td key="pay" :props="props">
</q-td> {{ props.row.pay }}
<q-td auto-width> </q-td>
<q-btn <q-td auto-width>
icon="mdi-dots-vertical" <q-btn
size="12px" icon="mdi-dots-vertical"
color="grey-7" size="12px"
flat color="grey-7"
round flat
dense round
> dense
<q-menu transition-show="jump-down" transition-hide="jump-up"> >
<q-list dense style="min-width: 150px"> <q-menu transition-show="jump-down" transition-hide="jump-up">
<q-item <q-list dense style="min-width: 160px">
clickable <q-item
v-close-popup clickable
@click="editDetail(props.row)" v-close-popup
> @click="editDetail(props.row)"
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
> >
</q-item-section> <q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-item-section>กำหนดตำแหน</q-item-section> <q-icon color="blue" size="xs" name="mdi-account-settings" />
</q-item> </q-item-section>
<q-separator /> <q-item-section>กำหนดตำแหน</q-item-section>
<q-item clickable v-close-popup @click="clickDelete('test')"> </q-item>
<q-item-section <q-separator />
style="min-width: 0px" <q-item clickable v-close-popup @click="clickDelete('test')">
avatar <q-item-section style="min-width: 0px" avatar class="q-py-sm">
class="q-py-sm" <q-icon color="red" size="xs" name="mdi-delete" />
> </q-item-section>
</q-item-section> <q-item-section>ลบ</q-item-section>
<q-item-section>ลบ</q-item-section> </q-item>
</q-item>
<q-separator /> <q-separator />
</q-list> </q-list>
</q-menu> </q-menu>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>
</template> </template>
<template v-slot:pagination="scope"> <template v-slot:pagination="scope">
<q-pagination <q-pagination
v-model="pagination.page" v-model="pagination.page"
color="primary" active-color="primary"
:max="scope.pagesNumber" color="dark"
:max-pages="5" :max="scope.pagesNumber"
size="sm" :max-pages="5"
boundary-links size="sm"
direction-links boundary-links
></q-pagination> direction-links
</template> ></q-pagination>
</q-table> </template>
</div> </q-table>
<q-separator /> </div>
</div> </q-card>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted } from "vue"; import { ref, onMounted } from "vue";

View file

@ -68,6 +68,9 @@ div
$separator-color: #EDEDED !default $separator-color: #EDEDED !default
.bg-teal-1
background: #e0f2f1a6 !important
.table_ellipsis .table_ellipsis
max-width: 200px max-width: 200px
white-space: nowrap white-space: nowrap

View file

@ -559,7 +559,7 @@ if (keycloak.tokenParsed != null) {
v-ripple v-ripple
:active="link === menuItem.label" :active="link === menuItem.label"
@click="link = menuItem.label" @click="link = menuItem.label"
active-class="text-primary menuActiveMini" active-class="text-primary menuActiveMini text-weight-medium"
v-if="menuItem.key == 3 || menuItem.key == 5" v-if="menuItem.key == 3 || menuItem.key == 5"
> >
<div class="row items-center no-wrap"> <div class="row items-center no-wrap">
@ -939,7 +939,7 @@ if (keycloak.tokenParsed != null) {
background: #1e2529d9; background: #1e2529d9;
} */ } */
.font-400{ .font-400{
font-weight: 400 !important; font-weight: 400 ;
} }
.expan2 .menuSubHover { .expan2 .menuSubHover {
padding-left: 30%; padding-left: 30%;