update process probation

This commit is contained in:
Warunee Tamkoo 2023-07-24 09:28:49 +07:00
parent 1b4465bf36
commit 17e4dba176
5 changed files with 427 additions and 395 deletions

View file

@ -1,141 +1,171 @@
<template>
<!-- <div class="toptitle text-dark col-12 row items-center">ดการบญช 2</div> -->
<q-card flat bordered class="col-12">
<q-layout
view="hHh Lpr lff"
container
class="shadow-2 rounded-borders page-relative"
style="height: 82vh"
>
<q-card flat bordered class="col-12">
<q-layout view="hHh Lpr lff" container class="shadow-2 rounded-borders page-relative" style="height: 82vh">
<q-header class="bg-grey-1">
<q-toolbar>
<div class="text-h6 text-weight-medium text-dark col-12 row items-center q-py-md">
<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="router.go(-1)" />
นทกผลการทดลองปฏหนาทราชการของ นายสมค ยอดใจ
</div>
</q-toolbar>
<q-separator/>
<q-separator />
</q-header>
<q-drawer
v-model="drawer"
show-if-above
: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
<q-drawer v-model="drawer" show-if-above :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 active-class="text-primary bg-teal-1 text-weight-medium" clickable class="q-py-sm" dense
v-ripple>
<q-item-section avatar style="min-width: 40px">
<q-icon size="18px" name="mdi-file-edit" />
</q-item-section>
<q-item-section avatar style="min-width: 40px">
<q-icon size="18px" name="mdi-file" />
</q-item-section>
<q-item-section>
นทกผล
</q-item-section>
</q-item>
<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
<q-item dense active class="q-py-sm" active-class="text-primary bg-teal-1 text-weight-medium"
clickable v-ripple>
<q-item-section avatar style="min-width: 40px">
<q-icon size="18px" name="mdi-file-edit" />
</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>
<q-item-section avatar style="min-width: 40px">
<q-icon size="18px" name="mdi-file-star" />
</q-item-section>
<q-item-section avatar style="min-width: 40px">
<q-icon size="18px" name="mdi-file-star" />
</q-item-section>
<q-item-section>
ประเมนผล
</q-item-section>
</q-item>
<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
<q-item active-class="text-primary bg-teal-1 text-weight-medium" clickable class="q-py-sm" dense
v-ripple>
<q-item-section avatar style="min-width: 40px">
<q-icon size="18px" name="mdi-file-chart" />
</q-item-section>
<q-item-section avatar style="min-width: 40px">
<q-icon size="18px" name="mdi-file-chart" />
</q-item-section>
<q-item-section>
รายการ
</q-item-section>
</q-item>
</q-list>
</q-scroll-area>
</q-drawer>
<q-page-container>
<q-layout
view="hHh Lpr lff"
container
style="height: 72vh"
>
<q-item-section>
รายงานการประเมนผลการทดลองปฏหนาทราชการ
</q-item-section>
</q-item>
</q-list>
</q-scroll-area>
</q-drawer>
<q-page-container>
<q-layout view="hHh Lpr lff" container style="height: 72vh">
<q-header class="bg-grey-1">
<div class="bg-grey-1">
<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-tab name="save1" label="บันทึกผลครั้งที่ 1" />
<q-tab name="save2" label="บันทึกผลครั้งที่ 2" />
<q-tab name="save3" label="บันทึกผลครั้งที่ 3" />
</q-tabs>
<div>
<q-btn color="blue" flat dense icon="mdi-plus">
<q-tooltip>
เพมบนทกผลการทดลอง
</q-tooltip>
</q-btn>
</div>
</div>
<q-separator/>
<div class="bg-grey-1">
<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-tab name="save1" label="บันทึกผลครั้งที่ 1" />
<q-btn size="12px" flat dense icon="mdi-download" :disable="tab !== 'save1'"
:color="tab !== 'save1' ? '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="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>
</q-header>
<q-page-container>
<div class="col-12 row">
<Form />
</div>
</q-page-container>
</q-layout>
</q-page-container>
</q-layout>
<q-separator />
</div>
</q-header>
<q-page-container>
<div class="col-12 row">
<Form />
</div>
</q-page-container>
</q-layout>
</q-page-container>
</q-layout>
</q-card>
</template>
<script setup lang="ts">
import { useRouter } from "vue-router";
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 drawer = ref<boolean>(true);
const tab = ref('save1');
const tab = ref('save1');
</script>
<style lang="scss" scope>
.btn-absolute {
z-index: 50;
position: absolute;
left: 200px;
top: 10px;
z-index: 50;
position: absolute;
left: 200px;
top: 10px;
}
.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>

