no message

This commit is contained in:
setthawutttty 2023-07-24 13:20:02 +07:00
commit 6dd84473b6
10 changed files with 752 additions and 927 deletions

View file

@ -1135,7 +1135,7 @@ const fetchData = async () => {
durationYear: e.durationYear, durationYear: e.durationYear,
other: e.other, other: e.other,
fundName: e.fundName, fundName: e.fundName,
isDate: e.isDate.toString(), isDate: e.isDate == null ? null : e.isDate.toString(),
finishDate: new Date(e.finishDate), finishDate: new Date(e.finishDate),
startDate: new Date(e.startDate).getFullYear(), startDate: new Date(e.startDate).getFullYear(),
endDate: new Date(e.endDate).getFullYear(), endDate: new Date(e.endDate).getFullYear(),

View file

@ -19,7 +19,7 @@ interface RequestItemsObject {
durationYear: number; durationYear: number;
other: string; other: string;
fundName: string; fundName: string;
isDate: string; isDate: string | null;
finishDate: Date; finishDate: Date;
startDate: number; startDate: number;
endDate: number; endDate: number;

View file

@ -14,7 +14,7 @@ interface ResponseObject {
durationYear: number; durationYear: number;
other: string; other: string;
fundName: string; fundName: string;
isDate: string; isDate: string | null;
finishDate: Date; finishDate: Date;
startDate: number; startDate: number;
endDate: number; endDate: number;

View file

@ -373,10 +373,9 @@ watch(props, () => {
}); });
console.log("personal", personal.value); console.log("personal", personal.value);
} }
// console.log("draft===>", personal.value.draft); // console.log("draft===>", personal.value.draft);
if (personal.value.draft === false) { if (personal.value && personal.value.draft === false) {
// const findData = dataRespone.value.find(findByPerson); // const findData = dataRespone.value.find(findByPerson);
let findData: any = null; let findData: any = null;
console.log(dataRespone.value); console.log(dataRespone.value);

View file

@ -297,8 +297,8 @@ const saveDeferment = async () => {
hideLoader(); hideLoader();
}); });
}) })
.onCancel(() => {}) .onCancel(() => { })
.onDismiss(() => {}); .onDismiss(() => { });
} }
}); });
}; };
@ -338,8 +338,8 @@ const saveDisclaim = async () => {
hideLoader(); hideLoader();
}); });
}) })
.onCancel(() => {}) .onCancel(() => { })
.onDismiss(() => {}); .onDismiss(() => { });
} }
}); });
}; };
@ -441,6 +441,10 @@ const validateData = async () => {
}); });
}; };
const clickCloseSendModal = () => {
modaladdlist.value = false
}
const clickClose = async () => { const clickClose = async () => {
userNote.value = ""; userNote.value = "";
if (editRow.value == true) { if (editRow.value == true) {
@ -537,435 +541,235 @@ const paginationLabel = (start: number, end: number, total: number) => {
</script> </script>
<template> <template>
<q-form ref="myForm"> <q-form ref="myForm">
<Table <Table :contain-status="containStatus" :rows="rows" :columns="columns" :filter="filter"
:contain-status="containStatus" :visible-columns="visibleColumns" v-model:inputfilter="filter" v-model:inputvisible="visibleColumns"
:rows="rows" v-model:editvisible="editvisible" v-model:containfilter="containStatus"
:columns="columns" @update-modaladdlist="handleModalAddListUpdate" :history="true" :boss="true" :saveNoDraft="true"
:filter="filter" :role-admin="roleAdmin">
:visible-columns="visibleColumns" <template #columns="props">
v-model:inputfilter="filter" <q-tr :props="props">
v-model:inputvisible="visibleColumns" <q-td v-for="col in props.cols" :key="col.name" :props="props" @click="selectData(props.row.personalId)"
v-model:editvisible="editvisible" class="cursor-pointer">
v-model:containfilter="containStatus" <template v-if="col.name === 'position'">
@update-modaladdlist="handleModalAddListUpdate" {{ props.rowIndex + 1 }}
:history="true" </template>
:boss="true" <template v-else-if="col.name === 'fullName'" class="table_ellipsis">
:saveNoDraft="true" <div class="row col-12 text-no-wrap items-center">
:role-admin="roleAdmin" <img v-if="props.row.avatar == null" src="@/assets/avatar_user.jpg" class="col-4 img-info" />
> <img v-else :src="props.row.avatar" class="col-4 img-info" />
<template #columns="props"> <div class="col-4">
<q-tr :props="props"> <div class="text-weight-medium">{{ props.row.name }}</div>
<q-td <div class="text-weight-light">{{ props.row.idCard }}</div>
v-for="col in props.cols" </div>
:key="col.name"
:props="props"
@click="selectData(props.row.personalId)"
class="cursor-pointer"
>
<template v-if="col.name === 'position'">
{{ props.rowIndex + 1 }}
</template>
<template
v-else-if="col.name === 'fullName'"
class="table_ellipsis"
>
<div class="row col-12 text-no-wrap items-center">
<img
v-if="props.row.avatar == null"
src="@/assets/avatar_user.jpg"
class="col-4 img-info"
/>
<img v-else :src="props.row.avatar" class="col-4 img-info" />
<div class="col-4">
<div class="text-weight-medium">{{ props.row.name }}</div>
<div class="text-weight-light">{{ props.row.idCard }}</div>
</div> </div>
</div> </template>
</template> <template v-else-if="col.name === 'examNumber'">
<template v-else-if="col.name === 'examNumber'"> <div class="text-weight-medium">
<div class="text-weight-medium"> {{ props.row.examNumber !== null ? props.row.examNumber : "-" }}
{{ props.row.examNumber !== null ? props.row.examNumber : "-" }} </div>
</div> </template>
</template>
<template v-else-if="col.name === 'organizationName'"> <template v-else-if="col.name === 'organizationName'">
<div <div v-if="props.row.orgName !== null || props.row.positionPath !== null
v-if=" ">
props.row.orgName !== null || props.row.positionPath !== null <div class="col-4">
" <div class="text-weight-medium">
> {{ props.row.orgName !== null ? props.row.orgName : "-" }}
<div class="col-4"> {{
<div class="text-weight-medium"> props.row.organizationShortName !== null
{{ props.row.orgName !== null ? props.row.orgName : "-" }}
{{
props.row.organizationShortName !== null
? `(${props.row.organizationShortName})` ? `(${props.row.organizationShortName})`
: "" : ""
}} }}
</div> </div>
<div class="text-weight-light"> <div class="text-weight-light">
{{ {{
props.row.positionPath !== null props.row.positionPath !== null
? props.row.positionPath ? props.row.positionPath
: "-" : "-"
}} }}
{{ {{
props.row.positionNumber !== null props.row.positionNumber !== null
? `(${props.row.positionNumber})` ? `(${props.row.positionNumber})`
: "" : ""
}} }}
</div>
</div> </div>
</div> </div>
</div> <div v-else>
<div v-else> <div class="col-4">
<div class="col-4"> <div class="text-weight-medium">-</div>
<div class="text-weight-medium">-</div> </div>
</div> </div>
</div>
</template>
<template v-else-if="col.name === 'positionCandidate'">
<div
class="text-weight-medium"
v-if="props.row.positionCandidate == null"
>
-
</div>
<div class="text-weight-medium" v-else>
{{ props.row.positionCandidate }}
</div>
</template>
<template
v-else-if="col.name === 'reportingDate' && col.value !== '-'"
>
<div class="text-weight-medium">
{{ props.row.reportingDate }}
</div>
</template>
<template v-else-if="col.name === 'bmaOfficer'">
<div class="text-weight-medium">
{{ props.row.bmaOfficer !== null ? props.row.bmaOfficer : "-" }}
</div>
</template>
<template v-else-if="col.name === 'draft'">
<div class="text-weight-medium">
{{ props.row.draft }}
</div>
</template>
<template v-else-if="col.name === 'statusName'">
<div class="text-weight-medium">
{{ props.row.statusName }}
</div>
</template>
</q-td>
<q-td auto-width>
<q-btn
icon="mdi-dots-vertical"
size="12px"
color="grey-7"
flat
round
dense
>
<q-menu transition-show="jump-down" transition-hide="jump-up">
<q-list dense style="min-width: 100px">
<q-item
v-if="
(roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
props.row.draft === 'รอส่งตัว'
"
clickable
v-close-popup
@click="openAppointModal(props.row.personalId)"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
color="primary"
size="xs"
name="mdi-bookmark-outline"
/>
</q-item-section>
<q-item-section>เลอกหนวยงานทบบรรจ</q-item-section>
</q-item>
<q-separator />
<q-item
v-if="roleAdmin && props.row.statusId === 'UN-CONTAIN'"
clickable
v-close-popup
@click="editDetail(props.row, 'deferment')"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
color="blue"
size="xs"
name="mdi-account-alert-outline"
/>
</q-item-section>
<q-item-section>ขอผอนผ</q-item-section>
</q-item>
<q-item
v-else-if="
props.row.deferment === true &&
props.row.statusId != 'DISCLAIM'
"
clickable
v-close-popup
@click="editDetail(props.row, 'defermentInfo')"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
color="blue"
size="xs"
name="mdi-account-details-outline"
/>
</q-item-section>
<q-item-section>อมลการผอนผ</q-item-section>
</q-item>
<q-separator />
<q-item
v-if="
props.row.statusId === 'UN-CONTAIN' ||
props.row.statusId === 'PREPARE-CONTAIN'
"
clickable
v-close-popup
@click="editDetail(props.row, 'disclaim')"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
color="pink"
size="xs"
name="mdi-account-cancel-outline"
/>
</q-item-section>
<q-item-section>สละสทธ</q-item-section>
</q-item>
<q-item
v-else-if="props.row.statusId === 'DISCLAIM'"
clickable
v-close-popup
@click="editDetail(props.row, 'disclaimInfo')"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
color="pink"
size="xs"
name="mdi-account-cancel-outline"
/>
</q-item-section>
<q-item-section>อมลการสละสทธ</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
</q-td>
</q-tr>
</template>
</Table>
</q-form>
<!-- เลอกหนวยงานทบรรจ -->
<DialogOrgTree
v-model:modal="appointModal"
:personalId="personalId"
:close="clickCloseModalTree"
:personal="personal"
/>
<!-- popup ขอผอนผ / สละสทธ -->
<q-form ref="myForm">
<DialogCard
v-model:Modal="modal"
:personal-id="personalId"
:close="clickClose"
:validate="validateData"
/>
</q-form>
<q-dialog v-model="modalDefermentDisclaim" persistent>
<q-card style="width: 800px">
<q-form ref="myForm">
<DialogHeader
:title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ชื่อ${Name}`"
:close="clickClose"
/>
<q-separator />
<q-card-section class="q-p-sm">
<div class="col-xs-12 col-sm-12 col-md-12">
<q-input
:class="getClass(edit)"
hide-bottom-space
:outlined="edit"
dense
lazy-rules
:rules="[(val) => !!val || 'กรุณากรอกเหตุผล']"
:readonly="!edit"
:borderless="!edit"
v-model="userNote"
:label="`${'กรอกเหตุผล'}`"
@update:model-value="clickEditRow"
type="textarea"
/>
<q-file
v-if="getNumFile === 1"
v-model="files"
dense
:label="`${'เลือกไฟล์เอกสารหลักฐาน'}`"
outlined
use-chips
:rules="[(val) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน']"
multiple
@update:model-value="clickEditRow"
class="q-py-sm"
>
<template v-slot:prepend>
<q-icon name="attach_file" color="primary" />
</template> </template>
</q-file> <template v-else-if="col.name === 'positionCandidate'">
</div> <div class="text-weight-medium" v-if="props.row.positionCandidate == null">
</q-card-section> -
<q-separator /> </div>
<DialogFooter <div class="text-weight-medium" v-else>
:editvisible="true" {{ props.row.positionCandidate }}
:validate="validateData" </div>
:save="modalDisclaim ? saveDisclaim : saveDeferment" </template>
/> <template v-else-if="col.name === 'reportingDate' && col.value !== '-'">
</q-form> <div class="text-weight-medium">
</q-card> {{ props.row.reportingDate }}
</q-dialog> </div>
</template>
<template v-else-if="col.name === 'bmaOfficer'">
<div class="text-weight-medium">
{{ props.row.bmaOfficer !== null ? props.row.bmaOfficer : "-" }}
</div>
</template>
<template v-else-if="col.name === 'draft'">
<div class="text-weight-medium">
{{ props.row.draft }}
</div>
</template>
<template v-else-if="col.name === 'statusName'">
<div class="text-weight-medium">
{{ props.row.statusName }}
</div>
</template>
</q-td>
<q-td auto-width>
<q-btn icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense>
<q-menu transition-show="jump-down" transition-hide="jump-up">
<q-list dense style="min-width: 100px">
<q-item v-if="(roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
props.row.draft === 'รอส่งตัว'
" clickable v-close-popup @click="openAppointModal(props.row.personalId)">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-icon color="primary" size="xs" name="mdi-bookmark-outline" />
</q-item-section>
<q-item-section>เลอกหนวยงานทบบรรจ</q-item-section>
</q-item>
<!-- dialog อมลขอผอนผ / สละสทธ --> <q-separator />
<q-dialog v-model="modalwaitInfo" persistent> <q-item v-if="roleAdmin && props.row.statusId === 'UN-CONTAIN'" clickable v-close-popup
<q-card style="width: 500px; max-width: 500px"> @click="editDetail(props.row, 'deferment')">
<q-form ref="myForm"> <q-item-section style="min-width: 0px" avatar class="q-py-sm">
<DialogHeader <q-icon color="blue" size="xs" name="mdi-account-alert-outline" />
:title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ชื่อ${Name}`" </q-item-section>
:close="clickClose" <q-item-section>ขอผอนผ</q-item-section>
/> </q-item>
<q-item v-else-if="props.row.deferment === true &&
props.row.statusId != 'DISCLAIM'
" clickable v-close-popup @click="editDetail(props.row, 'defermentInfo')">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-icon color="blue" size="xs" name="mdi-account-details-outline" />
</q-item-section>
<q-item-section>อมลการผอนผ</q-item-section>
</q-item>
<q-separator />
<q-item v-if="props.row.statusId === 'UN-CONTAIN' ||
props.row.statusId === 'PREPARE-CONTAIN'
" clickable v-close-popup @click="editDetail(props.row, 'disclaim')">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-icon color="pink" size="xs" name="mdi-account-cancel-outline" />
</q-item-section>
<q-item-section>สละสทธ</q-item-section>
</q-item>
<q-item v-else-if="props.row.statusId === 'DISCLAIM'" clickable v-close-popup
@click="editDetail(props.row, 'disclaimInfo')">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-icon color="pink" size="xs" name="mdi-account-cancel-outline" />
</q-item-section>
<q-item-section>อมลการสละสทธ</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
</q-td>
</q-tr>
</template>
</Table>
</q-form>
<!-- เลอกหนวยงานทบรรจ -->
<DialogOrgTree v-model:modal="appointModal" :personalId="personalId" :close="clickCloseModalTree"
:personal="personal" />
<!-- popup ขอผอนผ / สละสทธ -->
<q-form ref="myForm">
<DialogCard v-model:Modal="modal" :personal-id="personalId" :close="clickClose" :validate="validateData" />
</q-form>
<q-dialog v-model="modalDefermentDisclaim" persistent>
<q-card style="width: 800px">
<q-form ref="myForm">
<DialogHeader :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ชื่อ${Name}`" :close="clickClose" />
<q-separator />
<q-card-section class="q-p-sm">
<div class="col-xs-12 col-sm-12 col-md-12">
<q-input :class="getClass(edit)" hide-bottom-space :outlined="edit" dense lazy-rules
:rules="[(val) => !!val || 'กรุณากรอกเหตุผล']" :readonly="!edit" :borderless="!edit" v-model="userNote"
:label="`${'กรอกเหตุผล'}`" @update:model-value="clickEditRow" type="textarea" />
<q-file v-if="getNumFile === 1" v-model="files" dense :label="`${'เลือกไฟล์เอกสารหลักฐาน'}`" outlined
use-chips :rules="[(val) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน']" multiple
@update:model-value="clickEditRow" class="q-py-sm">
<template v-slot:prepend>
<q-icon name="attach_file" color="primary" />
</template>
</q-file>
</div>
</q-card-section>
<q-separator />
<DialogFooter :editvisible="true" :validate="validateData" :save="modalDisclaim ? saveDisclaim : saveDeferment" />
</q-form>
</q-card>
</q-dialog>
<!-- dialog อมลขอผอนผ / สละสทธ -->
<q-dialog v-model="modalwaitInfo" persistent>
<q-card style="width: 500px; max-width: 500px">
<q-form ref="myForm">
<DialogHeader :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ชื่อ${Name}`" :close="clickClose" />
<q-separator />
<q-card-section class="q-p-sm">
<div class="row">
<div class="col-3 text-grey-7">เหตผล</div>
<div class="col-4">{{ dataInfo.reason }}</div>
</div>
<div v-if="!modalDisclaim" class="row q-pt-md">
<div class="col-3 text-grey-7 q-mt-sm">เอกสารหลกฐาน</div>
<div class="col-2 q-mt-sm">
<q-btn type="a" :href="dataInfo.reliefDoc" color="primary" flat dense round size="14px" icon="mdi-download"
target="_blank" />
</div>
</div>
</q-card-section>
<q-separator />
</q-form>
</q-card>
</q-dialog>
<!-- dialog เพมรายช -->
<q-dialog v-model="modaladdlist">
<q-card style="width: 900px; max-width: 80vw">
<DialogHeader title="ส่งรายชื่อไปยังหน่วยงาน" :close="clickCloseSendModal" />
<q-separator /> <q-separator />
<q-card-section class="q-p-sm"> <q-card-section class="q-pt-none">
<div class="row"> <div class="row justify-end">
<div class="col-3 text-grey-7">เหตผล</div> <div class="col-5">
<div class="col-4">{{ dataInfo.reason }}</div> <q-toolbar style="padding: 0">
</div> <q-input borderless outlined dense debounce="300" v-model="filterlistAdd" placeholder="ค้นหา"
<div v-if="!modalDisclaim" class="row q-pt-md"> style="width: 850px; max-width: auto">
<div class="col-3 text-grey-7 q-mt-sm">เอกสารหลกฐาน</div> <template v-slot:append>
<div class="col-2 q-mt-sm"> <q-icon name="search" />
<q-btn </template>
type="a" </q-input>
:href="dataInfo.reliefDoc" <q-select v-model="visibleColumnslist" multiple outlined dense options-dense
color="primary" :display-value="$q.lang.table.columns" emit-value map-options :options="columns" option-value="name"
flat options-cover style="min-width: 150px" class="gt-xs q-ml-sm" />
dense </q-toolbar>
round
size="14px"
icon="mdi-download"
target="_blank"
/>
</div> </div>
</div> </div>
</q-card-section>
<q-separator />
</q-form>
</q-card>
</q-dialog>
<!-- dialog เพมรายช --> <q-table flat bordered dense :rows="rowsFilter" :columns="columns" :filter="filterlistAdd" row-key="name"
<q-dialog v-model="modaladdlist"> class="custom-header-table" selection="multiple" v-model:selected="selected" :pagination-label="paginationLabel"
<q-card style="width: 900px; max-width: 80vw"> :visible-columns="visibleColumnslist">
<q-card-section> <template v-slot:header-selection="scope">
<q-toolbar class="q-py-md"> <q-checkbox keep-color color="primary" dense v-model="scope.selected" />
<q-toolbar-title class="header-text text-weight-bolder" </template>
>งรายชอไปยงหนวยงาน <!-- <template v-slot:body-selection="scope">
</q-toolbar-title>
<q-btn
icon="close"
unelevated
round
dense
@click="modaladdlist = false"
style="color: #ff8080; background-color: #ffdede"
/>
</q-toolbar>
</q-card-section>
<q-card-section class="q-pt-none">
<div class="row justify-end">
<div class="col-5">
<q-toolbar style="padding: 0">
<q-input
borderless
outlined
dense
debounce="300"
v-model="filterlistAdd"
placeholder="ค้นหา"
style="width: 850px; max-width: auto"
>
<template v-slot:append>
<q-icon name="search" />
</template>
</q-input>
<q-select
v-model="visibleColumnslist"
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="gt-xs q-ml-sm"
/>
</q-toolbar>
</div>
</div>
<q-table
flat
bordered
dense
:rows="rowsFilter"
:columns="columns"
:filter="filterlistAdd"
row-key="name"
class="custom-header-table"
selection="multiple"
v-model:selected="selected"
:pagination-label="paginationLabel"
:visible-columns="visibleColumnslist"
>
<template v-slot:header-selection="scope">
<q-checkbox
keep-color
color="primary"
dense
v-model="scope.selected"
/>
</template>
<!-- <template v-slot:body-selection="scope">
<q-checkbox <q-checkbox
keep-color keep-color
color="primary" color="primary"
@ -973,153 +777,112 @@ const paginationLabel = (start: number, end: number, total: number) => {
v-model="scope.selected" v-model="scope.selected"
/> />
</template> --> </template> -->
<template v-slot:body="props"> <template v-slot:body="props">
<q-tr :props="props"> <q-tr :props="props">
<q-td> <q-td>
<q-checkbox <q-checkbox keep-color color="primary" dense v-model="props.selected" />
keep-color </q-td>
color="primary" <q-td v-for="col in props.cols" :key="col.name" :props="props" class="cursor-pointer">
dense <template v-if="col.name === 'position'">
v-model="props.selected" {{ props.rowIndex + 1 }}
/> </template>
</q-td> <template v-else-if="col.name === 'fullName'" class="table_ellipsis">
<q-td <div class="row col-12 text-no-wrap items-center">
v-for="col in props.cols" <img v-if="props.row.avatar == null" src="@/assets/avatar_user.jpg" class="col-4 img-info" />
:key="col.name" <img v-else :src="props.row.avatar" class="col-4 img-info" />
:props="props" <div class="col-4">
class="cursor-pointer" <div class="text-weight-medium">{{ props.row.name }}</div>
> <div class="text-weight-light">
<template v-if="col.name === 'position'"> {{ props.row.idCard }}
{{ props.rowIndex + 1 }} </div>
</template>
<template
v-else-if="col.name === 'fullName'"
class="table_ellipsis"
>
<div class="row col-12 text-no-wrap items-center">
<img
v-if="props.row.avatar == null"
src="@/assets/avatar_user.jpg"
class="col-4 img-info"
/>
<img
v-else
:src="props.row.avatar"
class="col-4 img-info"
/>
<div class="col-4">
<div class="text-weight-medium">{{ props.row.name }}</div>
<div class="text-weight-light">
{{ props.row.idCard }}
</div> </div>
</div> </div>
</div> </template>
</template> <template v-else-if="col.name === 'examNumber'">
<template v-else-if="col.name === 'examNumber'"> <div class="text-weight-medium">
<div class="text-weight-medium"> {{
{{ props.row.examNumber !== null ? props.row.examNumber : "-"
props.row.examNumber !== null ? props.row.examNumber : "-" }}
}} </div>
</div> </template>
</template>
<template v-else-if="col.name === 'organizationName'"> <template v-else-if="col.name === 'organizationName'">
<div <div v-if="props.row.orgName !== null ||
v-if="
props.row.orgName !== null ||
props.row.positionPath !== null props.row.positionPath !== null
" ">
> <div class="col-4">
<div class="col-4"> <div class="text-weight-medium">
<div class="text-weight-medium"> {{
{{ props.row.orgName !== null ? props.row.orgName : "-"
props.row.orgName !== null ? props.row.orgName : "-" }}
}} {{
{{ props.row.organizationShortName !== null
props.row.organizationShortName !== null
? `(${props.row.organizationShortName})` ? `(${props.row.organizationShortName})`
: "" : ""
}} }}
</div> </div>
<div class="text-weight-light"> <div class="text-weight-light">
{{ {{
props.row.positionPath !== null props.row.positionPath !== null
? props.row.positionPath ? props.row.positionPath
: "-" : "-"
}} }}
{{ {{
props.row.positionNumber !== null props.row.positionNumber !== null
? `(${props.row.positionNumber})` ? `(${props.row.positionNumber})`
: "" : ""
}} }}
</div>
</div> </div>
</div> </div>
</div> <div v-else>
<div v-else> <div class="col-4">
<div class="col-4"> <div class="text-weight-medium">-</div>
<div class="text-weight-medium">-</div> </div>
</div> </div>
</div> </template>
</template> <template v-else-if="col.name === 'positionCandidate'">
<template v-else-if="col.name === 'positionCandidate'"> <div class="text-weight-medium" v-if="props.row.positionCandidate == null">
<div -
class="text-weight-medium" </div>
v-if="props.row.positionCandidate == null" <div class="text-weight-medium" v-else>
> {{ props.row.positionCandidate }}
- </div>
</div> </template>
<div class="text-weight-medium" v-else> <template v-else-if="col.name === 'reportingDate' && col.value !== '-'">
{{ props.row.positionCandidate }} <div class="text-weight-medium">
</div> {{ props.row.reportingDate }}
</template> </div>
<template </template>
v-else-if="col.name === 'reportingDate' && col.value !== '-'" <template v-else-if="col.name === 'bmaOfficer'">
> <div class="text-weight-medium">
<div class="text-weight-medium"> {{
{{ props.row.reportingDate }} props.row.bmaOfficer !== null ? props.row.bmaOfficer : "-"
</div> }}
</template> </div>
<template v-else-if="col.name === 'bmaOfficer'"> </template>
<div class="text-weight-medium"> <template v-else-if="col.name === 'draft'">
{{ <div class="text-weight-medium">
props.row.bmaOfficer !== null ? props.row.bmaOfficer : "-" {{ props.row.draft }}
}} </div>
</div> </template>
</template> <template v-else-if="col.name === 'statusName'">
<template v-else-if="col.name === 'draft'"> <div class="text-weight-medium">
<div class="text-weight-medium"> {{ props.row.statusName }}
{{ props.row.draft }} </div>
</div> </template>
</template> </q-td>
<template v-else-if="col.name === 'statusName'"> </q-tr>
<div class="text-weight-medium"> </template>
{{ props.row.statusName }} <template v-slot:pagination="scope">
</div> <q-pagination v-model="pagination.page" color="primary" :max="scope.pagesNumber" :max-pages="5" size="sm"
</template> boundary-links direction-links></q-pagination>
</q-td> </template>
</q-tr> </q-table>
</template> </q-card-section>
<template v-slot:pagination="scope">
<q-pagination
v-model="pagination.page"
color="primary"
:max="scope.pagesNumber"
:max-pages="5"
size="sm"
boundary-links
direction-links
></q-pagination>
</template>
</q-table>
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal"> <q-card-actions align="right" class="bg-white text-teal">
<q-btn <q-btn label="บันทึก" @click="savelist" :disable="checkSelected" color="public" />
flat
label="ยืนยันการส่งตัว"
@click="savelist"
:disable="checkSelected"
/>
</q-card-actions> </q-card-actions>
</q-card> </q-card>
</q-dialog> </q-dialog>

View file

@ -1,141 +1,171 @@
<template> <template>
<!-- <div class="toptitle text-dark col-12 row items-center">ดการบญช 2</div> --> <!-- <div class="toptitle text-dark col-12 row items-center">ดการบญช 2</div> -->
<q-card flat bordered class="col-12"> <q-card flat bordered class="col-12">
<q-layout <q-layout view="hHh Lpr lff" container class="shadow-2 rounded-borders page-relative" style="height: 82vh">
view="hHh Lpr lff"
container
class="shadow-2 rounded-borders page-relative"
style="height: 82vh"
>
<q-header class="bg-grey-1"> <q-header class="bg-grey-1">
<q-toolbar> <q-toolbar>
<div class="text-h6 text-weight-medium text-dark col-12 row items-center q-py-md"> <div class="text-h6 text-weight-medium text-dark col-12 row items-center q-py-md">
<q-btn <q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm"
icon="mdi-arrow-left" @click="router.go(-1)" />
unelevated นทกผลการทดลองปฏหนาทราชการของ นายสมค ยอดใจ
round
dense
flat
color="primary"
class="q-mr-sm"
@click="router.go(-1)"
/>
นทกผลการทดลองปฏหนาทราชการของ นายสมค ยอดใจ
</div> </div>
</q-toolbar> </q-toolbar>
<q-separator/> <q-separator />
</q-header> </q-header>
<q-drawer <q-drawer v-model="drawer" show-if-above :width="150" :breakpoint="500" class="bg-grey-1" bordered>
v-model="drawer" <q-scroll-area class="fit" :horizontal-thumb-style="{ opacity: 0 }">
show-if-above <q-list class="text-grey-7">
<q-item active-class="text-primary bg-teal-1 text-weight-medium" clickable class="q-py-sm" dense
:width="150"
:breakpoint="500"
class="bg-grey-1"
bordered
>
<q-scroll-area class="fit" :horizontal-thumb-style="{ opacity: 0 }">
<q-list class="text-grey-7">
<q-item
dense
active
class="q-py-sm"
active-class="text-primary bg-teal-1 text-weight-medium"
clickable
v-ripple> v-ripple>
<q-item-section avatar style="min-width: 40px"> <q-item-section avatar style="min-width: 40px">
<q-icon size="18px" name="mdi-file-edit" /> <q-icon size="18px" name="mdi-file" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
นทกผล แบบมอบหมายงาน
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item <q-item dense active class="q-py-sm" active-class="text-primary bg-teal-1 text-weight-medium"
active-class="text-primary bg-teal-1 text-weight-medium" clickable v-ripple>
clickable <q-item-section avatar style="min-width: 40px">
class="q-py-sm" <q-icon size="18px" name="mdi-file-edit" />
dense </q-item-section>
<q-item-section>
นทกผลการทดลองปฏหนาทราชการ
</q-item-section>
</q-item>
<q-item active-class="text-primary bg-teal-1 text-weight-medium" clickable class="q-py-sm" dense
v-ripple> v-ripple>
<q-item-section avatar style="min-width: 40px"> <q-item-section avatar style="min-width: 40px">
<q-icon size="18px" name="mdi-file-star" /> <q-icon size="18px" name="mdi-file-star" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
ประเมนผล ประเมนผลการทดลองปฏหนาทราชการ
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item <q-item active-class="text-primary bg-teal-1 text-weight-medium" clickable class="q-py-sm" dense
active-class="text-primary bg-teal-1 text-weight-medium"
clickable
class="q-py-sm"
dense
v-ripple> v-ripple>
<q-item-section avatar style="min-width: 40px"> <q-item-section avatar style="min-width: 40px">
<q-icon size="18px" name="mdi-file-chart" /> <q-icon size="18px" name="mdi-file-chart" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
รายการ รายงานการประเมนผลการทดลองปฏหนาทราชการ
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>
</q-scroll-area> </q-scroll-area>
</q-drawer> </q-drawer>
<q-page-container> <q-page-container>
<q-layout <q-layout view="hHh Lpr lff" container style="height: 72vh">
view="hHh Lpr lff"
container
style="height: 72vh"
>
<q-header class="bg-grey-1"> <q-header class="bg-grey-1">
<div class="bg-grey-1"> <div class="bg-grey-1">
<div class="col-12 row q-gutter-x-md items-center"> <div class="col-12 row q-gutter-x-md items-center">
<q-tabs dense v-model="tab" active-class="text-primary text-weight-medium" indicator-color="grey-1" class="text-grey-7"> <q-tabs dense v-model="tab" active-class="text-primary text-weight-medium"
<q-tab name="save1" label="บันทึกผลครั้งที่ 1" /> indicator-color="grey-1" class="text-grey-7">
<q-tab name="save2" label="บันทึกผลครั้งที่ 2" /> <q-tab name="save1" label="บันทึกผลครั้งที่ 1" />
<q-tab name="save3" label="บันทึกผลครั้งที่ 3" /> <q-btn size="12px" flat dense icon="mdi-download" :disable="tab !== 'save1'"
</q-tabs> :color="tab !== 'save1' ? 'grey' : 'add'">
<div> <q-tooltip>ดาวนโหลด</q-tooltip>
<q-btn color="blue" flat dense icon="mdi-plus"> <q-menu>
<q-tooltip> <q-list style="min-width: 150px">
เพมบนทกผลการทดลอง <q-item clickable v-close-popup>
</q-tooltip> <q-item-section avatar><q-icon color="red"
</q-btn> name="mdi-file-pdf" /></q-item-section>
</div> <q-item-section>ไฟล .PDF</q-item-section>
</div> </q-item>
<q-separator/> <q-item clickable v-close-popup>
<q-item-section avatar><q-icon color="blue"
name="mdi-file-word" /></q-item-section>
<q-item-section>ไฟล .docx</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
<q-tab name="save2" label="บันทึกผลครั้งที่ 2" />
<q-btn size="12px" flat dense icon="mdi-download" :disable="tab !== 'save2'"
:color="tab !== 'save2' ? 'grey' : 'add'">
<q-tooltip>ดาวนโหลด</q-tooltip>
<q-menu>
<q-list style="min-width: 150px">
<q-item clickable v-close-popup>
<q-item-section avatar><q-icon color="red"
name="mdi-file-pdf" /></q-item-section>
<q-item-section>ไฟล .PDF</q-item-section>
</q-item>
<q-item clickable v-close-popup>
<q-item-section avatar><q-icon color="blue"
name="mdi-file-word" /></q-item-section>
<q-item-section>ไฟล .docx</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
<!-- <q-tab name="save3" label="บันทึกผลครั้งที่ 3" />
<q-btn size="12px" flat dense icon="mdi-download" :disable="tab !== 'save3'"
:color="tab !== 'save3' ? 'grey' : 'add'">
<q-tooltip>ดาวนโหลด</q-tooltip>
<q-menu>
<q-list style="min-width: 150px">
<q-item clickable v-close-popup>
<q-item-section avatar><q-icon color="red"
name="mdi-file-pdf" /></q-item-section>
<q-item-section>ไฟล .PDF</q-item-section>
</q-item>
<q-item clickable v-close-popup>
<q-item-section avatar><q-icon color="blue"
name="mdi-file-word" /></q-item-section>
<q-item-section>ไฟล .docx</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn> -->
</q-tabs>
<div>
<q-btn color="blue" flat dense icon="mdi-plus">
<q-tooltip>
เพมบนทกผลการทดลอง
</q-tooltip>
</q-btn>
</div>
</div> </div>
</q-header> <q-separator />
<q-page-container> </div>
<div class="col-12 row"> </q-header>
<Form /> <q-page-container>
</div> <div class="col-12 row">
</q-page-container> <Form />
</q-layout> </div>
</q-page-container> </q-page-container>
</q-layout> </q-layout>
</q-page-container>
</q-layout>
</q-card> </q-card>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import { ref } from "vue"; import { ref } from "vue";
import Form from "@/modules/05_placement/components/probation/form.vue"; import Form from "@/modules/05_placement/components/probation/FormEvaluation.vue";
const router = useRouter(); const router = useRouter();
const drawer = ref<boolean>(true); const drawer = ref<boolean>(true);
const tab = ref('save1'); const tab = ref('save1');
</script> </script>
<style lang="scss" scope> <style lang="scss" scope>
.btn-absolute { .btn-absolute {
z-index: 50; z-index: 50;
position: absolute; position: absolute;
left: 200px; left: 200px;
top: 10px; top: 10px;
} }
.btnShadow { .btnShadow {
box-shadow: 0 1px 2px rgb(0 0 0 / 10%), 3px 3px 7px 1px rgba(95, 95, 95, 0.15) !important; box-shadow: 0 1px 2px rgb(0 0 0 / 10%), 3px 3px 7px 1px rgba(95, 95, 95, 0.15) !important;
} }
</style> </style>

View file

@ -61,110 +61,110 @@
<div class="row q-col-gutter-sm"> <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">
<div> <div>
<q-btn @click="router.push(`/probation/work/add`)" size="12px" flat round color="add" icon="mdi-plus"> <q-btn @click="router.push(`/probation/add`)" size="12px" flat round color="add" icon="mdi-plus">
<q-tooltip>เพมงานทไดบมอบหมาย</q-tooltip> <q-tooltip>เพมงานทไดบมอบหมาย</q-tooltip>
</q-btn> </q-btn>
</div> </div>
<q-space /> <q-space />
<q-input <q-input
class="col-xs-12 col-sm-3 col-md-2" class="col-xs-12 col-sm-3 col-md-2"
standout standout
dense dense
v-model="filterKeyword" v-model="filterKeyword"
ref="filterRef" ref="filterRef"
outlined outlined
debounce="300" debounce="300"
placeholder="ค้นหา" placeholder="ค้นหา"
> >
<template v-slot:append> <template v-slot:append>
<q-icon v-if="filterKeyword == ''" name="search" /> <q-icon v-if="filterKeyword == ''" name="search" />
<q-icon <q-icon
v-if="filterKeyword !== ''" v-if="filterKeyword !== ''"
name="clear" name="clear"
class="cursor-pointer" class="cursor-pointer"
@click="resetFilter" @click="resetFilter"
/> />
</template> </template>
</q-input> </q-input>
<q-select <q-select
v-model="visibleColumns" v-model="visibleColumns"
multiple multiple
outlined outlined
dense dense
options-dense options-dense
:display-value="$q.lang.table.columns" :display-value="$q.lang.table.columns"
emit-value emit-value
map-options map-options
:options="columns" :options="columns"
option-value="name" option-value="name"
options-cover options-cover
style="min-width: 150px" style="min-width: 150px"
class="col-xs-12 col-sm-3 col-md-2" class="col-xs-12 col-sm-3 col-md-2"
/> />
</div> </div>
<div class="col-12"> <div class="col-12">
<q-table <q-table
ref="table" ref="table"
:columns="columns" :columns="columns"
:rows="rows" :rows="rows"
:filter="filterKeyword" :filter="filterKeyword"
row-key="Order" row-key="Order"
flat flat
bordered bordered
:paging="true" :paging="true"
dense dense
class="custom-header-table" class="custom-header-table"
v-bind="attrs" v-bind="attrs"
:visible-columns="visibleColumns" :visible-columns="visibleColumns"
:pagination-label="paginationLabel" :pagination-label="paginationLabel"
v-model:pagination="pagination" v-model:pagination="pagination"
> >
<template v-slot:header="props"> <template v-slot:header="props">
<q-tr :props="props"> <q-tr :props="props">
<q-th v-for="col in props.cols" :key="col.name" :props="props"> <q-th v-for="col in props.cols" :key="col.name" :props="props">
<span class="text-weight-medium">{{ col.label }}</span> <span class="text-weight-medium">{{ col.label }}</span>
</q-th> </q-th>
<q-th auto-width /> <q-th auto-width />
</q-tr> </q-tr>
</template> </template>
<template v-slot:body="props"> <template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer" @click="router.push(`/probation/form`)"> <q-tr :props="props" class="cursor-pointer" @click="router.push(`/probation/form`)">
<q-td <q-td
v-for="col in props.cols" v-for="col in props.cols"
:key="col.name" :key="col.name"
:props="props" :props="props"
> >
<div v-if="col.name == 'no'"> <div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }} {{ props.rowIndex + 1 }}
</div> </div>
<div v-else> <div v-else>
{{ col.value }} {{ col.value }}
</div> </div>
</q-td> </q-td>
<q-td auto-width> <!-- <q-td auto-width>
<q-btn flat dense size="12px" round color="blue" icon="mdi-file-download-outline"> <q-btn flat dense size="12px" round color="blue" icon="mdi-file-download-outline">
<q-tooltip> ดาวนโหลด .Docx</q-tooltip> <q-tooltip> ดาวนโหลด .Docx</q-tooltip>
</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"
active-color="primary" active-color="primary"
color="dark" color="dark"
:max="scope.pagesNumber" :max="scope.pagesNumber"
:max-pages="5" :max-pages="5"
size="sm" size="sm"
boundary-links boundary-links
direction-links direction-links
></q-pagination> ></q-pagination>
</template> </template>
</q-table> </q-table>
</div> </div>
</div> </div>
</q-card> </q-card>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
@ -180,92 +180,92 @@ const institution = ref<string>('ฝ่ายบริหารงานทั
const status = ref<string>('อยู่ระหว่างการทดลองงาน') const status = ref<string>('อยู่ระหว่างการทดลองงาน')
const pagination = ref({ const pagination = ref({
sortBy: "desc", sortBy: "desc",
descending: false, descending: false,
page: 1, page: 1,
rowsPerPage: 10, rowsPerPage: 10,
}); });
const visibleColumns = ref<string[]>([ const visibleColumns = ref<string[]>([
"no", "no",
"startDate", "startDate",
"endDete", "endDete",
"intendant", "intendant",
"commander", "commander",
]); // ]); //
// //
const columns = ref<QTableProps["columns"]>([ const columns = ref<QTableProps["columns"]>([
{
name: "no",
align: "left",
label: "ลำดับ",
sortable: true,
field: "no",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "startDate",
align: "left",
label: "ตั้งแต่วันที่",
sortable: true,
field: "startDate",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{ {
name: "endDete", name: "no",
align: "left", align: "left",
label: "ถึงวันที่", label: "ลำดับ",
sortable: true, sortable: true,
field: "endDete", field: "no",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
}, },
{ {
name: "intendant", name: "startDate",
align: "left", align: "left",
label: "ผู้ดูแล", label: "ตั้งแต่วันที่",
sortable: true, sortable: true,
field: "intendant", field: "startDate",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
}, },
{ {
name: "commander", name: "endDete",
align: "left", align: "left",
label: "ผู้บังคับบัญชา", label: "ถึงวันที่",
sortable: true, sortable: true,
field: "commander", field: "endDete",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
} },
{
name: "intendant",
align: "left",
label: "ผู้ดูแล",
sortable: true,
field: "intendant",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "commander",
align: "left",
label: "ผู้บังคับบัญชา",
sortable: true,
field: "commander",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
}
]); ]);
// () // ()
const rows = ref<FormProbationDetail[]>([ const rows = ref<FormProbationDetail[]>([
{ {
no: "1", no: "1",
startDate: "09 ก.ย. 2566", startDate: "09 ก.ย. 2566",
endDete: "20 ต.ค. 2566", endDete: "20 ต.ค. 2566",
intendant: "นางสาวรัชภรณ์ ภักดี", intendant: "นางสาวรัชภรณ์ ภักดี",
commander: "นายนภัทร วันดี" commander: "นายนภัทร วันดี"
}, },
{ {
no: "2", no: "2",
startDate: "09 ก.ย. 2566", startDate: "25 ต.ค. 2566",
endDete: "20 ต.ค. 2566", endDete: "24 ม.ค. 2567",
intendant: "นางสาวทวิดา กมลเวชชี", intendant: "นางสาวทวิดา กมลเวชชี",
commander: "นางพิศ โพธิ์ดำ" commander: "นางพิศ โพธิ์ดำ"
},
{
no: "3",
startDate: "09 ก.ย. 2566",
endDete: "20 ต.ค. 2566",
intendant: "นางสาวทวิดา กมลเวชชี",
commander: "นายนภัทร วันดี"
}, },
// {
// no: "3",
// startDate: "09 .. 2566",
// endDete: "20 .. 2566",
// intendant: " ",
// commander: " "
// },
]); ]);
const clickAdd = () => { const clickAdd = () => {

View file

@ -20,17 +20,20 @@ const detailOrderReplace = () =>
import( import(
"@/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue" "@/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue"
); );
// ระบบทดลองงาน
const mainProbation = () => const mainProbation = () =>
import("@/modules/05_placement/components/probation/MainProbation.vue"); import("@/modules/05_placement/components/probation/MainProbation.vue");
const probationDetail = () => const probationDetail = () =>
import("@/modules/05_placement/components/probation/ProbationDetail.vue"); import("@/modules/05_placement/components/probation/ProbationDetail.vue");
const probationForm = () => const probationFormEvaluation = () =>
import("@/modules/05_placement/components/probation/MainDetail.vue"); import("@/modules/05_placement/components/probation/MainDetail.vue");
const probationWorkAdd = () => const probationWorkAdd = () =>
import("@/modules/05_placement/components/probation/MainDetail.vue"); import("@/modules/05_placement/components/probation/MainDetail.vue");
<<<<<<< HEAD
const probationWorkAdd2 = () => const probationWorkAdd2 = () =>
import("@/modules/05_placement/components/probation/AddWork.vue"); import("@/modules/05_placement/components/probation/AddWork.vue");
@ -43,117 +46,147 @@ export default [
Auth: true, Auth: true,
Key: [6.1], Key: [6.1],
Role: "placement", Role: "placement",
=======
const probationFormAssign = () =>
import("@/modules/05_placement/components/probation/FormAssign.vue");
const resignOrder = () =>
import("@/modules/05_placement/components/OrderPlacement/ResignOrder.vue");
export default [
{
path: "/placement",
name: "placement",
component: PlacementMain,
meta: {
Auth: true,
Key: [6.1],
Role: "placement",
},
>>>>>>> develop
}, },
}, {
{ path: "/placement/personal-list/:examId",
path: "/placement/personal-list/:examId", name: "placementDetail",
name: "placementDetail", component: PlacementDetail,
component: PlacementDetail, meta: {
meta: { Auth: true,
Auth: true, Key: [6.1],
Key: [6.1], Role: "placement",
Role: "placement", },
}, },
}, {
{ path: "/placement/personal-detail/:personalId",
path: "/placement/personal-detail/:personalId", name: "PlacementPersonalDetail",
name: "PlacementPersonalDetail", component: PlacementPersonalDetail,
component: PlacementPersonalDetail, meta: {
meta: { Auth: true,
Auth: true, Key: [6.1],
Key: [6.1], Role: "placement",
Role: "placement", },
}, },
}, {
{ path: "/placement/order",
path: "/placement/order", name: "Orderplacement",
name: "Orderplacement", component: MainOrderPlacement,
component: MainOrderPlacement, meta: {
meta: { Auth: true,
Auth: true, Key: [6.2],
Key: [6.2], Role: "placement",
Role: "placement", },
}, },
}, {
{ path: "/placement/order/detail",
path: "/placement/order/detail", name: "OrderplacementDetail",
name: "OrderplacementDetail", component: detailOrderReplace,
component: detailOrderReplace, meta: {
meta: { Auth: true,
Auth: true, Key: [6.2],
Key: [6.2], Role: "placement",
Role: "placement", },
}, },
}, {
{ path: "/placement/addOrderPlacement",
path: "/placement/addOrderPlacement", name: "addOrderPlacement",
name: "addOrderPlacement", component: addOrderPlacement,
component: addOrderPlacement, meta: {
meta: { Auth: true,
Auth: true, Key: [6.2],
Key: [6.2], Role: "placement",
Role: "placement", },
}, },
}, {
{ path: "/probation",
path: "/probation", name: "probation",
name: "probation", component: mainProbation,
component: mainProbation, meta: {
meta: { Auth: true,
Auth: true, Key: [6.3],
Key: [6.3], Role: "placement",
Role: "placement", },
}, },
}, {
{ path: "/probation/detail/:id",
path: "/probation/detail/:id", name: "probationDetail",
name: "probationDetail", component: probationDetail,
component: probationDetail, meta: {
meta: { Auth: true,
Auth: true, Key: [6.3],
Key: [6.3], Role: "placement",
Role: "placement", },
}, },
}, {
{ path: "/probation/form",
path: "/probation/form", name: "probationForm",
name: "probationForm", component: probationFormEvaluation,
component: probationForm, meta: {
meta: { Auth: true,
Auth: true, Key: [6.3],
Key: [6.3], Role: "placement",
Role: "placement", },
}, },
}, {
{ path: "/probation/work/add",
path: "/probation/work/add", name: "probationWorkAdd",
name: "probationWorkAdd", component: probationWorkAdd,
component: probationWorkAdd, meta: {
meta: { Auth: true,
Auth: true, Key: [6.3],
Key: [6.3], Role: "placement",
Role: "placement", },
}, },
}, {
{ path: "/probation/work/:id",
path: "/probation/work/:id", name: "probationWork",
name: "probationWork", component: probationWorkAdd,
component: probationWorkAdd, meta: {
meta: { Auth: true,
Auth: true, Key: [6.3],
Key: [6.3], Role: "placement",
Role: "placement", },
}, },
}, {
{ path: "/probation/add",
path: "/probation/add", name: "probationWorkAdd",
name: "probationWorkAdd", component: probationFormAssign,
component: probationWorkAdd2, meta: {
meta: { Auth: true,
Auth: true, Key: [6.3],
Key: [6.3], Role: "placement",
Role: "placement", },
}, },
<<<<<<< HEAD
}, },
]; ];
=======
{
path: "/placement/resign-order",
name: "ResignOrderplacement",
component: resignOrder,
meta: {
Auth: true,
Key: [6.2],
Role: "placement",
},
},
];
>>>>>>> develop