updated format code & eslint rule
This commit is contained in:
parent
67c6810def
commit
8a31554f38
102 changed files with 6271 additions and 6164 deletions
|
|
@ -24,7 +24,15 @@ const knowledge = ref<any[]>([]);
|
|||
const commander = ref<any>("");
|
||||
const chairman = ref<any>("");
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai, dateToISO, hideLoader, messageError,dialogConfirm,showLoader ,success} = mixin;
|
||||
const {
|
||||
date2Thai,
|
||||
dateToISO,
|
||||
hideLoader,
|
||||
messageError,
|
||||
dialogConfirm,
|
||||
showLoader,
|
||||
success,
|
||||
} = mixin;
|
||||
const date_start = ref<Date>();
|
||||
const group = ref<any | null>(null);
|
||||
const group2 = ref<any | null>(null);
|
||||
|
|
@ -619,7 +627,7 @@ function filterFnChairman(val: string, update: any) {
|
|||
* pop up confirm
|
||||
* @param id personal id
|
||||
*/
|
||||
function saveEdit(id: string) {
|
||||
function saveEdit(id: string) {
|
||||
dialogConfirm($q, async () => await dataEdit(id));
|
||||
}
|
||||
|
||||
|
|
@ -627,39 +635,38 @@ function filterFnChairman(val: string, update: any) {
|
|||
* เช็คข้อมูลก่อนบันทึก
|
||||
* @param id personal id
|
||||
*/
|
||||
async function saveData(id: string) {
|
||||
async function saveData(id: string) {
|
||||
dialogConfirm($q, async () => await DataSave(id));
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* update edit
|
||||
* @param id personal id
|
||||
*/
|
||||
async function dataEdit(id: string) {
|
||||
async function dataEdit(id: string) {
|
||||
// await myForm.value.validate().then((result: boolean) => {
|
||||
// if (result) {
|
||||
showLoader();
|
||||
const data = putDataEdit(id);
|
||||
http
|
||||
.put(config.API.saveEditAssign(id), data)
|
||||
.then(() => {})
|
||||
.catch(() => {})
|
||||
.finally(async () => {
|
||||
editStatus.value = false;
|
||||
getAssign();
|
||||
hideLoader();
|
||||
});
|
||||
// } else {
|
||||
// dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ");
|
||||
// }
|
||||
showLoader();
|
||||
const data = putDataEdit(id);
|
||||
http
|
||||
.put(config.API.saveEditAssign(id), data)
|
||||
.then(() => {})
|
||||
.catch(() => {})
|
||||
.finally(async () => {
|
||||
editStatus.value = false;
|
||||
getAssign();
|
||||
hideLoader();
|
||||
});
|
||||
// } else {
|
||||
// dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ");
|
||||
// }
|
||||
// });
|
||||
}
|
||||
|
||||
/** ฟังชั่น อัพเดต ข้อมูลที่จะส่ง
|
||||
* @param id personal
|
||||
*/
|
||||
function putDataEdit(id: string) {
|
||||
function putDataEdit(id: string) {
|
||||
const GUID = profileId.value;
|
||||
const assign_job = activityArray.value.map((item, index) => {
|
||||
const activityDesc = activity_desc.value[index]?.trim();
|
||||
|
|
@ -811,7 +818,7 @@ function filterFnChairman(val: string, update: any) {
|
|||
/** ฟังชั่น สร้างข้อมูลที่จะส่ง
|
||||
* @param id personal
|
||||
*/
|
||||
function putData(id: string) {
|
||||
function putData(id: string) {
|
||||
const GUID = profileId.value;
|
||||
const assign_job = activityArray.value.map((item, index) => {
|
||||
const activityDesc = activity_desc.value[index]?.trim();
|
||||
|
|
@ -949,7 +956,7 @@ function filterFnChairman(val: string, update: any) {
|
|||
* บันทึก
|
||||
* @param id personal id
|
||||
*/
|
||||
async function DataSave(id: string) {
|
||||
async function DataSave(id: string) {
|
||||
const data = putData(id);
|
||||
await http
|
||||
.post(config.API.saveFinish(id), data)
|
||||
|
|
@ -969,7 +976,7 @@ function filterFnChairman(val: string, update: any) {
|
|||
* download file
|
||||
* @param type type file
|
||||
*/
|
||||
async function clickdownloadFile(type: string) {
|
||||
async function clickdownloadFile(type: string) {
|
||||
showLoader();
|
||||
await http
|
||||
.get(config.API.reportAssign(type, id.value), {
|
||||
|
|
@ -994,7 +1001,7 @@ function filterFnChairman(val: string, update: any) {
|
|||
* @param response ไฟล์
|
||||
* @param filename ชื่อไฟล์
|
||||
*/
|
||||
function downloadFile(response: any, filename: string) {
|
||||
function downloadFile(response: any, filename: string) {
|
||||
const link = document.createElement("a");
|
||||
var fileName = filename;
|
||||
link.href = window.URL.createObjectURL(new Blob([response.data]));
|
||||
|
|
@ -1005,7 +1012,7 @@ function filterFnChairman(val: string, update: any) {
|
|||
}
|
||||
|
||||
onMounted(async () => {
|
||||
await showLoader()
|
||||
await showLoader();
|
||||
await getUser();
|
||||
await getAssignNew(profileId.value);
|
||||
await getLaw(profileId.value);
|
||||
|
|
@ -1016,7 +1023,7 @@ onMounted(async () => {
|
|||
if (id.value !== undefined) {
|
||||
await getAssign();
|
||||
}
|
||||
await hideLoader()
|
||||
await hideLoader();
|
||||
});
|
||||
</script>
|
||||
<template>
|
||||
|
|
@ -1038,7 +1045,11 @@ onMounted(async () => {
|
|||
<div>แบบมอบหมายงาน ฯ</div>
|
||||
</div>
|
||||
</div>
|
||||
<q-form greedy @submit.prevent @validation-success="id !== undefined ? saveEdit(id) : saveData(profileId)">
|
||||
<q-form
|
||||
greedy
|
||||
@submit.prevent
|
||||
@validation-success="id !== undefined ? saveEdit(id) : saveData(profileId)"
|
||||
>
|
||||
<div
|
||||
:class="
|
||||
$q.screen.gt.xs
|
||||
|
|
@ -1090,25 +1101,14 @@ onMounted(async () => {
|
|||
</q-list>
|
||||
</q-menu>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
flat
|
||||
icon="edit"
|
||||
dense
|
||||
color="edit"
|
||||
round
|
||||
@click="edit"
|
||||
<q-btn flat icon="edit" dense color="edit" round @click="edit">
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip></q-btn
|
||||
>
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip></q-btn>
|
||||
</div>
|
||||
<div v-else>
|
||||
<q-btn
|
||||
flat
|
||||
icon="mdi-undo"
|
||||
dense
|
||||
color="red"
|
||||
round
|
||||
@click="cancel"
|
||||
><q-tooltip>ยกเลิก</q-tooltip></q-btn>
|
||||
<q-btn flat icon="mdi-undo" dense color="red" round @click="cancel"
|
||||
><q-tooltip>ยกเลิก</q-tooltip></q-btn
|
||||
>
|
||||
<q-btn
|
||||
flat
|
||||
icon="mdi-content-save-outline"
|
||||
|
|
@ -1116,7 +1116,8 @@ onMounted(async () => {
|
|||
color="public"
|
||||
round
|
||||
type="submit"
|
||||
><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn>
|
||||
><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -2810,7 +2811,11 @@ onMounted(async () => {
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="routeName == 'probationAdd'" class="full-width" align="right">
|
||||
<div
|
||||
v-if="routeName == 'probationAdd'"
|
||||
class="full-width"
|
||||
align="right"
|
||||
>
|
||||
<q-btn label="บันทึก" color="secondary" type="submit"
|
||||
><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
|
||||
>
|
||||
|
|
|
|||
|
|
@ -85,14 +85,12 @@ onMounted(async () => {
|
|||
</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
|
||||
<ResultPage
|
||||
:fullname="fullname"
|
||||
v-model:dataArrayNumber="dataArrayNumber"
|
||||
:fecthAssign="fecthAssign"
|
||||
:data="evaluate.find((x: any) => x.no === dataArrayNumber)"
|
||||
/>
|
||||
|
||||
<ResultPage
|
||||
:fullname="fullname"
|
||||
v-model:dataArrayNumber="dataArrayNumber"
|
||||
:fecthAssign="fecthAssign"
|
||||
:data="evaluate.find((x: any) => x.no === dataArrayNumber)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<script setup lang="ts">
|
||||
import { useQuasar } from "quasar";
|
||||
import { ref,defineAsyncComponent,onMounted } from "vue";
|
||||
import { ref, defineAsyncComponent, onMounted } from "vue";
|
||||
|
||||
import { useProbationStore } from "@/modules/11_probation/store/probation";
|
||||
import { useRoute, useRouter } from "vue-router";
|
||||
|
|
@ -9,12 +9,11 @@ import { useCounterMixin } from "@/stores/mixin";
|
|||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
|
||||
|
||||
const mixin = useCounterMixin();
|
||||
const { showLoader, hideLoader, messageError, dialogConfirm, success } = mixin;
|
||||
const Evaluacommander = defineAsyncComponent(
|
||||
() => import("@/modules/11_probation/component/editPage/02_evaluacommander.vue")
|
||||
() =>
|
||||
import("@/modules/11_probation/component/editPage/02_evaluacommander.vue")
|
||||
);
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
|
|
@ -28,16 +27,17 @@ const store = useProbationStore();
|
|||
const $q = useQuasar();
|
||||
const mode = ref<any>($q.screen.gt.xs);
|
||||
|
||||
|
||||
function addData() {
|
||||
router.push(`/probation/detail/addevaluacommander/${profileId.value}/${id.value}`);
|
||||
router.push(
|
||||
`/probation/detail/addevaluacommander/${profileId.value}/${id.value}`
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* get data
|
||||
* @param id person id
|
||||
* @param id person id
|
||||
*/
|
||||
async function fecthAssign(id: string){
|
||||
async function fecthAssign(id: string) {
|
||||
showLoader();
|
||||
await http
|
||||
.get(config.API.formevaluateCommander(id))
|
||||
|
|
@ -54,15 +54,14 @@ function addData() {
|
|||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
await fecthAssign(id.value);
|
||||
});
|
||||
|
||||
</script>
|
||||
<template>
|
||||
<div v-if="!$q.screen.gt.xs" class="col-xs-12 col-sm-12 col-md-11">
|
||||
<div v-if="!$q.screen.gt.xs" 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"
|
||||
|
|
@ -89,11 +88,7 @@ onMounted(async () => {
|
|||
</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
|
||||
<Evaluacommander
|
||||
|
||||
/>
|
||||
|
||||
<Evaluacommander />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -102,4 +97,4 @@ onMounted(async () => {
|
|||
background-color: #fff;
|
||||
border-radius: 10px;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<script setup lang="ts">
|
||||
import { useQuasar } from "quasar";
|
||||
import { ref,defineAsyncComponent } from "vue";
|
||||
import { ref, defineAsyncComponent } from "vue";
|
||||
|
||||
import { useProbationStore } from "@/modules/11_probation/store/probation";
|
||||
import { useRoute, useRouter } from "vue-router";
|
||||
|
|
@ -22,10 +22,9 @@ const mode = ref<any>($q.screen.gt.xs);
|
|||
function addData() {
|
||||
router.push(`/probation/detail/addevalua/${profileId.value}/${id.value}`);
|
||||
}
|
||||
|
||||
</script>
|
||||
<template>
|
||||
<div v-if="!$q.screen.gt.xs" class="col-xs-12 col-sm-12 col-md-11">
|
||||
<div v-if="!$q.screen.gt.xs" 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"
|
||||
|
|
@ -52,11 +51,7 @@ function addData() {
|
|||
</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
|
||||
<Evalua
|
||||
|
||||
/>
|
||||
|
||||
<Evalua />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -65,4 +60,4 @@ function addData() {
|
|||
background-color: #fff;
|
||||
border-radius: 10px;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<script setup lang="ts">
|
||||
import { useQuasar } from "quasar";
|
||||
import { ref,defineAsyncComponent } from "vue";
|
||||
import { ref, defineAsyncComponent } from "vue";
|
||||
import { useRoute, useRouter } from "vue-router";
|
||||
import { useProbationStore } from "@/modules/11_probation/store/probation";
|
||||
|
||||
|
|
@ -19,11 +19,13 @@ const $q = useQuasar();
|
|||
const mode = ref<any>($q.screen.gt.xs);
|
||||
|
||||
function addData() {
|
||||
router.push(`/probation/detail/addevaluascore/${profileId.value}/${id.value}`);
|
||||
router.push(
|
||||
`/probation/detail/addevaluascore/${profileId.value}/${id.value}`
|
||||
);
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<div v-if="!$q.screen.gt.xs" class="col-xs-12 col-sm-12 col-md-11">
|
||||
<div v-if="!$q.screen.gt.xs" 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"
|
||||
|
|
@ -50,10 +52,7 @@ function addData() {
|
|||
</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
|
||||
<Evaluascore
|
||||
/>
|
||||
|
||||
<Evaluascore />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -62,4 +61,4 @@ function addData() {
|
|||
background-color: #fff;
|
||||
border-radius: 10px;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -64,11 +64,10 @@ function onSubmit() {
|
|||
dialogConfirm($q, async () => await postData("post"));
|
||||
}
|
||||
|
||||
|
||||
/** post/put data
|
||||
* @param action post put
|
||||
*/
|
||||
async function postData(action: string) {
|
||||
async function postData(action: string) {
|
||||
const data = await {
|
||||
start_date: date_start.value,
|
||||
date_finish: date_finish.value,
|
||||
|
|
@ -170,7 +169,7 @@ async function fecthAssign(id: string) {
|
|||
showLoader();
|
||||
await http
|
||||
.get(config.API.evaluateReportcreate(id))
|
||||
.then(async(res) => {
|
||||
.then(async (res) => {
|
||||
assign.value = res.data.data.assign;
|
||||
person.value = res.data.data.person;
|
||||
mentors.value = res.data.data.mentors;
|
||||
|
|
@ -259,7 +258,7 @@ onMounted(async () => {
|
|||
<div>แบบรายงานการประเมิน ฯ</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div :class="`${$q.screen.gt.xs ? '' : 'mobileClass'}`">
|
||||
<div class="col-12">
|
||||
<span class="toptitle text-dark">แบบรายงานการประเมินฯ</span>
|
||||
|
|
@ -527,7 +526,9 @@ onMounted(async () => {
|
|||
lazy-rules
|
||||
label="ความเห็นของผู้มีอํานาจสั่งบรรจุตามมาตรา 52"
|
||||
:rules="[
|
||||
(val) => (!!val && val.length > 0) || 'กรุณาความเห็นของผู้มีอํานาจสั่งบรรจุตามมาตรา 52',
|
||||
(val) =>
|
||||
(!!val && val.length > 0) ||
|
||||
'กรุณาความเห็นของผู้มีอํานาจสั่งบรรจุตามมาตรา 52',
|
||||
]"
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -714,13 +715,12 @@ onMounted(async () => {
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-12" align="right" v-if="action == 'add'">
|
||||
<q-btn label="บันทึก" color="secondary" type="submit"
|
||||
><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
|
||||
>
|
||||
|
||||
</div>
|
||||
<div class="col-12" align="right" v-if="action == 'add'">
|
||||
<q-btn label="บันทึก" color="secondary" type="submit"
|
||||
><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
</q-form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ const route = useRoute();
|
|||
|
||||
const status = ref<boolean>(false);
|
||||
const mixin = useCounterMixin();
|
||||
const { showLoader, hideLoader, messageError, dialogConfirm,success } = mixin;
|
||||
const { showLoader, hideLoader, messageError, dialogConfirm, success } = mixin;
|
||||
const id = ref<string>(route.params.id as string);
|
||||
const $q = useQuasar();
|
||||
const mode = ref<any>($q.screen.gt.xs);
|
||||
|
|
@ -38,12 +38,12 @@ function onSubmit() {
|
|||
})
|
||||
.then((res) => {
|
||||
success($q, "บันทึกสำเร็จ");
|
||||
getData()
|
||||
}).catch((e)=>{
|
||||
messageError($q,e)
|
||||
}).finally(()=>{
|
||||
|
||||
getData();
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -228,7 +228,7 @@ onMounted(() => {
|
|||
<q-separator size="3px" color="grey-2" />
|
||||
</div>
|
||||
|
||||
<Criterion />
|
||||
<Criterion />
|
||||
|
||||
<div class="col-12" align="right">
|
||||
<q-btn label="บันทึก" color="secondary" type="submit" v-if="!status"
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@
|
|||
<div v-else class="col-12">
|
||||
<div class="row q-col-gutter-sm">
|
||||
<div class="col-12">
|
||||
<q-card bordered style="border-radius: 20px;">
|
||||
<q-card bordered style="border-radius: 20px">
|
||||
<div class="q-pa-sm text-center bg-blue-1">
|
||||
<span class="text-weight-medium">
|
||||
<i
|
||||
|
|
@ -141,7 +141,7 @@
|
|||
</div>
|
||||
<q-separator />
|
||||
<q-card-section class="q-pa-none">
|
||||
<q-list >
|
||||
<q-list>
|
||||
<q-item class="q-pa-none text-center">
|
||||
<q-item-section>
|
||||
<q-item-label>ต่ำกว่าความคาดหวังมาก</q-item-label>
|
||||
|
|
@ -156,26 +156,26 @@
|
|||
</q-card>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<q-card bordered style="border-radius: 20px;">
|
||||
<q-card bordered style="border-radius: 20px">
|
||||
<div class="q-pa-sm text-center bg-blue-1">
|
||||
<span class="text-weight-medium">
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-3"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-6"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
></span
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-3"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-6"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
></span
|
||||
>
|
||||
</div>
|
||||
<q-separator />
|
||||
<q-card-section class="q-pa-none">
|
||||
<q-list >
|
||||
<q-list>
|
||||
<q-item class="q-pa-none text-center">
|
||||
<q-item-section>
|
||||
<q-item-label>ต่ำกว่าความคาดหวังค่อนข้างมาก</q-item-label>
|
||||
|
|
@ -190,32 +190,32 @@
|
|||
</q-card>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<q-card bordered style="border-radius: 20px;">
|
||||
<q-card bordered style="border-radius: 20px">
|
||||
<div class="q-pa-sm text-center bg-blue-1">
|
||||
<span class="text-weight-medium">
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-3"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-6"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
></span
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-3"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-6"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
></span
|
||||
>
|
||||
</div>
|
||||
<q-separator />
|
||||
<q-card-section class="q-pa-none">
|
||||
<q-list >
|
||||
<q-list>
|
||||
<q-item class="q-pa-none text-center">
|
||||
<q-item-section>
|
||||
<q-item-label>เป็นไปตามความคาดหวัง</q-item-label>
|
||||
|
|
@ -230,38 +230,38 @@
|
|||
</q-card>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<q-card bordered style="border-radius: 20px;">
|
||||
<q-card bordered style="border-radius: 20px">
|
||||
<div class="q-pa-sm text-center bg-blue-1">
|
||||
<span class="text-weight-medium">
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-3"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-6"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue-9"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
></span
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-3"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-6"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue-9"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
></span
|
||||
>
|
||||
</div>
|
||||
<q-separator />
|
||||
<q-card-section class="q-pa-none">
|
||||
<q-list >
|
||||
<q-list>
|
||||
<q-item class="q-pa-none text-center">
|
||||
<q-item-section>
|
||||
<q-item-label>สูงว่าความคาดหวังค่อนข้างมาก</q-item-label>
|
||||
|
|
@ -276,44 +276,44 @@
|
|||
</q-card>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<q-card bordered style="border-radius: 20px;">
|
||||
<q-card bordered style="border-radius: 20px">
|
||||
<div class="q-pa-sm text-center bg-blue-1">
|
||||
<span class="text-weight-medium">
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-3"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-6"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue-9"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue-10"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
></span
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-3"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-light-blue-6"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue-9"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
>
|
||||
<i
|
||||
class="q-icon notranslate material-icons q-rating__icon q-rating__icon--active text-blue-10"
|
||||
aria-hidden="true"
|
||||
role="presentation"
|
||||
>grade</i
|
||||
></span
|
||||
>
|
||||
</div>
|
||||
<q-separator />
|
||||
<q-card-section class="q-pa-none">
|
||||
<q-list >
|
||||
<q-list>
|
||||
<q-item class="q-pa-none text-center">
|
||||
<q-item-section>
|
||||
<q-item-label>สูงกว่าความคาดหวังมาก</q-item-label>
|
||||
|
|
|
|||
|
|
@ -29,22 +29,22 @@ const props = defineProps({
|
|||
});
|
||||
|
||||
/** เรียกใช้ฟังชั่นจากหน้าหลัก */
|
||||
function downloadFile(type: string){
|
||||
function downloadFile(type: string) {
|
||||
props.FileDownload(type);
|
||||
};
|
||||
}
|
||||
|
||||
watch(tabHead, () => {
|
||||
props.changeTab(tabHead.value);
|
||||
});
|
||||
|
||||
/** ไปยัง step ต่อไป */
|
||||
function nextPage(){
|
||||
function nextPage() {
|
||||
if (props.loop !== undefined) {
|
||||
if (props.loop < 3) {
|
||||
props.addData();
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
|
|||
|
|
@ -2052,7 +2052,10 @@ onMounted(async () => {
|
|||
</q-item>
|
||||
</q-list>
|
||||
<q-separator class="q-my-xs" />
|
||||
<q-list dense :class="[getBordered(alerts[11].value), 'item-custom']">
|
||||
<q-list
|
||||
dense
|
||||
:class="[getBordered(alerts[11].value), 'item-custom']"
|
||||
>
|
||||
<q-item dense>
|
||||
<q-item-section>
|
||||
<q-item-label>2. การเรียนรู้ด้วยตนเอง</q-item-label>
|
||||
|
|
@ -2088,7 +2091,10 @@ onMounted(async () => {
|
|||
</q-item>
|
||||
</q-list>
|
||||
<q-separator class="q-my-xs" />
|
||||
<q-list dense :class="[getBordered(alerts[11].value), 'item-custom']">
|
||||
<q-list
|
||||
dense
|
||||
:class="[getBordered(alerts[11].value), 'item-custom']"
|
||||
>
|
||||
<q-item dense>
|
||||
<q-item-section>
|
||||
<q-item-label>3. การอบรมสัมนาร่วมกัน</q-item-label>
|
||||
|
|
|
|||
|
|
@ -1465,7 +1465,7 @@ onMounted(async () => {
|
|||
</div>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
|
||||
|
||||
<q-separator class="q-my-xs" />
|
||||
<q-item
|
||||
dense
|
||||
|
|
@ -1552,9 +1552,7 @@ onMounted(async () => {
|
|||
</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
<div v-else class="">
|
||||
|
||||
</div>
|
||||
<div v-else class=""></div>
|
||||
<q-list dense>
|
||||
<q-item
|
||||
dense
|
||||
|
|
@ -1584,7 +1582,7 @@ onMounted(async () => {
|
|||
</div>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
|
||||
|
||||
<q-separator class="q-my-xs" />
|
||||
<q-item
|
||||
dense
|
||||
|
|
@ -1711,7 +1709,7 @@ onMounted(async () => {
|
|||
</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
hide-bottom-space
|
||||
hide-bottom-space
|
||||
outlined
|
||||
dense
|
||||
class="full-width datepicker col-3"
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
<template>
|
||||
03
|
||||
</template>
|
||||
<template>03</template>
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
<template>
|
||||
04
|
||||
</template>
|
||||
<template>04</template>
|
||||
|
|
|
|||
|
|
@ -614,7 +614,8 @@ onMounted(async () => {
|
|||
<div class="row text-weight-medium">
|
||||
<div class="col-12 text-grey-7 text-bold">
|
||||
<q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
|
||||
ผู้ทดลองปฏิบัติหน้าที่ราชการ {{ store.person.name ? store.person.name : "-" }}
|
||||
ผู้ทดลองปฏิบัติหน้าที่ราชการ
|
||||
{{ store.person.name ? store.person.name : "-" }}
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<span class="text-grey-7 text-weight-bold q-pl-lg"
|
||||
|
|
@ -624,7 +625,9 @@ onMounted(async () => {
|
|||
</div>
|
||||
<div class="col-12">
|
||||
<span class="text-grey-7 text-weight-bold q-pl-lg">ระดับตำแหน่ง</span>
|
||||
{{ store.person.positionLevelName ? store.person.positionLevelName : "-" }}
|
||||
{{
|
||||
store.person.positionLevelName ? store.person.positionLevelName : "-"
|
||||
}}
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<span class="text-grey-7 text-weight-bold q-pl-lg">สังกัด</span>
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
<template>
|
||||
02
|
||||
</template>
|
||||
<template>02</template>
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
<template>
|
||||
03
|
||||
</template>
|
||||
<template>03</template>
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
<template>
|
||||
04
|
||||
</template>
|
||||
<template>04</template>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
interface ListMain {
|
||||
id: string
|
||||
id: string;
|
||||
round_no: number;
|
||||
date_start: string
|
||||
date_finish: string
|
||||
mentors: string
|
||||
commander: string
|
||||
chairman: string
|
||||
date_start: string;
|
||||
date_finish: string;
|
||||
mentors: string;
|
||||
commander: string;
|
||||
chairman: string;
|
||||
}
|
||||
|
||||
export type {
|
||||
ListMain
|
||||
}
|
||||
export type { ListMain };
|
||||
|
|
|
|||
|
|
@ -2,11 +2,9 @@
|
|||
import { useRouter } from "vue-router";
|
||||
|
||||
/** component */
|
||||
import Assign from '@/modules/11_probation/component/01_Assign.vue'
|
||||
|
||||
import Assign from "@/modules/11_probation/component/01_Assign.vue";
|
||||
|
||||
const router = useRouter();
|
||||
|
||||
</script>
|
||||
<template>
|
||||
<div class="col-xs-12 col-sm-12 col-md-11">
|
||||
|
|
@ -24,10 +22,9 @@ const router = useRouter();
|
|||
<div>เพิ่มแบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ</div>
|
||||
</div>
|
||||
</div>
|
||||
<q-card class="q-pa-md">
|
||||
<Assign/>
|
||||
</q-card>
|
||||
|
||||
<q-card class="q-pa-md">
|
||||
<Assign />
|
||||
</q-card>
|
||||
</template>
|
||||
<style scoped>
|
||||
.mobileClass {
|
||||
|
|
@ -35,7 +32,4 @@ const router = useRouter();
|
|||
border-radius: 10px;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<script setup lang="ts">
|
||||
import { ref,onMounted } from "vue";
|
||||
import { ref, onMounted } from "vue";
|
||||
import { useRoute, useRouter } from "vue-router";
|
||||
import { useProbationStore } from "@/modules/11_probation/store/probation";
|
||||
|
||||
|
|
@ -12,15 +12,14 @@ import EvaluateResult from "@/modules/11_probation/component/06_EvaluateResult.v
|
|||
import EvaluateReport from "@/modules/11_probation/component/07_EvaluateReport.vue";
|
||||
import SurveyComment from "@/modules/11_probation/component/08_SurveyComment.vue";
|
||||
|
||||
|
||||
const drawer = ref<boolean>(true);
|
||||
const activeTab = ref<string>("tab1");
|
||||
const store = useProbationStore();
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
|
||||
const id = ref<string>(route.params.id as string)
|
||||
const profileId = ref<string>(route.params.profileId as string)
|
||||
const id = ref<string>(route.params.id as string);
|
||||
const profileId = ref<string>(route.params.profileId as string);
|
||||
|
||||
/**
|
||||
* เปลี่ยน tab เมนู
|
||||
|
|
@ -36,10 +35,10 @@ function onMobile(type: string) {
|
|||
}
|
||||
|
||||
/** ปุ่มกลับ */
|
||||
function clickBack(){
|
||||
function clickBack() {
|
||||
router.push(`/probation`);
|
||||
store.mainTab = "tab1";
|
||||
};
|
||||
}
|
||||
|
||||
/** เมื่อเริ่มโหลดหน้า ให้ tab เป็น tab1 */
|
||||
onMounted(() => {
|
||||
|
|
@ -64,7 +63,7 @@ onMounted(() => {
|
|||
<div>การทดลองปฏิบัติหน้าที่ราชการ</div>
|
||||
</div>
|
||||
</div>
|
||||
<q-card bordered :class='!$q.screen.gt.xs ? `borderRadius`:``'>
|
||||
<q-card bordered :class="!$q.screen.gt.xs ? `borderRadius` : ``">
|
||||
<q-layout
|
||||
v-if="$q.screen.gt.xs"
|
||||
view="hHh Lpr lff"
|
||||
|
|
@ -226,13 +225,17 @@ onMounted(() => {
|
|||
<q-tab-panel name="tab8">
|
||||
<SurveyComment />
|
||||
</q-tab-panel>
|
||||
|
||||
</q-tab-panels>
|
||||
</q-layout>
|
||||
</q-page-container>
|
||||
</q-layout>
|
||||
<q-list v-else separator>
|
||||
<q-item clickable v-ripple @click="onMobile('assign-work')" style="border-radius: 20px 20px 0 0;">
|
||||
<q-item
|
||||
clickable
|
||||
v-ripple
|
||||
@click="onMobile('assign-work')"
|
||||
style="border-radius: 20px 20px 0 0"
|
||||
>
|
||||
<q-item-section>แบบมอบหมายงาน ฯ</q-item-section>
|
||||
<q-item-section avatar>
|
||||
<q-avatar text-color="info" icon="mdi-chevron-right" />
|
||||
|
|
@ -286,7 +289,12 @@ onMounted(() => {
|
|||
<q-avatar text-color="info" icon="mdi-chevron-right" />
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
<q-item clickable v-ripple @click="onMobile('survey-comment')" style="border-radius: 0 0 20px 20px;">
|
||||
<q-item
|
||||
clickable
|
||||
v-ripple
|
||||
@click="onMobile('survey-comment')"
|
||||
style="border-radius: 0 0 20px 20px"
|
||||
>
|
||||
<q-item-section>แบบสํารวจความคิดเห็น</q-item-section>
|
||||
<q-item-section avatar>
|
||||
<q-avatar text-color="info" icon="mdi-chevron-right" />
|
||||
|
|
@ -301,9 +309,7 @@ onMounted(() => {
|
|||
padding-left: 20px;
|
||||
}
|
||||
|
||||
.borderRadius{
|
||||
border-radius: 20px!important;
|
||||
.borderRadius {
|
||||
border-radius: 20px !important;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,23 +1,37 @@
|
|||
// registry
|
||||
const probationPage = () => import("@/modules/11_probation/views/main.vue");
|
||||
const probationDetail = () => import("@/modules/11_probation/views/mainDetail.vue");
|
||||
const probationDetail = () =>
|
||||
import("@/modules/11_probation/views/mainDetail.vue");
|
||||
|
||||
const probationAdd = () => import("@/modules/11_probation/pages/addPage.vue");
|
||||
const probationDetailPage = () => import("@/modules/11_probation/pages/detailPage.vue");
|
||||
const probationDetailPage = () =>
|
||||
import("@/modules/11_probation/pages/detailPage.vue");
|
||||
|
||||
const probationAssign = () => import('@/modules/11_probation/component/01_Assign.vue')
|
||||
const probationRecordCareker = () => import('@/modules/11_probation/component/02_RecordCareker.vue')
|
||||
const probationRecordCommander = () => import('@/modules/11_probation/component/03_RecordCommander.vue')
|
||||
const probationEvaluateCommander = () => import('@/modules/11_probation/component/04_EvaluateCommander.vue')
|
||||
const probationEvaluateChairman = () => import('@/modules/11_probation/component/05_EvaluateChairman.vue')
|
||||
const probationEvaluateResult = () => import('@/modules/11_probation/component/06_EvaluateResult.vue')
|
||||
const probationEvaluateReport = () => import('@/modules/11_probation/component/07_EvaluateReport.vue')
|
||||
const probationSurveyComment = () => import('@/modules/11_probation/component/08_SurveyComment.vue')
|
||||
const probationAssign = () =>
|
||||
import("@/modules/11_probation/component/01_Assign.vue");
|
||||
const probationRecordCareker = () =>
|
||||
import("@/modules/11_probation/component/02_RecordCareker.vue");
|
||||
const probationRecordCommander = () =>
|
||||
import("@/modules/11_probation/component/03_RecordCommander.vue");
|
||||
const probationEvaluateCommander = () =>
|
||||
import("@/modules/11_probation/component/04_EvaluateCommander.vue");
|
||||
const probationEvaluateChairman = () =>
|
||||
import("@/modules/11_probation/component/05_EvaluateChairman.vue");
|
||||
const probationEvaluateResult = () =>
|
||||
import("@/modules/11_probation/component/06_EvaluateResult.vue");
|
||||
const probationEvaluateReport = () =>
|
||||
import("@/modules/11_probation/component/07_EvaluateReport.vue");
|
||||
const probationSurveyComment = () =>
|
||||
import("@/modules/11_probation/component/08_SurveyComment.vue");
|
||||
|
||||
const probationAddresult = () => import('@/modules/11_probation/component/addPage/01_addresult.vue')
|
||||
const probationAddevaluacommander = () => import('@/modules/11_probation/component/addPage/02_addevaluacommander.vue')
|
||||
const probationAddevalua = () => import('@/modules/11_probation/component/addPage/03_addevalua.vue')
|
||||
const probationAddevaluascore = () => import('@/modules/11_probation/component/addPage/04_addevaluascore.vue')
|
||||
const probationAddresult = () =>
|
||||
import("@/modules/11_probation/component/addPage/01_addresult.vue");
|
||||
const probationAddevaluacommander = () =>
|
||||
import("@/modules/11_probation/component/addPage/02_addevaluacommander.vue");
|
||||
const probationAddevalua = () =>
|
||||
import("@/modules/11_probation/component/addPage/03_addevalua.vue");
|
||||
const probationAddevaluascore = () =>
|
||||
import("@/modules/11_probation/component/addPage/04_addevaluascore.vue");
|
||||
|
||||
export default [
|
||||
{
|
||||
|
|
@ -65,7 +79,7 @@ export default [
|
|||
Key: [11],
|
||||
},
|
||||
},
|
||||
//////////////////////////////////////////////////
|
||||
//////////////////////////////////////////////////
|
||||
{
|
||||
path: "/probation/record-careker/:profileId/:id",
|
||||
name: "probationRecordCareker",
|
||||
|
|
@ -129,42 +143,42 @@ export default [
|
|||
Key: [11],
|
||||
},
|
||||
},
|
||||
/////////////////////////////////////////////////
|
||||
/////////////////////////////////////////////////
|
||||
|
||||
{
|
||||
path: "/probation/detail/addresult/:profileId/:id",
|
||||
name: "probationAddresult",
|
||||
component: probationAddresult,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [11],
|
||||
{
|
||||
path: "/probation/detail/addresult/:profileId/:id",
|
||||
name: "probationAddresult",
|
||||
component: probationAddresult,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [11],
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/probation/detail/addevaluacommander/:profileId/:id",
|
||||
name: "probationAddevaluacommander",
|
||||
component: probationAddevaluacommander,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [11],
|
||||
{
|
||||
path: "/probation/detail/addevaluacommander/:profileId/:id",
|
||||
name: "probationAddevaluacommander",
|
||||
component: probationAddevaluacommander,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [11],
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/probation/detail/addevalua/:profileId/:id",
|
||||
name: "probationAddevalua",
|
||||
component: probationAddevalua,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [11],
|
||||
{
|
||||
path: "/probation/detail/addevalua/:profileId/:id",
|
||||
name: "probationAddevalua",
|
||||
component: probationAddevalua,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [11],
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/probation/detail/addevaluascore/:profileId/:id",
|
||||
name: "probationAddevaluascore",
|
||||
component: probationAddevaluascore,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [11],
|
||||
{
|
||||
path: "/probation/detail/addevaluascore/:profileId/:id",
|
||||
name: "probationAddevaluascore",
|
||||
component: probationAddevaluascore,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [11],
|
||||
},
|
||||
},
|
||||
},
|
||||
];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue