From dd18e2d518909984826017c87cbca5b7d89ebb8a Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 16 Dec 2024 10:02:56 +0700 Subject: [PATCH 1/5] fix ==> evaluate --- .../components/Detail/step/step5.vue | 11 ++++------- .../components/Detail/viewTab2/DialogDirector.vue | 3 ++- .../components/Detail/viewTab2/DialogMeet.vue | 3 ++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue index f64d86eff..f2ea25601 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue @@ -162,9 +162,7 @@ async function copyLink(name: string) { }); } -/** - * function เรียกข้อมูลวันที่ประกาศ - */ +/** function เรียกข้อมูลวันที่ประกาศ */ async function getDate() { showLoader(); await http @@ -185,9 +183,8 @@ async function getDate() { } const download10Url = ref(""); -/** - * function เช็คไฟล์อัปโหลด - */ + +/** function เช็คไฟล์อัปโหลด*/ async function checkDocResult() { showLoader(); await http @@ -297,7 +294,7 @@ onMounted(async () => { >
บันทึกแจ้งผลการประกาศคัดเลือก
-
+
{ if (props.Modal === true) { selected.value = props.selectedRow; + filterKeyword2.value = ""; } }); @@ -201,7 +202,7 @@ watch( outlined dense class="col-12 q-mb-sm" - :model-value="filterKeyword2" + v-model="filterKeyword2" placeholder="ค้นหารายชื่อ" style="max-width: 100%" @keydown.enter="onSearch" diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue index 3ae02ee09..79a9c5540 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue @@ -167,6 +167,7 @@ function onSearch() { watchEffect(() => { if (props.Modal === true) { selected.value = props.selectedRow; + filterKeyword.value = ""; } }); @@ -201,7 +202,7 @@ watch( outlined dense class="col-12 q-mb-sm" - :model-value="filterKeyword" + v-model="filterKeyword" placeholder="ค้นหารายการประชุม" style="max-width: 100%" @keydown.enter="onSearch" From 5506abdad5db2be35badb1183859bd0f38c06778 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 16 Dec 2024 16:20:33 +0700 Subject: [PATCH 2/5] fix --- src/modules/08_registryEmployee/components/DialogSelectPos.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/08_registryEmployee/components/DialogSelectPos.vue b/src/modules/08_registryEmployee/components/DialogSelectPos.vue index 92b88294c..0f9c090ed 100644 --- a/src/modules/08_registryEmployee/components/DialogSelectPos.vue +++ b/src/modules/08_registryEmployee/components/DialogSelectPos.vue @@ -82,6 +82,9 @@ const columns = ref([ label: "ตำแหน่งเลขที่", sortable: true, field: "posMasterNo", + format(val, row) { + return `${row.orgShortname} ${row.posMasterNo}`; + }, headerStyle: "font-size: 14px", style: "font-size: 14px", }, From 36d2ac3fb8f053774fbaadaa6a7483024112ca90 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 16 Dec 2024 17:10:44 +0700 Subject: [PATCH 3/5] fix readonly --- src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue index 6faac6049..31abb9691 100644 --- a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue +++ b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue @@ -526,7 +526,7 @@ watch(
Date: Tue, 17 Dec 2024 10:06:17 +0700 Subject: [PATCH 4/5] fix bug kpi --- src/modules/14_KPI/components/Tab/Topic/03_Develop.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue b/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue index 5fe445e7a..82657fe60 100644 --- a/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue +++ b/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue @@ -156,10 +156,11 @@ function getDevelop() { .then((res) => { const data = res.data.result; rows.value = data; - store.devScoreVal = rows.value.reduce( + const total = rows.value.reduce( (sum: number, e: any) => sum + e.summary, 0 ); + store.devScoreVal = total / rows.value.length; }); } From 8078a363351f8a9183c602422ca9a2b21e697fa0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 17 Dec 2024 15:26:47 +0700 Subject: [PATCH 5/5] =?UTF-8?q?fix=20=3D=3D=20>=20columns=20=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=9C?= =?UTF-8?q?=E0=B8=B9=E0=B9=89=E0=B9=80=E0=B8=81=E0=B8=A9=E0=B8=B5=E0=B8=A2?= =?UTF-8?q?=E0=B8=93=E0=B8=AD=E0=B8=B2=E0=B8=A2=E0=B8=B8=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/01_retirement/RetirementDetail.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue index 11aa18083..ed676f086 100644 --- a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue +++ b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue @@ -57,7 +57,7 @@ const statusReport = ref(); const dataProfile = ref([]); /** คอลัมน์ที่แสดง */ -const columns = ref([ +const columns = computed(() => [ { name: "order", label: "ลำดับ", @@ -79,7 +79,7 @@ const columns = ref([ { name: "position", align: "left", - label: "ตำแหน่ง", + label: `ตำแหน่ง ${employeeType.value == "OFFICER" ? "(ในสายงาน)" : ""}`, title: "ตำแหน่ง", subtitle: employeeType.value == "OFFICER" ? "ในสายงาน" : "", field: "position", @@ -89,7 +89,9 @@ const columns = ref([ { name: "positionType", align: "left", - label: "ตำแหน่ง", + label: `ตำแหน่ง (${ + employeeType.value == "OFFICER" ? "ประเภท" : "กลุ่มงาน" + })`, title: "ตำแหน่ง", subtitle: employeeType.value == "OFFICER" ? "ประเภท" : "กลุ่มงาน", field: "positionType", @@ -100,7 +102,7 @@ const columns = ref([ { name: "positionNumber", align: "left", - label: "ตำแหน่ง (เลขที่) ", + label: "ตำแหน่ง (เลขที่)", title: "ตำแหน่ง", subtitle: "เลขที่", field: "positionNumber", @@ -439,6 +441,7 @@ onMounted(async () => { @click="backHistory" /> รายชื่อผู้เกษียณอายุราชการ + {{ employeeType === "OFFICER" ? "ข้าราชการ กทม.สามัญ" : "ลูกจ้างประจำ" }}