ย้ายไอคอน
This commit is contained in:
parent
da4e99f767
commit
c3c11afd1f
58 changed files with 1115 additions and 1056 deletions
|
|
@ -284,25 +284,17 @@ onMounted(async () => {
|
|||
>
|
||||
<template v-slot:header="props">
|
||||
<q-tr :props="props">
|
||||
<q-th auto-width />
|
||||
<q-th auto-width />
|
||||
<q-th auto-width />
|
||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<span class="text-weight-medium">{{ col.label }}</span>
|
||||
</q-th>
|
||||
<q-th auto-width />
|
||||
<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.id"
|
||||
@click="clickEdit(props.row)"
|
||||
>
|
||||
<div>
|
||||
{{ col.value }}
|
||||
</div>
|
||||
</q-td>
|
||||
<q-td
|
||||
key="period_isActive"
|
||||
:props="props"
|
||||
|
|
@ -365,6 +357,16 @@ onMounted(async () => {
|
|||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
<q-td
|
||||
v-for="col in props.cols"
|
||||
:key="col.id"
|
||||
@click="clickEdit(props.row)"
|
||||
>
|
||||
<div>
|
||||
{{ col.value }}
|
||||
</div>
|
||||
</q-td>
|
||||
|
||||
</q-tr>
|
||||
</template>
|
||||
</d-table>
|
||||
|
|
|
|||
|
|
@ -59,6 +59,8 @@ const filterOrganizationOP = ref<any>([]);
|
|||
|
||||
/** หัวตาราง*/
|
||||
const visibleColumns = ref<string[]>([
|
||||
"note",
|
||||
"warn",
|
||||
"no",
|
||||
"citizenId",
|
||||
"name",
|
||||
|
|
@ -70,10 +72,26 @@ const visibleColumns = ref<string[]>([
|
|||
"insigniaSend",
|
||||
"insigniaLevel",
|
||||
"dateSend",
|
||||
"note",
|
||||
"warn",
|
||||
]);
|
||||
const columns = ref<QTableProps["columns"]>([
|
||||
{
|
||||
name: "note",
|
||||
align: "left",
|
||||
label: "หมายเหตุ",
|
||||
sortable: false,
|
||||
field: "",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "warn",
|
||||
align: "left",
|
||||
label: "แจ้งเตือน",
|
||||
sortable: false,
|
||||
field: "",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "no",
|
||||
align: "left",
|
||||
|
|
@ -173,24 +191,6 @@ const columns = ref<QTableProps["columns"]>([
|
|||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "note",
|
||||
align: "left",
|
||||
label: "หมายเหตุ",
|
||||
sortable: true,
|
||||
field: "",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "warn",
|
||||
align: "left",
|
||||
label: "แจ้งเตือน",
|
||||
sortable: true,
|
||||
field: "",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
]);
|
||||
const columns2 = ref<QTableProps["columns"]>([
|
||||
{
|
||||
|
|
@ -1043,10 +1043,6 @@ onMounted(async () => {
|
|||
>
|
||||
<template v-slot:header="props">
|
||||
<q-tr :props="props">
|
||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<span class="text-weight-medium">{{ col.label }}</span>
|
||||
</q-th>
|
||||
<q-th></q-th>
|
||||
<q-th
|
||||
auto-width
|
||||
v-if="
|
||||
|
|
@ -1055,7 +1051,10 @@ onMounted(async () => {
|
|||
checkStatus == true
|
||||
"
|
||||
/>
|
||||
<q-th v-else></q-th>
|
||||
<q-th auto-width></q-th>
|
||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<span class="text-weight-medium">{{ col.label }}</span>
|
||||
</q-th>
|
||||
</q-tr>
|
||||
</template>
|
||||
<template v-slot:body="props">
|
||||
|
|
@ -1064,74 +1063,6 @@ onMounted(async () => {
|
|||
class="cursor-pointer"
|
||||
@click.stop="nextPage(props.row.profileId)"
|
||||
>
|
||||
<q-td key="no" :props="props">
|
||||
{{ props.rowIndex + 1 }}
|
||||
</q-td>
|
||||
<q-td key="citizenId" :props="props">
|
||||
{{ props.row.citizenId ?? "-" }}
|
||||
</q-td>
|
||||
<q-td key="name" :props="props">
|
||||
{{ props.row.name }}
|
||||
</q-td>
|
||||
<q-td key="employeeType" :props="props">
|
||||
{{ props.row.employeeType }}
|
||||
</q-td>
|
||||
<q-td key="position" :props="props">
|
||||
{{ props.row.position }}
|
||||
</q-td>
|
||||
<q-td key="level" :props="props">
|
||||
{{ props.row.level }}
|
||||
</q-td>
|
||||
<q-td key="salary" :props="props">
|
||||
{{ Number(props.row.salary).toLocaleString() }}
|
||||
</q-td>
|
||||
<q-td key="insigniaType" :props="props">
|
||||
{{ props.row.insigniaType }}
|
||||
</q-td>
|
||||
<q-td key="insigniaSend" :props="props">
|
||||
{{ props.row.insigniaSend }}
|
||||
</q-td>
|
||||
<q-td key="insigniaLevel" :props="props">
|
||||
{{ props.row.insigniaLevel }}
|
||||
</q-td>
|
||||
<q-td key="dateSend" :props="props">
|
||||
{{ props.row.dateSend }}
|
||||
</q-td>
|
||||
<q-td key="note" class="text-center">
|
||||
<q-btn
|
||||
v-if="props.row.reason"
|
||||
icon="mdi-information-outline"
|
||||
size="12px"
|
||||
color="blue"
|
||||
flat
|
||||
round
|
||||
dense
|
||||
@click.stop="clickShowreson(props.row.name, props.row.reason)"
|
||||
>
|
||||
<q-tooltip>หมายเหตุ</q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
<q-td key="warn" class="text-center" v-if="props.row.statusMark">
|
||||
<q-btn
|
||||
icon="mdi-information-outline"
|
||||
size="12px"
|
||||
color="red"
|
||||
flat
|
||||
round
|
||||
dense
|
||||
@click.stop="
|
||||
clickShowWarn(
|
||||
props.row.markDiscipline,
|
||||
props.row.markLeave,
|
||||
props.row.markRate
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-tooltip>แจ้งเตือน</q-tooltip></q-btn
|
||||
>
|
||||
</q-td>
|
||||
<q-td v-else auto-width></q-td>
|
||||
|
||||
<q-td
|
||||
v-close-popup
|
||||
auto-width
|
||||
|
|
@ -1213,18 +1144,83 @@ onMounted(async () => {
|
|||
</q-menu>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
<q-td v-else auto-width></q-td>
|
||||
<q-td
|
||||
auto-width
|
||||
v-if="props.row.insigniaSend == 'เหรียญจักรพรรดิมาลา'"
|
||||
>
|
||||
|
||||
<q-td auto-width>
|
||||
<btnDownloadFile
|
||||
v-if="props.row.insigniaSend == 'เหรียญจักรพรรดิมาลา'"
|
||||
:profileId="props.row.profileId"
|
||||
:round="DataStore.roundId"
|
||||
:optionRound="DataStore.optionRound"
|
||||
/>
|
||||
</q-td>
|
||||
<q-td v-else auto-width></q-td>
|
||||
|
||||
<q-td key="note" class="text-center">
|
||||
<q-btn
|
||||
v-if="props.row.reason"
|
||||
icon="mdi-information-outline"
|
||||
size="12px"
|
||||
color="blue"
|
||||
flat
|
||||
round
|
||||
dense
|
||||
@click.stop="clickShowreson(props.row.name, props.row.reason)"
|
||||
>
|
||||
<q-tooltip>หมายเหตุ</q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
<q-td key="warn" class="text-center">
|
||||
<q-btn
|
||||
v-if="props.row.statusMark"
|
||||
icon="mdi-information-outline"
|
||||
size="12px"
|
||||
color="red"
|
||||
flat
|
||||
round
|
||||
dense
|
||||
@click.stop="
|
||||
clickShowWarn(
|
||||
props.row.markDiscipline,
|
||||
props.row.markLeave,
|
||||
props.row.markRate
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-tooltip>แจ้งเตือน</q-tooltip></q-btn
|
||||
>
|
||||
</q-td>
|
||||
<q-td key="no" :props="props">
|
||||
{{ props.rowIndex + 1 }}
|
||||
</q-td>
|
||||
<q-td key="citizenId" :props="props">
|
||||
{{ props.row.citizenId ?? "-" }}
|
||||
</q-td>
|
||||
<q-td key="name" :props="props">
|
||||
{{ props.row.name }}
|
||||
</q-td>
|
||||
<q-td key="employeeType" :props="props">
|
||||
{{ props.row.employeeType }}
|
||||
</q-td>
|
||||
<q-td key="position" :props="props">
|
||||
{{ props.row.position }}
|
||||
</q-td>
|
||||
<q-td key="level" :props="props">
|
||||
{{ props.row.level }}
|
||||
</q-td>
|
||||
<q-td key="salary" :props="props">
|
||||
{{ Number(props.row.salary).toLocaleString() }}
|
||||
</q-td>
|
||||
<q-td key="insigniaType" :props="props">
|
||||
{{ props.row.insigniaType }}
|
||||
</q-td>
|
||||
<q-td key="insigniaSend" :props="props">
|
||||
{{ props.row.insigniaSend }}
|
||||
</q-td>
|
||||
<q-td key="insigniaLevel" :props="props">
|
||||
{{ props.row.insigniaLevel }}
|
||||
</q-td>
|
||||
<q-td key="dateSend" :props="props">
|
||||
{{ props.row.dateSend }}
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
</d-table>
|
||||
|
|
|
|||
|
|
@ -352,7 +352,7 @@ onMounted(async () => {
|
|||
:borderless="false"
|
||||
:outlined="true"
|
||||
:hide-dropdown-icon="false"
|
||||
style="min-width: 320px"
|
||||
style="min-width: 320px"
|
||||
@update:model-value="
|
||||
DataStore.searchDataTable(
|
||||
DataStore.typeinsignia,
|
||||
|
|
@ -446,10 +446,10 @@ onMounted(async () => {
|
|||
>
|
||||
<template v-slot:header="props">
|
||||
<q-tr :props="props">
|
||||
<q-th auto-width />
|
||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<span class="text-weight-medium">{{ col.label }}</span>
|
||||
</q-th>
|
||||
<q-th auto-width />
|
||||
</q-tr>
|
||||
</template>
|
||||
<template v-slot:body="props">
|
||||
|
|
@ -458,6 +458,20 @@ onMounted(async () => {
|
|||
class="cursor-pointer"
|
||||
@click="nextPage(props.row.profileId)"
|
||||
>
|
||||
<q-td v-if="props.row.requestNote != null" auto-width>
|
||||
<q-btn
|
||||
dense
|
||||
size="12px"
|
||||
flat
|
||||
round
|
||||
color="blue"
|
||||
@click.stop
|
||||
@click="showReson(props.row.name, props.row.requestNote)"
|
||||
icon="mdi-information-outline"
|
||||
>
|
||||
<q-tooltip>เหตุผลการไม่ยื่นขอ</q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
<q-td key="no" :props="props">
|
||||
{{ props.rowIndex + 1 }}
|
||||
</q-td>
|
||||
|
|
@ -488,20 +502,6 @@ onMounted(async () => {
|
|||
<q-td key="insigniaLevel" :props="props">
|
||||
{{ props.row.insigniaLevel }}
|
||||
</q-td>
|
||||
<q-td v-if="props.row.requestNote != null" auto-width>
|
||||
<q-btn
|
||||
dense
|
||||
size="12px"
|
||||
flat
|
||||
round
|
||||
color="blue"
|
||||
@click.stop
|
||||
@click="showReson(props.row.name, props.row.requestNote)"
|
||||
icon="mdi-information-outline"
|
||||
>
|
||||
<q-tooltip>เหตุผลการไม่ยื่นขอ</q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
</d-table>
|
||||
|
|
|
|||
|
|
@ -351,7 +351,7 @@ onMounted(async () => {
|
|||
:borderless="false"
|
||||
:outlined="true"
|
||||
:hide-dropdown-icon="false"
|
||||
style="min-width: 320px"
|
||||
style="min-width: 320px"
|
||||
@update:model-value="
|
||||
DataStore.searchDataTable(
|
||||
DataStore.typeinsignia,
|
||||
|
|
@ -445,10 +445,10 @@ onMounted(async () => {
|
|||
>
|
||||
<template v-slot:header="props">
|
||||
<q-tr :props="props">
|
||||
<q-th auto-width />
|
||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<span class="text-weight-medium">{{ col.label }}</span>
|
||||
</q-th>
|
||||
<q-th auto-width />
|
||||
</q-tr>
|
||||
</template>
|
||||
<template v-slot:body="props">
|
||||
|
|
@ -457,6 +457,19 @@ onMounted(async () => {
|
|||
class="cursor-pointer"
|
||||
@click="nextPage(props.row.profileId)"
|
||||
>
|
||||
<q-td v-if="props.row.requestNote != null" auto-width>
|
||||
<q-btn
|
||||
dense
|
||||
size="12px"
|
||||
flat
|
||||
round
|
||||
color="blue"
|
||||
@click.stop="showNote(props.row)"
|
||||
icon="mdi-information-outline"
|
||||
>
|
||||
<q-tooltip>เหตุผลการลบออก</q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
<q-td key="no" :props="props">
|
||||
{{ props.rowIndex + 1 }}
|
||||
</q-td>
|
||||
|
|
@ -488,19 +501,6 @@ onMounted(async () => {
|
|||
<q-td key="insigniaLevel" :props="props">
|
||||
{{ props.row.insigniaLevel }}
|
||||
</q-td>
|
||||
<q-td v-if="props.row.requestNote != null" auto-width>
|
||||
<q-btn
|
||||
dense
|
||||
size="12px"
|
||||
flat
|
||||
round
|
||||
color="blue"
|
||||
@click.stop="showNote(props.row)"
|
||||
icon="mdi-information-outline"
|
||||
>
|
||||
<q-tooltip>เหตุผลการลบออก</q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
</d-table>
|
||||
|
|
|
|||
|
|
@ -541,56 +541,15 @@ onMounted(async () => {
|
|||
>
|
||||
<template v-slot:header="props">
|
||||
<q-tr :props="props">
|
||||
<q-th auto-width />
|
||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<span class="text-weight-medium">{{ col.label }}</span>
|
||||
</q-th>
|
||||
<q-th auto-width />
|
||||
|
||||
</q-tr>
|
||||
</template>
|
||||
<template v-slot:body="props">
|
||||
<q-tr :props="props" class="cursor-pointer">
|
||||
<q-td
|
||||
key="no"
|
||||
:props="props"
|
||||
@click="redirectToPage(props.row.id, props.row.insignia)"
|
||||
>
|
||||
{{ props.rowIndex + 1 }}
|
||||
</q-td>
|
||||
<q-td
|
||||
key="year"
|
||||
:props="props"
|
||||
@click="redirectToPage(props.row.id, props.row.insignia)"
|
||||
>
|
||||
{{ props.row.year }}
|
||||
</q-td>
|
||||
<q-td
|
||||
key="insignia"
|
||||
:props="props"
|
||||
@click="redirectToPage(props.row.id, props.row.insignia)"
|
||||
>
|
||||
{{ props.row.insignia }}
|
||||
</q-td>
|
||||
<q-td
|
||||
key="total"
|
||||
:props="props"
|
||||
@click="redirectToPage(props.row.id, props.row.insignia)"
|
||||
>
|
||||
{{ props.row.total }}
|
||||
</q-td>
|
||||
<q-td
|
||||
key="allocate"
|
||||
:props="props"
|
||||
@click="redirectToPage(props.row.id, props.row.insignia)"
|
||||
>
|
||||
{{ props.row.allocate }}
|
||||
</q-td>
|
||||
<q-td
|
||||
key="remain"
|
||||
:props="props"
|
||||
@click="redirectToPage(props.row.id, props.row.insignia)"
|
||||
>
|
||||
{{ props.row.remain }}
|
||||
</q-td>
|
||||
<q-td auto-width>
|
||||
<q-btn
|
||||
icon="mdi-dots-vertical"
|
||||
|
|
@ -640,6 +599,49 @@ onMounted(async () => {
|
|||
</q-menu>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
<q-td
|
||||
key="no"
|
||||
:props="props"
|
||||
@click="redirectToPage(props.row.id, props.row.insignia)"
|
||||
>
|
||||
{{ props.rowIndex + 1 }}
|
||||
</q-td>
|
||||
<q-td
|
||||
key="year"
|
||||
:props="props"
|
||||
@click="redirectToPage(props.row.id, props.row.insignia)"
|
||||
>
|
||||
{{ props.row.year }}
|
||||
</q-td>
|
||||
<q-td
|
||||
key="insignia"
|
||||
:props="props"
|
||||
@click="redirectToPage(props.row.id, props.row.insignia)"
|
||||
>
|
||||
{{ props.row.insignia }}
|
||||
</q-td>
|
||||
<q-td
|
||||
key="total"
|
||||
:props="props"
|
||||
@click="redirectToPage(props.row.id, props.row.insignia)"
|
||||
>
|
||||
{{ props.row.total }}
|
||||
</q-td>
|
||||
<q-td
|
||||
key="allocate"
|
||||
:props="props"
|
||||
@click="redirectToPage(props.row.id, props.row.insignia)"
|
||||
>
|
||||
{{ props.row.allocate }}
|
||||
</q-td>
|
||||
<q-td
|
||||
key="remain"
|
||||
:props="props"
|
||||
@click="redirectToPage(props.row.id, props.row.insignia)"
|
||||
>
|
||||
{{ props.row.remain }}
|
||||
</q-td>
|
||||
|
||||
</q-tr>
|
||||
</template>
|
||||
</d-table>
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ const tab = ref<string>("");
|
|||
|
||||
/** ข้อมูล Table*/
|
||||
const visibleColumns = ref<String[]>([
|
||||
"action",
|
||||
"no",
|
||||
"status",
|
||||
"citizenId",
|
||||
|
|
@ -44,9 +45,15 @@ const visibleColumns = ref<String[]>([
|
|||
"returnOrganization",
|
||||
"returnDate",
|
||||
"returnReason",
|
||||
"action",
|
||||
|
||||
]);
|
||||
const columns = ref<QTableProps["columns"]>([
|
||||
{
|
||||
name: "action",
|
||||
align: "left",
|
||||
label: "",
|
||||
field: "",
|
||||
},
|
||||
{
|
||||
name: "no",
|
||||
align: "left",
|
||||
|
|
@ -228,12 +235,7 @@ const columns = ref<QTableProps["columns"]>([
|
|||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "action",
|
||||
align: "left",
|
||||
label: "",
|
||||
field: "",
|
||||
},
|
||||
|
||||
]);
|
||||
const filterRef = ref<QInput>();
|
||||
const filter = ref<string>("");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue