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] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20mixin=20?= =?UTF-8?q?Date=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 + " " +