From 9a37db52197949f2d3d1b54a3275c6998cdfbec4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 15 Sep 2023 11:50:43 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97?= =?UTF-8?q?=E0=B8=B6=E0=B8=81=E0=B8=9C=E0=B8=A5=E0=B8=9C=E0=B8=B9=E0=B9=89?= =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=8D=E0=B8=8A=E0=B8=B2=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/05_placement/api.probation.ts | 5 +- .../FormEvaluation/FormSaveResult.vue | 5 +- .../FormSaveResultAddCommander.vue | 1453 +++++++++++++++++ .../FormEvaluation/FormSaveResultCommader.vue | 1407 ++++++++++++++++ .../FormEvaluation/Template1Commader.vue | 175 ++ .../components/probation/MainDetail.vue | 35 +- src/modules/05_placement/router.ts | 11 + src/modules/05_placement/storeProbation.ts | 4 +- .../components/report/Report_01.vue | 4 +- 9 files changed, 3090 insertions(+), 9 deletions(-) create mode 100644 src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue create mode 100644 src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue create mode 100644 src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue diff --git a/src/api/05_placement/api.probation.ts b/src/api/05_placement/api.probation.ts index 2692651c3..8972bc6f3 100644 --- a/src/api/05_placement/api.probation.ts +++ b/src/api/05_placement/api.probation.ts @@ -42,7 +42,10 @@ export default { formevaluateRecord: (id: string) => `${evaluate}/evaluate-record/create?assign_id=${id}`, createformevaluate: (id: string) => `${evaluate}/evaluate-record?assign_id=${id}`, editFormEvaluate: (id: string, evaluate_id: string) => `${evaluate}/evaluate-record?assign_id=${id}&evaluate_id=${evaluate_id}`, - + // บันทึกผล (ผู้บังคับบัญชา) + formevaluateCommander: (id: string) => `${evaluate}/evaluate-record/commander?assign_id=${id}`, + formevaluateRecordCommander: (id: string) => `${evaluate}/evaluate-record/create/commander?assign_id=${id}`, + editEvaluateCommander: (id: string, evaluate_id: string) => `${evaluate}/evaluate-record/commander?assign_id=${id}&evaluate_id=${evaluate_id}`, //แบบประเมินผล (ผู้บังคับบัญชา) evaluateCreate: (id: string) => `${evaluate}/evaluate/create?assign_id=${id}`, evaluatecommader: (id: string, no: string) => `${evaluate}/evaluate?assign_id=${id}&evaluate_no=${no}`, diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue index ee88caea5..1d12ce364 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue @@ -9,7 +9,7 @@ import { useRouter, useRoute } from "vue-router"; import http from "@/plugins/http"; import config from "@/app.config"; -import criterion from "@/modules/05_placement/components/Other/Criterion.vue" +import criterion from "@/modules/05_placement/components/Other/Criterion.vue"; const router = useRouter(); const routeName = router.currentRoute.value.name; @@ -382,7 +382,7 @@ const editData = async (data: any) => {