ปรับ mixin Date และเพิ่มไฟล์ ตำแหน่ง/เงินเดือน
This commit is contained in:
parent
c91482ef7c
commit
0d4146e923
8 changed files with 6644 additions and 6 deletions
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -671,6 +671,7 @@
|
|||
</q-form>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
|
||||
<HistoryTable
|
||||
:rows="rowsHistory"
|
||||
:columns="columnsHistory"
|
||||
|
|
|
|||
|
|
@ -531,6 +531,7 @@
|
|||
</q-form>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
|
||||
<HistoryTable
|
||||
:rows="rowsHistory"
|
||||
:columns="columnsHistory"
|
||||
|
|
|
|||
|
|
@ -506,6 +506,7 @@
|
|||
</q-form>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
|
||||
<HistoryTable
|
||||
:rows="rowsHistory"
|
||||
:columns="columnsHistory"
|
||||
|
|
|
|||
2452
src/modules/04_registry/components/salaryNew/Salary.vue
Normal file
2452
src/modules/04_registry/components/salaryNew/Salary.vue
Normal file
File diff suppressed because it is too large
Load diff
2065
src/modules/04_registry/components/salaryNew/SalaryEmployee.vue
Normal file
2065
src/modules/04_registry/components/salaryNew/SalaryEmployee.vue
Normal file
File diff suppressed because it is too large
Load diff
2110
src/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue
Normal file
2110
src/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -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 +
|
||||
" " +
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue