From eb9e512b5d6ea68d86f17ced5ef03469876132a9 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 12 Jul 2024 13:41:54 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=82?= =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B8=A3?= =?UTF-8?q?=E0=B8=AD=E0=B8=9A=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1?= =?UTF-8?q?=E0=B8=B4=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tab/Dialog/01_FormIndicator.vue | 34 +++++++++++-------- .../components/Tab/Dialog/DialogEvalute.vue | 10 +++--- src/modules/14_KPI/views/list.vue | 17 ++++------ src/modules/14_KPI/views/report.vue | 4 +-- 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue index f87409a14..3df493e30 100644 --- a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue +++ b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue @@ -75,14 +75,14 @@ const formDetail = reactive({ strategyId: "", strategyName: "", documentInfoEvidence: "", - startDate:null, - endDate:null + startDate: null, + endDate: null, }); /** Option รอบการประเมิน*/ const roundOp = ref([ - { id: "APR", name: "รอบเมษายน" }, - { id: "OCT", name: "รอบตุลาคม" }, + { id: "APR", name: "รอบที่ 1 เมษายน" }, + { id: "OCT", name: "รอบที่ 2 ตุลาคม" }, ]); function fetchListPlan() { @@ -125,8 +125,8 @@ function fetchListPlanByid(id: string) { formDetail.achievement5 = data.achievement5; formDetail.documentInfoEvidence = data.documentInfoEvidence; - formDetail.startDate = data.startDate - formDetail.endDate = data.endDate + formDetail.startDate = data.startDate; + formDetail.endDate = data.endDate; listCheckID.value = data.kpiPlanId; }) @@ -178,8 +178,8 @@ function fetchRoleByid(id: string) { formDetail.achievement4 = data.achievement4; formDetail.achievement5 = data.achievement5; formDetail.documentInfoEvidence = data.documentInfoEvidence; - formDetail.startDate = data.startDate - formDetail.endDate = data.endDate + formDetail.startDate = data.startDate; + formDetail.endDate = data.endDate; listCheckID.value = data.kpiRoleId; // clickList(data.kpiRoleId, true); @@ -240,8 +240,8 @@ function fetchspecialByid(id: string) { formDetail.formula = data.formula; formDetail.meaning = data.meaning; formDetail.documentInfoEvidence = data.documentInfoEvidence; - formDetail.startDate = data.startDate - formDetail.endDate = data.endDate + formDetail.startDate = data.startDate; + formDetail.endDate = data.endDate; }) .catch((err) => { messageError($q, err); @@ -326,8 +326,8 @@ function closeDialog() { formDetail.strategy = ""; formDetail.strategyId = ""; formDetail.documentInfoEvidence = ""; - formDetail.startDate = null - formDetail.endDate = null + formDetail.startDate = null; + formDetail.endDate = null; formFilter.isAll = false; formFilter.keyword = ""; @@ -574,7 +574,7 @@ const title = computed(() => { @click="clickList(item.id)" > -
+
{{ item.including }}
@@ -875,7 +875,9 @@ const title = computed(() => { outlined class="inputgreen" :model-value=" - formDetail.startDate ? date2Thai(formDetail.startDate) : null + formDetail.startDate + ? date2Thai(formDetail.startDate) + : null " :label="`${'ช่วงเวลาเริ่มต้น'}`" hide-bottom-space @@ -919,7 +921,9 @@ const title = computed(() => { outlined class="inputgreen" :model-value=" - formDetail.endDate ? date2Thai(formDetail.endDate) : null + formDetail.endDate + ? date2Thai(formDetail.endDate) + : null " :label="`${'ช่วงเวลาสิ้นสุด'}`" hide-bottom-space diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue index 7c5e8216a..39aa2e4d9 100644 --- a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue +++ b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue @@ -177,9 +177,9 @@ function fetchRoundOption() { id: e.id, name: e.durationKPI === "OCT" - ? "รอบตุลาคม" + ? "รอบที่ 2 ตุลาคม" : e.durationKPI === "APR" - ? "รอบเมษายน" + ? "รอบที่ 1 เมษายน" : "", isClosed: !e.isActive, })); @@ -271,10 +271,10 @@ function updateSelect() { search.value = ""; } -function getOrgOp(check: boolean,id:string) { +function getOrgOp(check: boolean, id: string) { if (check == false) { http - .get(config.API.Kpiorg+`/${id}`) + .get(config.API.Kpiorg + `/${id}`) .then((res) => { const data = res.data.result; evaluatorIdMainOp.value = data.caregiver.map((i: any) => ({ @@ -461,7 +461,7 @@ watch( color="primary" dense v-model="props.selected" - @click="getOrgOp(props.selected,props.row.id)" + @click="getOrgOp(props.selected, props.row.id)" /> ([]); const year = ref(new Date().getFullYear()); -const modalDialog = ref(false) +const modalDialog = ref(false); const round = ref(""); const roundOp = ref([]); @@ -106,9 +106,9 @@ function fetchRoundOption() { id: e.id, name: e.durationKPI === "OCT" - ? "รอบตุลาคม" + ? "รอบที่ 2 ตุลาคม" : e.durationKPI === "APR" - ? "รอบเมษายน" + ? "รอบที่ 1 เมษายน" : "", })); @@ -195,8 +195,8 @@ watch( } ); -function onDialog(){ - modalDialog.value = true +function onDialog() { + modalDialog.value = true; } onMounted(async () => { fetchRoundOption(); @@ -374,12 +374,9 @@ onMounted(async () => {
- - + -