updated route retirement
This commit is contained in:
parent
483fc2943a
commit
ebd4702356
6 changed files with 160 additions and 138 deletions
|
|
@ -299,7 +299,9 @@ const pagination = ref({
|
|||
<q-td
|
||||
v-for="col in props.cols"
|
||||
:key="col.id"
|
||||
@click="router.push(`/retirement/out/${props.row.id}`)"
|
||||
@click="
|
||||
router.push(`/retirement/dismiss-order/${props.row.id}`)
|
||||
"
|
||||
>
|
||||
<div v-if="col.name === 'no'">
|
||||
{{ props.rowIndex + 1 }}
|
||||
|
|
@ -307,13 +309,15 @@ const pagination = ref({
|
|||
|
||||
<div
|
||||
v-else
|
||||
:class="col.name === 'organizationPositionOld' ? 'table_ellipsis' : ''"
|
||||
:class="
|
||||
col.name === 'organizationPositionOld'
|
||||
? 'table_ellipsis'
|
||||
: ''
|
||||
"
|
||||
>
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
|
||||
|
||||
</q-tr>
|
||||
</template>
|
||||
</d-table>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import type { ResponseItems } from "@/modules/06_retirement/interface/response/e
|
|||
import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogFooter.vue";
|
||||
import DialogHeader from "@/components/DialogHeader.vue";
|
||||
|
||||
|
||||
/** use */
|
||||
const $q = useQuasar(); //ใช้ noti quasar
|
||||
const router = useRouter();
|
||||
|
|
@ -297,7 +296,7 @@ const openModalCalendar = (rows: any) => {
|
|||
color="blue-9"
|
||||
icon="mdi-square-edit-outline"
|
||||
outline
|
||||
@click="$router.push('/exit-Interview/edit-question')"
|
||||
@click="$router.push('/retirement/exit-Interview/edit-question')"
|
||||
><span class="q-pl-sm">แก้ไขคำถาม</span></q-btn
|
||||
>
|
||||
</div>
|
||||
|
|
@ -374,7 +373,9 @@ const openModalCalendar = (rows: any) => {
|
|||
key="no"
|
||||
:props="props"
|
||||
@click="
|
||||
router.push(`/exit-Interview/questionnair/${props.row.id}`)
|
||||
router.push(
|
||||
`/retirement/exit-Interview/questionnair/${props.row.id}`
|
||||
)
|
||||
"
|
||||
>
|
||||
{{ props.rowIndex + 1 }}
|
||||
|
|
@ -383,7 +384,9 @@ const openModalCalendar = (rows: any) => {
|
|||
key="fullname"
|
||||
:props="props"
|
||||
@click="
|
||||
router.push(`/exit-Interview/questionnair/${props.row.id}`)
|
||||
router.push(
|
||||
`/retirement/exit-Interview/questionnair/${props.row.id}`
|
||||
)
|
||||
"
|
||||
>
|
||||
{{ props.row.fullname }}
|
||||
|
|
@ -392,7 +395,9 @@ const openModalCalendar = (rows: any) => {
|
|||
key="realReason"
|
||||
:props="props"
|
||||
@click="
|
||||
router.push(`/exit-Interview/questionnair/${props.row.id}`)
|
||||
router.push(
|
||||
`/retirement/exit-Interview/questionnair/${props.row.id}`
|
||||
)
|
||||
"
|
||||
>
|
||||
{{ props.row.realReason }}
|
||||
|
|
@ -401,7 +406,9 @@ const openModalCalendar = (rows: any) => {
|
|||
key="notExitFactor"
|
||||
:props="props"
|
||||
@click="
|
||||
router.push(`/exit-Interview/questionnair/${props.row.id}`)
|
||||
router.push(
|
||||
`/retirement/exit-Interview/questionnair/${props.row.id}`
|
||||
)
|
||||
"
|
||||
>
|
||||
{{ props.row.notExitFactor }}
|
||||
|
|
@ -410,7 +417,9 @@ const openModalCalendar = (rows: any) => {
|
|||
key="futureWork"
|
||||
:props="props"
|
||||
@click="
|
||||
router.push(`/exit-Interview/questionnair/${props.row.id}`)
|
||||
router.push(
|
||||
`/retirement/exit-Interview/questionnair/${props.row.id}`
|
||||
)
|
||||
"
|
||||
>
|
||||
{{ props.row.futureWork ? "ใช่" : "ไม่" }}
|
||||
|
|
@ -419,7 +428,9 @@ const openModalCalendar = (rows: any) => {
|
|||
key="futureWorkReason"
|
||||
:props="props"
|
||||
@click="
|
||||
router.push(`/exit-Interview/questionnair/${props.row.id}`)
|
||||
router.push(
|
||||
`/retirement/exit-Interview/questionnair/${props.row.id}`
|
||||
)
|
||||
"
|
||||
>
|
||||
{{ props.row.futureWorkReason }}
|
||||
|
|
@ -428,7 +439,9 @@ const openModalCalendar = (rows: any) => {
|
|||
key="havejob"
|
||||
:props="props"
|
||||
@click="
|
||||
router.push(`/exit-Interview/questionnair/${props.row.id}`)
|
||||
router.push(
|
||||
`/retirement/exit-Interview/questionnair/${props.row.id}`
|
||||
)
|
||||
"
|
||||
>
|
||||
{{ props.row.havejob ? "ใช่" : "ไม่" }}
|
||||
|
|
@ -438,7 +451,9 @@ const openModalCalendar = (rows: any) => {
|
|||
key="havejobReason"
|
||||
:props="props"
|
||||
@click="
|
||||
router.push(`/exit-Interview/questionnair/${props.row.id}`)
|
||||
router.push(
|
||||
`/retirement/exit-Interview/questionnair/${props.row.id}`
|
||||
)
|
||||
"
|
||||
>
|
||||
<div class="table_ellipsis">
|
||||
|
|
@ -449,7 +464,9 @@ const openModalCalendar = (rows: any) => {
|
|||
key="appointDate"
|
||||
:props="props"
|
||||
@click="
|
||||
router.push(`/exit-Interview/questionnair/${props.row.id}`)
|
||||
router.push(
|
||||
`/retirement/exit-Interview/questionnair/${props.row.id}`
|
||||
)
|
||||
"
|
||||
>
|
||||
{{
|
||||
|
|
@ -460,12 +477,13 @@ const openModalCalendar = (rows: any) => {
|
|||
key="datetext"
|
||||
:props="props"
|
||||
@click="
|
||||
router.push(`/exit-Interview/questionnair/${props.row.id}`)
|
||||
router.push(
|
||||
`/retirement/exit-Interview/questionnair/${props.row.id}`
|
||||
)
|
||||
"
|
||||
>
|
||||
{{ props.row.datetext }}
|
||||
</q-td>
|
||||
|
||||
</q-tr>
|
||||
</template>
|
||||
</d-table>
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ const resetFilter = () => {
|
|||
|
||||
/** Setting Pagination */
|
||||
const nextPage = (id: string) => {
|
||||
router.push("/deceased/" + id);
|
||||
router.push("/retirement/deceased/" + id);
|
||||
};
|
||||
const pagination = ref({
|
||||
sortBy: "createdAt",
|
||||
|
|
|
|||
|
|
@ -375,7 +375,7 @@ const updateData = (row: DataCopyOrder) => {
|
|||
flat
|
||||
color="primary"
|
||||
class="q-mr-sm"
|
||||
@click="router.push(`/deceased/${profileId}`)"
|
||||
@click="router.push(`/retirement/deceased/${profileId}`)"
|
||||
/>
|
||||
ส่งหนังสือเวียน
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ const fetchData = async () => {
|
|||
|
||||
//เปิดdetail ของ deceased
|
||||
const openDeceased = (id: string) => {
|
||||
router.push(`/deceased/detail/${id}`);
|
||||
router.push(`/retirement/deceased/detail/${id}`);
|
||||
};
|
||||
|
||||
//ไปหน้าถัดไป
|
||||
|
|
@ -109,7 +109,7 @@ const fileDownload = async (type: string) => {
|
|||
flat
|
||||
color="primary"
|
||||
class="q-mr-sm"
|
||||
@click="router.push(`/deceased`)"
|
||||
@click="router.push(`/retirement/deceased`)"
|
||||
/>
|
||||
รายละเอียดบันทึกเวียนแจ้งการถึงแก่กรรม {{ fullName }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
const Main = () => import("@/modules/06_retirement/views/Main.vue");
|
||||
const Listretirement = () =>
|
||||
import("@/modules/06_retirement/components/ListRetirement/TableList.vue");
|
||||
const resignOrder = () =>
|
||||
import("@/modules/06_retirement/components/resign/ResignOrder.vue");
|
||||
// const resignOrder = () =>
|
||||
// import("@/modules/06_retirement/components/resign/ResignOrder.vue");
|
||||
const resign = () =>
|
||||
import("@/modules/06_retirement/components/resign/Resign.vue");
|
||||
const resignByid = () =>
|
||||
|
|
@ -19,17 +19,17 @@ const dismissOrder = () =>
|
|||
import("@/modules/06_retirement/components/DismissOrder/DismissOrder.vue");
|
||||
const outDetail = () =>
|
||||
import("@/modules/06_retirement/components/DismissOrder/outRegistry.vue");
|
||||
const dischargedMain = () =>
|
||||
import("@/modules/06_retirement/components/Discharged/dischargedMain.vue");
|
||||
const dischargedDetails = () =>
|
||||
import(
|
||||
"@/modules/06_retirement/components/Discharged/dischargedRegistry.vue"
|
||||
);
|
||||
const expulsionMain = () =>
|
||||
import("@/modules/06_retirement/components/Expulsion/expulsionMain.vue");
|
||||
// const dischargedMain = () =>
|
||||
// import("@/modules/06_retirement/components/Discharged/dischargedMain.vue");
|
||||
// const dischargedDetails = () =>
|
||||
// import(
|
||||
// "@/modules/06_retirement/components/Discharged/dischargedRegistry.vue"
|
||||
// );
|
||||
// const expulsionMain = () =>
|
||||
// import("@/modules/06_retirement/components/Expulsion/expulsionMain.vue");
|
||||
|
||||
const expulsionDetails = () =>
|
||||
import("@/modules/06_retirement/components/Expulsion/expulsionRegistry.vue");
|
||||
// const expulsionDetails = () =>
|
||||
// import("@/modules/06_retirement/components/Expulsion/expulsionRegistry.vue");
|
||||
const exitInterviewMain = () =>
|
||||
import("@/modules/06_retirement/components/ExitInterview/exitMain.vue");
|
||||
const exitInterviewDetails = () =>
|
||||
|
|
@ -46,38 +46,8 @@ export default [
|
|||
component: Main,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7],
|
||||
Role: "retirement",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/exit-Interview",
|
||||
name: "exit-Interview",
|
||||
component: exitInterviewMain,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.3],
|
||||
Role: "retirement",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/exit-Interview/questionnair/:id",
|
||||
name: "exit-Interview-details",
|
||||
component: exitInterviewDetails,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.4],
|
||||
Role: "retirement",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/exit-Interview/edit-question",
|
||||
name: "ExitInterviewEditQuestion",
|
||||
component: exitInterviewEditQuestion,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.5],
|
||||
Role: "retirement",
|
||||
Key: "SYS_RETIREMENT",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -86,8 +56,8 @@ export default [
|
|||
component: Listretirement,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.1],
|
||||
Role: "retirement",
|
||||
Key: "SYS_RETIREMENT",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -96,8 +66,38 @@ export default [
|
|||
component: Listretirement,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.1],
|
||||
Role: "retirement",
|
||||
Key: "SYS_RETIREMENT",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/retirement/exit-Interview",
|
||||
name: "exit-Interview",
|
||||
component: exitInterviewMain,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: "SYS_RESIGN_INTERVIEW",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/retirement/exit-Interview/questionnair/:id",
|
||||
name: "exit-Interview-details",
|
||||
component: exitInterviewDetails,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: "SYS_RESIGN_INTERVIEW",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/retirement/exit-Interview/edit-question",
|
||||
name: "ExitInterviewEditQuestion",
|
||||
component: exitInterviewEditQuestion,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: "SYS_RESIGN_INTERVIEW",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -106,8 +106,8 @@ export default [
|
|||
component: resign,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.2],
|
||||
Role: "retirement",
|
||||
Key: "SYS_RESIGN",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -116,108 +116,108 @@ export default [
|
|||
component: resignByid,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.3],
|
||||
Role: "retirement",
|
||||
Key: "SYS_RESIGN",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
// {
|
||||
// path: "/retirement/resign-order",
|
||||
// name: "resign-order",
|
||||
// component: resignOrder,
|
||||
// meta: {
|
||||
// Auth: true,
|
||||
// Key: "SYS_RESIGN",
|
||||
// Role: "STAFF",
|
||||
// },
|
||||
// },
|
||||
{
|
||||
path: "/retirement/resign-order",
|
||||
name: "resign-order",
|
||||
component: resignOrder,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.4],
|
||||
Role: "retirement",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/deceased",
|
||||
path: "/retirement/deceased",
|
||||
name: "deceased",
|
||||
component: deceased,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.5],
|
||||
Role: "retirement",
|
||||
Key: "SYS_PASSAWAY",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/deceased/:id",
|
||||
path: "/retirement/deceased/:id",
|
||||
name: "deceased-detail",
|
||||
component: detaildeceased,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.8],
|
||||
Role: "retirement",
|
||||
Key: "SYS_PASSAWAY",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/deceased/detail/:id",
|
||||
path: "/retirement/deceased/detail/:id",
|
||||
name: "deceased-detailByid",
|
||||
component: detaildeceasedByid,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.8],
|
||||
Role: "retirement",
|
||||
Key: "SYS_PASSAWAY",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/dismiss-order",
|
||||
path: "/retirement/dismiss-order",
|
||||
name: "dismiss-order",
|
||||
component: dismissOrder,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.5],
|
||||
Role: "retirement",
|
||||
Key: "SYS_DISMISS",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/retirement/out/:id",
|
||||
path: "/retirement/dismiss-order/:id",
|
||||
name: "outDetail",
|
||||
component: outDetail,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.5],
|
||||
Role: "retirement",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/discharged",
|
||||
name: "discharged",
|
||||
component: dischargedMain,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.6],
|
||||
Role: "retirement",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/retirement/discharged/:id",
|
||||
name: "dischargedDetails",
|
||||
component: dischargedDetails,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.6],
|
||||
Role: "retirement",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/expulsion",
|
||||
name: "expulsion",
|
||||
component: expulsionMain,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.7],
|
||||
Role: "retirement",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/retirement/expulsion/:id",
|
||||
name: "expulsionDetails",
|
||||
component: expulsionDetails,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7.7],
|
||||
Role: "retirement",
|
||||
Key: "SYS_DISMISS",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
// {
|
||||
// path: "/retirement/discharged",
|
||||
// name: "discharged",
|
||||
// component: dischargedMain,
|
||||
// meta: {
|
||||
// Auth: true,
|
||||
// Key: [7.6],
|
||||
// Role: "retirement",
|
||||
// },
|
||||
// },
|
||||
// {
|
||||
// path: "/retirement/discharged/:id",
|
||||
// name: "dischargedDetails",
|
||||
// component: dischargedDetails,
|
||||
// meta: {
|
||||
// Auth: true,
|
||||
// Key: [7.6],
|
||||
// Role: "retirement",
|
||||
// },
|
||||
// },
|
||||
// {
|
||||
// path: "/retirement/expulsion",
|
||||
// name: "expulsion",
|
||||
// component: expulsionMain,
|
||||
// meta: {
|
||||
// Auth: true,
|
||||
// Key: [7.7],
|
||||
// Role: "retirement",
|
||||
// },
|
||||
// },
|
||||
// {
|
||||
// path: "/retirement/expulsion/:id",
|
||||
// name: "expulsionDetails",
|
||||
// component: expulsionDetails,
|
||||
// meta: {
|
||||
// Auth: true,
|
||||
// Key: [7.7],
|
||||
// Role: "retirement",
|
||||
// },
|
||||
// },
|
||||
];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue