ปรับ ui ตาราง,Layout ระบบ วินัย เพิ่มเติม

This commit is contained in:
Tanyalak 2023-10-20 16:50:28 +07:00
parent 7367123a09
commit 708c4c318c
9 changed files with 305 additions and 303 deletions

View file

@ -116,7 +116,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
</script> </script>
<template> <template>
<q-toolbar style="padding: 0" class="q-gutter-sm q-mb-md"> <q-toolbar style="padding: 0" class="q-gutter-sm q-mb-sm">
<div class="col-2"> <div class="col-2">
<datepicker <datepicker
menu-class-name="modalfix" menu-class-name="modalfix"

View file

@ -85,7 +85,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
</script> </script>
<template> <template>
<q-toolbar style="padding: 0" class="q-gutter-sm q-mb-md"> <q-toolbar style="padding: 0" class="q-gutter-sm q-mb-sm">
<div class="col-2"> <div class="col-2">
<q-select <q-select
emit-value emit-value

View file

@ -62,53 +62,55 @@ function redirectToPageadd() {
<template> <template>
<div class="toptitle text-dark col-12 row items-center">เรองรองเรยน</div> <div class="toptitle text-dark col-12 row items-center">เรองรองเรยน</div>
<div class="col-12 q-mt-sm"> <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
<q-card flat bordered> <div class="row col-12 q-col-gutter-sm q-mb-sm">
<div class="q-pa-md"> <div>
<q-toolbar style="padding: 0" class="q-gutter-sm q-mb-md"> <q-btn
<q-btn id="addComplaints"
id="addComplaints" size="12px"
flat flat
dense round
round color="primary"
color="primary" icon="mdi-plus"
icon="mdi-plus" @click="redirectToPageadd()"
@click="redirectToPageadd()" ><q-tooltip>เพมเรองรองเรยน </q-tooltip></q-btn
><q-tooltip>เพมเรองรองเรยน </q-tooltip></q-btn >
> </div>
<q-space /> <q-space />
<div class="col-2"> <q-input
<q-input class="col-xs-12 col-sm-3 col-md-2"
id="filterTable" id="filterTable"
for="filterTable" for="filterTable"
dense dense
outlined outlined
v-model="filterTable" v-model="filterTable"
label="ค้นหา" label="ค้นหา"
/> >
</div> <template v-slot:append>
<div class="col-2"> <q-icon name="search" />
<q-select </template>
id="visibleColumns" </q-input>
for="visibleColumns" <q-select
v-model="complainstStore.visibleColumns" id="visibleColumns"
multiple for="visibleColumns"
outlined v-model="complainstStore.visibleColumns"
dense multiple
options-dense outlined
:display-value="$q.lang.table.columns" dense
emit-value options-dense
map-options :display-value="$q.lang.table.columns"
:options="complainstStore.columns" emit-value
option-value="name" map-options
options-cover :options="complainstStore.columns"
/> option-value="name"
</div> options-cover
</q-toolbar> class="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<div class="col-12">
<TableComplaint :filterTable="filterTable" /> <TableComplaint :filterTable="filterTable" />
</div> </div>
</q-card> </q-card>
</div>
</template> </template>
<style scoped></style> <style scoped></style>

View file

@ -87,115 +87,117 @@ onMounted(() => {
รายการสบสวนขอเทจจร รายการสบสวนขอเทจจร
</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-sm"> <div class="row col-12 q-col-gutter-sm q-mb-sm">
<div class="row col-12 q-col-gutter-sm"> <div>
<div> <q-btn
<q-btn @click="clickAdd()"
@click="clickAdd()" size="12px"
size="12px"
flat
round
color="add"
icon="mdi-plus"
>
<q-tooltip>เพมรายการสบสวนขอเทจจร</q-tooltip>
</q-btn>
</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="dataInvestigate.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="dataInvestigate.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">
<d-table
ref="table"
:columns="dataInvestigate.columns"
:rows="dataInvestigate.rows"
:filter="filterKeyword"
row-key="interrogated"
flat flat
bordered round
:paging="true" color="add"
dense icon="mdi-plus"
class="custom-header-table"
v-bind="attrs"
:visible-columns="dataInvestigate.visibleColumns"
:pagination-label="paginationLabel"
v-model:pagination="pagination"
> >
<template v-slot:header="props"> <q-tooltip>เพมรายการสบสวนขอเทจจร</q-tooltip>
<q-tr :props="props"> </q-btn>
<q-th </div>
v-for="col in props.cols" <q-space />
:key="col.name"
:props="props" <q-input
style="padding: 10px; color: #35373c; font-weight: 500" class="col-xs-12 col-sm-3 col-md-2"
> standout
<span class="text-weight-medium">{{ col.label }}</span> dense
</q-th> v-model="filterKeyword"
<q-th auto-width /> ref="filterRef"
<q-th auto-width /> outlined
</q-tr> debounce="300"
</template> placeholder="ค้นหา"
<template v-slot:body="props"> >
<q-tr :props="props" class="cursor-pointer"> <template v-slot:append>
<q-td v-for="col in props.cols" :key="col.name" :props="props"> <q-icon v-if="filterKeyword == ''" name="search" />
<q-td v-if="col.name == 'no'"> <q-icon
{{ props.rowIndex + 1 }} v-if="filterKeyword !== ''"
</q-td> name="clear"
<div> class="cursor-pointer"
{{ col.value }} @click="resetFilter"
</div> />
</template>
</q-input>
<q-select
v-model="dataInvestigate.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="dataInvestigate.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">
<d-table
ref="table"
:columns="dataInvestigate.columns"
:rows="dataInvestigate.rows"
:filter="filterKeyword"
row-key="interrogated"
flat
bordered
:paging="true"
dense
class="custom-header-table"
v-bind="attrs"
:visible-columns="dataInvestigate.visibleColumns"
:pagination-label="paginationLabel"
v-model:pagination="pagination"
>
<template v-slot:header="props">
<q-tr :props="props">
<q-th
v-for="col in props.cols"
:key="col.name"
:props="props"
style="color: #000000; font-weight: 500"
>
<span class="text-weight-medium">{{ col.label }}</span>
</q-th>
<q-th auto-width />
<q-th auto-width />
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td v-for="col in props.cols" :key="col.name" :props="props">
<q-td v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</q-td> </q-td>
<q-td auto-width style="font-size: 14px; width: 10rem"> <div>
{{ props.row.active }} {{ col.value }}
</q-td> </div>
<q-td auto-width> </q-td>
<q-td auto-width style="font-size: 14px; width: 10%;">
{{ props.row.active }}
</q-td>
<q-td auto-width>
<div>
<q-btn <q-btn
v-if="props.row.status === 'ยุติเรื่อง'" v-if="props.row.status === 'ยุติเรื่อง'"
class="q-px-xl q-py-xs text-white no-shadow" dense
style="background-color: #00aa86; border-radius: 6px" outline
color="deep-orange-7"
class="q-px-sm"
>ยกเลกยเรอง</q-btn >ยกเลกยเรอง</q-btn
> >
</q-td> </div>
</q-tr> </q-td>
</template> </q-tr>
</d-table> </template>
</div> </d-table>
</div> </div>
</q-card> </q-card>
</template> </template>

View file

@ -103,7 +103,9 @@ const clickAdd = () => {
<q-btn <q-btn
v-if="props.row.active === 'ยืนยันผล'" v-if="props.row.active === 'ยืนยันผล'"
color="primary" color="primary"
class="q-px-md q-py-xs" class="q-px-md"
dense
unelevated
>นยนผล</q-btn >นยนผล</q-btn
> >
<span v-else>{{ props.row.active }}</span> <span v-else>{{ props.row.active }}</span>

View file

@ -14,7 +14,6 @@
</q-btn> </q-btn>
</div> </div>
<q-space /> <q-space />
<div class="items-center q-gutter-sm" style="display: flex">
<!-- นหาขอความใน table --> <!-- นหาขอความใน table -->
<q-input <q-input
standout standout
@ -26,6 +25,7 @@
debounce="300" debounce="300"
placeholder="ค้นหา" placeholder="ค้นหา"
style="max-width: 200px" style="max-width: 200px"
class="col-xs-12 col-sm-3 col-md-2"
> >
<template v-slot:append> <template v-slot:append>
<q-icon v-if="inputfilter == ''" name="search" /> <q-icon v-if="inputfilter == ''" name="search" />
@ -50,12 +50,10 @@
option-value="name" option-value="name"
map-options map-options
emit-value emit-value
style="min-width: 150px" class="col-xs-12 col-sm-3 col-md-2 gt-xs"
class="gt-xs"
> >
<template> </template> <template> </template>
</q-select> </q-select>
</div>
</div> </div>
<d-table <d-table
ref="table" ref="table"

View file

@ -60,51 +60,53 @@ function redirectToPageadd() {
<div class="toptitle text-dark col-12 row items-center"> <div class="toptitle text-dark col-12 row items-center">
รายการออกคำสงลงโทษทางว รายการออกคำสงลงโทษทางว
</div> </div>
<div class="col-12 q-mt-sm"> <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
<q-card flat bordered> <div class="row col-12 q-col-gutter-sm q-mb-sm">
<div class="q-pa-md"> <div>
<q-toolbar style="padding: 0" class="q-gutter-sm q-mb-md"> <q-btn
<q-btn id="addDisciplineOrder"
id="addDisciplineOrder" flat
flat size="12px"
dense round
round color="primary"
color="primary" icon="mdi-plus"
icon="mdi-plus" @click="redirectToPageadd()"
@click="redirectToPageadd()" ><q-tooltip>เพมรายการออกคำสงลงโทษทางว </q-tooltip></q-btn
><q-tooltip>เพมรายการออกคำสงลงโทษทางว </q-tooltip></q-btn >
> </div>
<q-space /> <q-space />
<div class="col-2"> <q-input
<q-input class="col-xs-12 col-sm-3 col-md-2"
for="filterTable" for="filterTable"
dense dense
outlined outlined
v-model="filterTable" v-model="filterTable"
label="ค้นหา" label="ค้นหา"
/> >
</div> <template v-slot:append>
<div class="col-2"> <q-icon name="search" />
<q-select </template>
for="visibleColumns" </q-input>
v-model="OrderStore.visibleColumns" <q-select
multiple for="visibleColumns"
outlined class="col-xs-12 col-sm-3 col-md-2"
dense v-model="OrderStore.visibleColumns"
options-dense multiple
:display-value="$q.lang.table.columns" outlined
emit-value dense
map-options options-dense
:options="OrderStore.columns" :display-value="$q.lang.table.columns"
option-value="name" emit-value
options-cover map-options
/> :options="OrderStore.columns"
</div> option-value="name"
</q-toolbar> options-cover
/>
</div>
<div class="col-12">
<tableOrder :filterTable="filterTable" /> <tableOrder :filterTable="filterTable" />
</div> </div>
</q-card> </q-card>
</div>
</template> </template>
<style scoped></style> <style scoped></style>

View file

@ -111,114 +111,112 @@ onMounted(() => {});
รายการชองทางการรองเรยน รายการชองทางการรองเรยน
</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-sm"> <div class="row col-12 q-col-gutter-sm q-mb-sm">
<div class="row col-12 q-col-gutter-sm"> <div>
<div> <q-btn
<q-btn @click="clickAdd()"
@click="clickAdd()" size="12px"
size="12px" flat
flat round
round color="add"
color="add" icon="mdi-plus"
icon="mdi-plus"
>
<q-tooltip>เพมชองทางการรองเรยน</q-tooltip>
</q-btn>
</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-tooltip>เพมชองทางการรองเรยน</q-tooltip>
<q-icon v-if="filterKeyword == ''" name="search" /> </q-btn>
<q-icon </div>
v-if="filterKeyword !== ''" <q-space />
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
</template>
</q-input>
<q-select <q-input
v-model="visibleColumns" class="col-xs-12 col-sm-3 col-md-2"
multiple standout
outlined dense
dense v-model="filterKeyword"
options-dense ref="filterRef"
:display-value="$q.lang.table.columns" outlined
emit-value debounce="300"
map-options placeholder="ค้นหา"
:options="columns" >
option-value="name" <template v-slot:append>
options-cover <q-icon v-if="filterKeyword == ''" name="search" />
style="min-width: 150px" <q-icon
class="col-xs-12 col-sm-3 col-md-2" v-if="filterKeyword !== ''"
/> name="clear"
</div> class="cursor-pointer"
<div class="col-12"> @click="resetFilter"
<d-table />
:columns="columns" </template>
:rows="rows" </q-input>
row-key="id"
:filter="filterKeyword" <q-select
:visible-columns="visibleColumns" v-model="visibleColumns"
:pagination-label="paginationLabel" multiple
v-model:pagination="pagination" outlined
> dense
<template v-slot:header="props"> options-dense
<q-tr :props="props"> :display-value="$q.lang.table.columns"
<q-th v-for="col in props.cols" :key="col.name" :props="props"> emit-value
<span class="text-weight-medium">{{ col.label }}</span> map-options
</q-th> :options="columns"
<q-th auto-width /> option-value="name"
</q-tr> options-cover
</template> style="min-width: 150px"
<template v-slot:body="props"> class="col-xs-12 col-sm-3 col-md-2"
<q-tr :props="props" class="cursor-pointer"> />
<q-td key="no" :props="props"> </div>
{{ props.rowIndex + 1 }} <div class="col-12">
</q-td> <d-table
<q-td key="subject" :props="props"> :columns="columns"
{{ props.row.subject }} :rows="rows"
</q-td> row-key="id"
<q-td> :filter="filterKeyword"
<q-btn :visible-columns="visibleColumns"
dense :pagination-label="paginationLabel"
size="12px" v-model:pagination="pagination"
flat >
round <template v-slot:header="props">
color="red" <q-tr :props="props">
@click="clickDelete(props.row.id)" <q-th v-for="col in props.cols" :key="col.name" :props="props">
icon="mdi-delete" <span class="text-weight-medium">{{ col.label }}</span>
> </q-th>
<q-tooltip>ลบขอม</q-tooltip> <q-th auto-width />
</q-btn> </q-tr>
</q-td> </template>
</q-tr> <template v-slot:body="props">
</template> <q-tr :props="props" class="cursor-pointer">
<!-- <template v-slot:pagination="scope"> <q-td key="no" :props="props">
<q-pagination {{ props.rowIndex + 1 }}
v-model="pagination.page" </q-td>
active-color="primary" <q-td key="subject" :props="props">
color="dark" {{ props.row.subject }}
:max="scope.pagesNumber" </q-td>
:max-pages="5" <q-td>
size="sm" <q-btn
boundary-links dense
direction-links size="12px"
></q-pagination> flat
</template> --> round
</d-table> color="red"
</div> @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="dark"
:max="scope.pagesNumber"
:max-pages="5"
size="sm"
boundary-links
direction-links
></q-pagination>
</template> -->
</d-table>
</div> </div>
</q-card> </q-card>
</template> </template>

View file

@ -84,8 +84,7 @@ function clickDelete(id: string) {
รายการชอกรรมการ รายการชอกรรมการ
</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-sm"> <div class="row col-12 q-col-gutter-sm q-mb-sm">
<div class="row col-12 q-col-gutter-sm">
<div> <div>
<q-btn @click="$router.push(`/discipline/director/add`)" size="12px" flat round color="add" icon="mdi-plus"> <q-btn @click="$router.push(`/discipline/director/add`)" size="12px" flat round color="add" icon="mdi-plus">
<q-tooltip>เพมรายชอกรรมการ</q-tooltip> <q-tooltip>เพมรายชอกรรมการ</q-tooltip>
@ -138,6 +137,5 @@ function clickDelete(id: string) {
</d-table> </d-table>
</div> </div>
</div>
</q-card> </q-card>
</template> </template>