View file

@ -61,110 +61,110 @@
<div class="row q-col-gutter-sm">
<div class="row col-12 q-col-gutter-sm">
<div>
<q-btn @click="router.push(`/probation/work/add`)" 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-btn @click="router.push(`/probation/add`)" 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="visibleColumns"
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="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<div class="col-12">
<q-table
ref="table"
:columns="columns"
:rows="rows"
:filter="filterKeyword"
row-key="Order"
flat
bordered
:paging="true"
dense
class="custom-header-table"
v-bind="attrs"
:visible-columns="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">
<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" @click="router.push(`/probation/form`)">
<q-td
v-for="col in props.cols"
:key="col.name"
:props="props"
>
<div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</div>
<div v-else>
{{ col.value }}
</div>
</q-td>
<q-td auto-width>
<q-select
v-model="visibleColumns"
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="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<div class="col-12">
<q-table
ref="table"
:columns="columns"
:rows="rows"
:filter="filterKeyword"
row-key="Order"
flat
bordered
:paging="true"
dense
class="custom-header-table"
v-bind="attrs"
:visible-columns="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">
<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" @click="router.push(`/probation/form`)">
<q-td
v-for="col in props.cols"
:key="col.name"
:props="props"
>
<div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</div>
<div v-else>
{{ col.value }}
</div>
</q-td>
<!-- <q-td auto-width>
<q-btn flat dense size="12px" round color="blue" icon="mdi-file-download-outline">
<q-tooltip> ดาวนโหลด .Docx</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>
</q-table>
</div>
</div>
</q-card>
</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>
</q-table>
</div>
</div>
</q-card>
</template>
<script setup lang="ts">
import { useRouter } from "vue-router";
@ -180,92 +180,92 @@ const institution = ref<string>('ฝ่ายบริหารงานทั
const status = ref<string>('อยู่ระหว่างการทดลองงาน')
const pagination = ref({
sortBy: "desc",
descending: false,
page: 1,
rowsPerPage: 10,
sortBy: "desc",
descending: false,
page: 1,
rowsPerPage: 10,
});
const visibleColumns = ref<string[]>([
"no",
"startDate",
"no",
"startDate",
"endDete",
"intendant",
"commander",
"intendant",
"commander",
]); //
//
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",
align: "left",
label: "ถึงวันที่",
sortable: true,
field: "endDete",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
name: "no",
align: "left",
label: "ลำดับ",
sortable: true,
field: "no",
headerStyle: "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: "startDate",
align: "left",
label: "ตั้งแต่วันที่",
sortable: true,
field: "startDate",
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",
}
name: "endDete",
align: "left",
label: "ถึงวันที่",
sortable: true,
field: "endDete",
headerStyle: "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[]>([
{
{
no: "1",
startDate: "09 ก.ย. 2566",
endDete: "20 ต.ค. 2566",
intendant: "นางสาวรัชภรณ์ ภักดี",
commander: "นายนภัทร วันดี"
intendant: "นางสาวรัชภรณ์ ภักดี",
commander: "นายนภัทร วันดี"
},
{
no: "2",
startDate: "09 ก.ย. 2566",
endDete: "20 ต.ค. 2566",
intendant: "นางสาวทวิดา กมลเวชชี",
commander: "นางพิศ โพธิ์ดำ"
},
{
no: "3",
startDate: "09 ก.ย. 2566",
endDete: "20 ต.ค. 2566",
intendant: "นางสาวทวิดา กมลเวชชี",
commander: "นายนภัทร วันดี"
startDate: "25 ต.ค. 2566",
endDete: "24 ม.ค. 2567",
intendant: "นางสาวทวิดา กมลเวชชี",
commander: "นางพิศ โพธิ์ดำ"
},
// {
// no: "3",
// startDate: "09 .. 2566",
// endDete: "20 .. 2566",
// intendant: " ",
// commander: " "
// },
]);
const clickAdd = () => {

View file

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