แก้เงื่อนไข redirect ต่างๆ
This commit is contained in:
AnandaTon
parent
e8524c9782
commit
6ec6e7bd12
3 changed files with 155 additions and 162 deletions
|
|
@ -136,12 +136,16 @@ const fecthListTransfer = async () => {
|
|||
const clickAdd = async () => {
|
||||
router.push(`/transfer/add`)
|
||||
}
|
||||
|
||||
const clickBack = () => {
|
||||
router.push(`/`)
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<div class="col-12 row justify-center">
|
||||
<div class="col-xs-12 col-sm-12 col-md-11">
|
||||
<div class="toptitle text-white col-12 row items-center">
|
||||
<q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm" @click="router.go(-1)" />
|
||||
<q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm" @click="clickBack" />
|
||||
เรื่องขอโอน
|
||||
</div>
|
||||
<div class="col-12">
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<q-card bordered class="row col-12 text-dark q-mt-sm">
|
||||
<q-card bordered class="row col-12 text-dark q-mt-sm" v-if="routeName != 'AddLeave'">
|
||||
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
|
||||
<div class="q-pl-sm text-weight-bold text-dark">ผลการพิจารณาของผู้บังคับบัญชา</div>
|
||||
</div>
|
||||
|
|
@ -137,7 +137,7 @@
|
|||
</div>
|
||||
</q-card>
|
||||
|
||||
<q-card bordered class="row col-12 text-dark q-mt-sm">
|
||||
<q-card bordered class="row col-12 text-dark q-mt-sm" v-if="routeName != 'AddLeave'">
|
||||
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
|
||||
<div class="q-pl-sm text-weight-bold text-dark">ผลการพิจารณาของผู้มีอำนาจ</div>
|
||||
</div>
|
||||
|
|
@ -232,6 +232,10 @@ const dataDetail = ref<any>({
|
|||
fullname: "",
|
||||
})
|
||||
|
||||
const clickBack = () => {
|
||||
router.push(`/leave`)
|
||||
}
|
||||
|
||||
const statusOrder = (val: boolean) => {
|
||||
switch (val) {
|
||||
case true:
|
||||
|
|
@ -312,6 +316,7 @@ const cancelResing = () => {
|
|||
if (route.params.id !== undefined) {
|
||||
id.value = route.params.id.toString()
|
||||
deleteResting(id.value)
|
||||
clickBack()
|
||||
}
|
||||
})
|
||||
.onCancel(() => {})
|
||||
|
|
|
|||
|
|
@ -1,174 +1,158 @@
|
|||
<script setup lang="ts">
|
||||
import type { QTableProps } from "quasar";
|
||||
import { ref, onMounted } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
import { useRouter } from "vue-router";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
import { useRestDataStore } from "@/modules/03_leave/store";
|
||||
import Table from "@/components/Table.vue";
|
||||
import type { QTableProps } from "quasar"
|
||||
import { ref, onMounted } from "vue"
|
||||
import { useQuasar } from "quasar"
|
||||
import { useRouter } from "vue-router"
|
||||
import { useCounterMixin } from "@/stores/mixin"
|
||||
import http from "@/plugins/http"
|
||||
import config from "@/app.config"
|
||||
import { useRestDataStore } from "@/modules/03_leave/store"
|
||||
import Table from "@/components/Table.vue"
|
||||
|
||||
const RestData = useRestDataStore();
|
||||
const { statusText } = RestData;
|
||||
const router = useRouter();
|
||||
const $q = useQuasar();
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai, dateToISO, success, messageError, showLoader, hideLoader } =
|
||||
mixin;
|
||||
const RestData = useRestDataStore()
|
||||
const { statusText } = RestData
|
||||
const router = useRouter()
|
||||
const $q = useQuasar()
|
||||
const mixin = useCounterMixin()
|
||||
const { date2Thai, dateToISO, success, messageError, showLoader, hideLoader } = mixin
|
||||
|
||||
const filter = ref<string>("");
|
||||
const visibleColumns = ref<String[]>([
|
||||
"no",
|
||||
"placeLeave",
|
||||
"dateStartLeave",
|
||||
"dateLeave",
|
||||
"statustext",
|
||||
]);
|
||||
const filter = ref<string>("")
|
||||
const visibleColumns = ref<String[]>(["no", "placeLeave", "dateStartLeave", "dateLeave", "statustext"])
|
||||
const columns = ref<QTableProps["columns"]>([
|
||||
{
|
||||
name: "no",
|
||||
align: "left",
|
||||
label: "ลำดับ",
|
||||
sortable: true,
|
||||
field: "no",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px; width:5%;",
|
||||
},
|
||||
{
|
||||
name: "placeLeave",
|
||||
align: "left",
|
||||
label: "สถานที่ยื่นขอลาออกจากราชการ",
|
||||
sortable: true,
|
||||
field: "placeLeave",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px; width:15%;",
|
||||
},
|
||||
{
|
||||
name: "dateStartLeave",
|
||||
align: "left",
|
||||
label: "วันที่ยื่นขอลาออกจากราชการ",
|
||||
sortable: true,
|
||||
field: "dateStartLeave",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px; width:15%;",
|
||||
},
|
||||
{
|
||||
name: "dateLeave",
|
||||
align: "left",
|
||||
label: "วันที่ขอลาออกจากราชการ",
|
||||
sortable: true,
|
||||
field: "dateLeave",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "statustext",
|
||||
align: "left",
|
||||
label: "สถานะ",
|
||||
sortable: true,
|
||||
field: "statustext",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px; width:10%;",
|
||||
},
|
||||
]);
|
||||
const rows = ref<any>([]);
|
||||
{
|
||||
name: "no",
|
||||
align: "left",
|
||||
label: "ลำดับ",
|
||||
sortable: true,
|
||||
field: "no",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px; width:5%;",
|
||||
},
|
||||
{
|
||||
name: "placeLeave",
|
||||
align: "left",
|
||||
label: "สถานที่ยื่นขอลาออกจากราชการ",
|
||||
sortable: true,
|
||||
field: "placeLeave",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px; width:15%;",
|
||||
},
|
||||
{
|
||||
name: "dateStartLeave",
|
||||
align: "left",
|
||||
label: "วันที่ยื่นขอลาออกจากราชการ",
|
||||
sortable: true,
|
||||
field: "dateStartLeave",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px; width:15%;",
|
||||
},
|
||||
{
|
||||
name: "dateLeave",
|
||||
align: "left",
|
||||
label: "วันที่ขอลาออกจากราชการ",
|
||||
sortable: true,
|
||||
field: "dateLeave",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "statustext",
|
||||
align: "left",
|
||||
label: "สถานะ",
|
||||
sortable: true,
|
||||
field: "statustext",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px; width:10%;",
|
||||
},
|
||||
])
|
||||
const rows = ref<any>([])
|
||||
const initialPagination = ref({
|
||||
rowsPerPage: 0,
|
||||
});
|
||||
rowsPerPage: 0,
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
fectListleave();
|
||||
});
|
||||
fectListleave()
|
||||
})
|
||||
|
||||
const fectListleave = async () => {
|
||||
showLoader();
|
||||
await http
|
||||
.get(config.API.listUser())
|
||||
.then((res: any) => {
|
||||
// console.log(res);
|
||||
let data = res.data.result;
|
||||
console.log(data);
|
||||
rows.value = data.map((e: any) => ({
|
||||
id: e.id,
|
||||
placeLeave: e.location,
|
||||
dateStartLeave: date2Thai(e.sendDate),
|
||||
dateLeave: date2Thai(e.activeDate),
|
||||
status:e.status,
|
||||
statustext:statusText(e.status),
|
||||
}));
|
||||
})
|
||||
.catch((e: any) => {
|
||||
console.log(e);
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
};
|
||||
showLoader()
|
||||
await http
|
||||
.get(config.API.listUser())
|
||||
.then((res: any) => {
|
||||
// console.log(res);
|
||||
let data = res.data.result
|
||||
console.log(data)
|
||||
rows.value = data.map((e: any) => ({
|
||||
id: e.id,
|
||||
placeLeave: e.location,
|
||||
dateStartLeave: date2Thai(e.sendDate),
|
||||
dateLeave: date2Thai(e.activeDate),
|
||||
status: e.status,
|
||||
statustext: statusText(e.status),
|
||||
}))
|
||||
})
|
||||
.catch((e: any) => {
|
||||
console.log(e)
|
||||
messageError($q, e)
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader()
|
||||
})
|
||||
}
|
||||
|
||||
const clickAdd = async () => {
|
||||
router.push(`/leave/add`);
|
||||
};
|
||||
router.push(`/leave/add`)
|
||||
}
|
||||
|
||||
const clickBack = () => {
|
||||
router.push(`/`)
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<div class="col-12 row justify-center">
|
||||
<div class="col-xs-12 col-sm-12 col-md-11">
|
||||
<div class="toptitle text-white col-12 row items-center">
|
||||
<q-btn
|
||||
icon="mdi-arrow-left"
|
||||
unelevated
|
||||
round
|
||||
dense
|
||||
flat
|
||||
color="primary"
|
||||
class="q-mr-sm"
|
||||
@click="router.go(-1)"
|
||||
/>
|
||||
ลาออก
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<q-card bordered class="q-pa-md">
|
||||
<Table
|
||||
style="max-height: 80vh"
|
||||
:rows="rows"
|
||||
:columns="columns"
|
||||
:filter="filter"
|
||||
:visible-columns="visibleColumns"
|
||||
v-model:inputfilter="filter"
|
||||
v-model:inputvisible="visibleColumns"
|
||||
:pagination="initialPagination"
|
||||
:inputShow="false"
|
||||
:add="clickAdd"
|
||||
:titleText="''"
|
||||
>
|
||||
<template #columns="props">
|
||||
<q-tr
|
||||
:props="props"
|
||||
class="cursor-pointer"
|
||||
@click="router.push(`/leave/` + props.row.id)"
|
||||
>
|
||||
<q-td key="no" :props="props">
|
||||
{{ props.rowIndex + 1 }}
|
||||
</q-td>
|
||||
<q-td key="placeLeave" :props="props">
|
||||
{{ props.row.placeLeave}}
|
||||
</q-td>
|
||||
<q-td key="dateStartLeave" :props="props">
|
||||
{{ props.row.dateStartLeave}}
|
||||
</q-td>
|
||||
<q-td key="dateStartLeave" :props="props">
|
||||
{{ props.row.dateStartLeave}}
|
||||
</q-td>
|
||||
<q-td key="statustext" :props="props">
|
||||
{{ props.row.statustext }}
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
</Table>
|
||||
</q-card>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 row justify-center">
|
||||
<div class="col-xs-12 col-sm-12 col-md-11">
|
||||
<div class="toptitle text-white col-12 row items-center">
|
||||
<q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm" @click="clickBack" />
|
||||
ลาออก
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<q-card bordered class="q-pa-md">
|
||||
<Table
|
||||
style="max-height: 80vh"
|
||||
:rows="rows"
|
||||
:columns="columns"
|
||||
:filter="filter"
|
||||
:visible-columns="visibleColumns"
|
||||
v-model:inputfilter="filter"
|
||||
v-model:inputvisible="visibleColumns"
|
||||
:pagination="initialPagination"
|
||||
:inputShow="false"
|
||||
:add="clickAdd"
|
||||
:titleText="''"
|
||||
>
|
||||
<template #columns="props">
|
||||
<q-tr :props="props" class="cursor-pointer" @click="router.push(`/leave/` + props.row.id)">
|
||||
<q-td key="no" :props="props">
|
||||
{{ props.rowIndex + 1 }}
|
||||
</q-td>
|
||||
<q-td key="placeLeave" :props="props">
|
||||
{{ props.row.placeLeave }}
|
||||
</q-td>
|
||||
<q-td key="dateStartLeave" :props="props">
|
||||
{{ props.row.dateStartLeave }}
|
||||
</q-td>
|
||||
<q-td key="dateStartLeave" :props="props">
|
||||
{{ props.row.dateStartLeave }}
|
||||
</q-td>
|
||||
<q-td key="statustext" :props="props">
|
||||
{{ props.row.statustext }}
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
</Table>
|
||||
</q-card>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<style></style>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue