From 72eb0c0643b046d97bdd8ab7b4c5a197de6c9043 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 7 Feb 2024 17:07:52 +0700 Subject: [PATCH 1/4] =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87?= =?UTF-8?q?=E0=B8=84=E0=B8=99=E0=B8=84=E0=B8=A3=E0=B8=AD=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/02_organizationalNew/components/listView.vue | 2 +- .../interface/response/organizational.ts | 2 ++ src/modules/02_organizationalNew/store/organizational.ts | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/modules/02_organizationalNew/components/listView.vue b/src/modules/02_organizationalNew/components/listView.vue index 365ad22db..78a34c112 100644 --- a/src/modules/02_organizationalNew/components/listView.vue +++ b/src/modules/02_organizationalNew/components/listView.vue @@ -106,9 +106,9 @@ async function fetchDataTable(id: string, level: number, action: boolean) { const { id, ...rest } = a ? a : p[0]; const test = { ...e, ...rest }; dataMain.push(test); - posMaster.value = store.fetchPosMaster(dataMain); } }); + posMaster.value = store.fetchPosMaster(dataMain); }) .catch((err) => { messageError($q, err); diff --git a/src/modules/02_organizationalNew/interface/response/organizational.ts b/src/modules/02_organizationalNew/interface/response/organizational.ts index 700f20911..6dd00ece6 100644 --- a/src/modules/02_organizationalNew/interface/response/organizational.ts +++ b/src/modules/02_organizationalNew/interface/response/organizational.ts @@ -103,6 +103,8 @@ interface PosMaster { positionExecutiveField: string; // ด้านทางการบริหาร positionArea: string; // ด้าน/สาขา positionIsSelected: boolean; // เป็นตำแหน่งที่ถูกเลือกในรอบนั้น ๆ หรือไม่? + fullNameCurrentHolder: string | null; + fullNameNextHolder: string | null; positions: Position[]; // ตำแหน่ง } interface Position2 { diff --git a/src/modules/02_organizationalNew/store/organizational.ts b/src/modules/02_organizationalNew/store/organizational.ts index fa7ed8822..ca1af9179 100644 --- a/src/modules/02_organizationalNew/store/organizational.ts +++ b/src/modules/02_organizationalNew/store/organizational.ts @@ -48,7 +48,13 @@ export const useOrganizational = defineStore("organizationalStore", () => { function fetchPosMaster(data: PosMaster[]) { const newPosMaster = data.map((e: PosMaster) => ({ ...e, - positionIsSelected: e.positionIsSelected ? "มี" : "ว่าง", + positionIsSelected: + typeOrganizational.value === "draft" && e.fullNameNextHolder !== null + ? e.fullNameNextHolder + : typeOrganizational.value !== "draft" && + e.fullNameCurrentHolder !== null + ? e.fullNameCurrentHolder + : "ว่าง", posMasterNo: e.orgShortname + e.posMasterNoPrefix + From 24a8d5130bfcb45600ed823347e99806456ab6f8 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Wed, 7 Feb 2024 17:17:21 +0700 Subject: [PATCH 2/4] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99?= =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../04_registry/components/Profile.vue | 63 ++++++++++++------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index 56157b105..50ec60ac6 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -153,27 +153,39 @@ - - ยืนยันการตรวจสอบข้อมูล - - - ตรวจสอบข้อมูลแล้ว - +
+ + ยืนยันการตรวจสอบข้อมูล + + + ปลดล็อคให้แก้ไขข้อมูล + + + ตรวจสอบข้อมูลแล้ว + +
-
+
{}, + "ยืนยันการปลดให้แก้ไขข้อมูล", + "ต้องการยืนยันการปลดให้แก้ไขข้อมูลนี้หรือไม่?" + ); +} onMounted(async () => { if (keycloak.tokenParsed != null) { roleKeyregistry.value = await keycloak.tokenParsed.role.includes( @@ -921,6 +942,7 @@ onMounted(async () => { await checIsVerified(); }); +const isVerified = ref(false); const fetchData = async () => { showLoader(); await http @@ -952,7 +974,6 @@ const fetchData = async () => { }); }; -const isVerified = ref(false); async function checIsVerified() { // showLoader(); await http From c91482ef7cfaa6fdaf99eaf9dd8f86b97c921bd7 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Wed, 7 Feb 2024 17:23:57 +0700 Subject: [PATCH 3/4] updated --- src/modules/04_registry/components/Profile.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index 50ec60ac6..75be6809f 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -155,7 +155,7 @@
ยืนยันการตรวจสอบข้อมูล ปลดล็อคให้แก้ไขข้อมูล { await checIsVerified(); }); -const isVerified = ref(false); +// const isVerified = ref(false); const fetchData = async () => { showLoader(); await http @@ -964,7 +964,6 @@ const fetchData = async () => { leaveReason.value = ` (พ้นจากราชการด้วยสาเหตุ: ${data.leaveReason})`; } reasonStatus.value = reason.length > 0 ? true : false; - isVerified.value = data.isVerified ? data.isVerified : false; }) .catch((e) => { messageError($q, e); From 0d4146e923c2188b30aa90d94d9c22add0a71696 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 7 Feb 2024 17:47:31 +0700 Subject: [PATCH 4/4] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20mixi?= =?UTF-8?q?n=20Date=20=20=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=9E?= =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B9=84=E0=B8=9F=E0=B8=A5=E0=B9=8C?= =?UTF-8?q?=20=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88?= =?UTF-8?q?=E0=B8=87/=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?= =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../04_registry/components/Profile.vue | 11 +- src/modules/04_registry/components/Salary.vue | 1 + .../04_registry/components/SalaryEmployee.vue | 1 + .../components/SalaryEmployeeTemp.vue | 1 + .../components/salaryNew/Salary.vue | 2452 +++++++++++++++++ .../components/salaryNew/SalaryEmployee.vue | 2065 ++++++++++++++ .../salaryNew/SalaryEmployeeTemp.vue | 2110 ++++++++++++++ src/stores/mixin.ts | 9 +- 8 files changed, 6644 insertions(+), 6 deletions(-) create mode 100644 src/modules/04_registry/components/salaryNew/Salary.vue create mode 100644 src/modules/04_registry/components/salaryNew/SalaryEmployee.vue create mode 100644 src/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index 75be6809f..d63efc27e 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -796,9 +796,14 @@ import TrainVue from "@/modules/04_registry/components/Train.vue"; import InsigniaVue from "@/modules/04_registry/components/Insignia.vue"; import CoinedVue from "@/modules/04_registry/components/Coin.vue"; import AssessmentVue from "@/modules/04_registry/components/Assessment.vue"; -import SalaryVue from "@/modules/04_registry/components/Salary.vue"; -import SalaryEmployeeVue from "@/modules/04_registry/components/SalaryEmployee.vue"; -import SalaryEmployeeTempVue from "@/modules/04_registry/components/SalaryEmployeeTemp.vue"; +// import SalaryVue from "@/modules/04_registry/components/Salary.vue"; +// import SalaryEmployeeVue from "@/modules/04_registry/components/SalaryEmployee.vue"; +// import SalaryEmployeeTempVue from "@/modules/04_registry/components/SalaryEmployeeTemp.vue"; + +import SalaryVue from "@/modules/04_registry/components/salaryNew/Salary.vue"; +import SalaryEmployeeVue from "@/modules/04_registry/components/salaryNew/SalaryEmployee.vue"; +import SalaryEmployeeTempVue from "@/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue"; + import DisciplineVue from "@/modules/04_registry/components/Discipline.vue"; import LeaveVue from "@/modules/04_registry/components/Leave.vue"; import TalentVue from "@/modules/04_registry/components/Talent.vue"; diff --git a/src/modules/04_registry/components/Salary.vue b/src/modules/04_registry/components/Salary.vue index fafd041d7..264cac96a 100644 --- a/src/modules/04_registry/components/Salary.vue +++ b/src/modules/04_registry/components/Salary.vue @@ -671,6 +671,7 @@ + + + + + + diff --git a/src/modules/04_registry/components/salaryNew/SalaryEmployee.vue b/src/modules/04_registry/components/salaryNew/SalaryEmployee.vue new file mode 100644 index 000000000..c39476167 --- /dev/null +++ b/src/modules/04_registry/components/salaryNew/SalaryEmployee.vue @@ -0,0 +1,2065 @@ + + + + diff --git a/src/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue b/src/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue new file mode 100644 index 000000000..6507285cb --- /dev/null +++ b/src/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue @@ -0,0 +1,2110 @@ + + + + diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts index 5d75e3e73..e86afb1be 100644 --- a/src/stores/mixin.ts +++ b/src/stores/mixin.ts @@ -125,14 +125,17 @@ export const useCounterMixin = defineStore("mixin", () => { } let dstTime = ""; if (isTime) { - const H = date.getHours().toString().padStart(2, "0"); - const M = date.getMinutes().toString().padStart(2, "0"); + // const H = date.getHours().toString().padStart(2, "0"); + // const M = date.getMinutes().toString().padStart(2, "0"); + const H = date.getHours().toString().padStart(2); + const M = date.getMinutes().toString().padStart(2); // const S = date.getSeconds().toString().padStart(2, "0") // dstTime = " " + H + ":" + M + ":" + S + " น." dstTime = " " + H + ":" + M + " น."; } return ( - date.getDate().toString().padStart(2, "0") + + // date.getDate().toString().padStart(2, "0") + + date.getDate().toString().padStart(2) + " " + dstMonth + " " +