Commit graph

7617 commits

Author SHA1 Message Date
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
157cce6919 style(registry-officer):display colums training 2025-10-16 09:57:10 +07:00
ca167937cf Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m4s
* develop:
  fix(placement):path API CalRetire
2025-10-15 12:37:48 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3880953988 fix(placement):path API CalRetire 2025-10-15 12:33:35 +07:00
32c8ae835f Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m7s
* develop:
2025-10-14 14:24:05 +07:00
478a17f6ad
Merge pull request #1477 from Frappet/fix/leave
Fix/leave
2025-10-14 14:22:23 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b25725711f Merge branch 'fix/leave' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m11s
2025-10-14 14:01:16 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
8a3c77f744 fix:fetch operate 2025-10-14 13:44:11 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
bfcede263a Merge branch 'fix/delete_minDate' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m26s
2025-10-14 12:15:35 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
de2571e02f fix: Change get to post 2025-10-14 12:12:25 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ee5836541a Merge branch 'fix/delete_minDate' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m18s
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2025-10-14 11:59:37 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
41e08b7200 fix:DialogCandidates 2025-10-14 11:57:31 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a719b98791 fix(03_recruiting):Display Table 2025-10-14 10:10:33 +07:00
NiceY2T
337c6dbf7b
feat(compete):add DialogCandidates (#1473) 2025-10-12 15:15:34 +07:00
5ae01d1b2d
Merge pull request #1471 from Frappet/fix/downloadfile
fix(leave):display FileName
2025-10-10 10:41:47 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3df8b48530 fix(leave):display FileName 2025-10-10 10:37:07 +07:00
5840d78dff
Merge pull request #1470 from Frappet/fix/commandYear
fix(command):queryParams.year :newDate().getFullYear()
2025-10-09 17:04:15 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
f3bd67c93f fix:label q-input year 2025-10-09 17:02:11 +07:00
5b22d85601
Merge pull request #1468 from Frappet/SortDiscipline
Sort discipline
2025-10-09 16:46:39 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
7ecf76701a fix(command):queryParams.year :newDate().getFullYear() 2025-10-09 16:43:10 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
0bec7d1dbc fix(director):sort 2025-10-09 14:50:02 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
629efe5abf fix(discipline-appealcomplain):sort 2025-10-09 14:10:40 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
dc3989acae fix(startDateSuspend):sort 2025-10-09 11:53:45 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ad80eae285 fix(discipline-result):sort 2025-10-09 11:05:57 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
49dcf013ae fix(disciplinary):sort 2025-10-09 10:38:28 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b1532ada56 fix(investigatefacts)sort 2025-10-09 10:08:46 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
5825f72e26 fix(complaints):sort 2025-10-08 16:59:13 +07:00
74de61a809
Merge pull request #1465 from Frappet/SortLeave
SortLeave
2025-10-08 16:45:43 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ba09c07dab fix(leaveHistory): params 2025-10-08 16:09:54 +07:00
433de546a2
Merge pull request #1466 from Frappet/Nice
fix  width , text-html columns  org
2025-10-08 15:13:28 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
fd717bbf49 fix(leave-history):edit API search-personal 2025-10-08 15:07:56 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
5978f93911 fix(development):fix width columns org 2025-10-08 14:03:02 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
af7ac9e78b fix(leave-history):sort 2025-10-08 13:42:10 +07:00
9d71f85a9e Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m32s
* develop:
  แก้ชื่อรายงานลงเวลาและการลาให้ถูกต้อง (แก้ id รายงานเป็น number) และลบไฟล์ที่ไม่ได้ใช้แล้วทิ้ง
  style(registry-temp):display columns isPosition
  style(placement):layout
  style(transfer):responsive
  fix(retire-old):resetFilter
  fix(leave) : max-date บันทึกวันลาย้อนหลัง
  style(registry): gov => position add q-ml-md
  fix(development): path API profile/development
  fix(retire-old): resetfilter year-1
  fix(development):sort
  feat(retirement): add Page retire-old
  fix(KPI):sort
  fix bug registry retire
  fix(rerirement): ปีงบ
  fix(salary):sort
  fix(registry-retire-employee): load list
  fix(leavea): delete readonly
  fix:TestTimes
  fix:add function calculateFiscalYear
2025-10-08 11:47:41 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
df7d887309 Merge branch 'Nice' into SortLeave
# Conflicts:
#	src/modules/09_leave/components/02_WorkList/!DialogReport.vue
2025-10-08 10:38:16 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
fb3902edce fix(leave):sort 2025-10-08 10:37:36 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
82051daa2b Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop 2025-10-07 11:53:59 +07:00
adbd3cb3da
Merge pull request #1464 from Frappet/issue-1843-(leave-report-name)
fix issue #1843
2025-10-07 10:53:48 +07:00
c9f23a4369 แก้ชื่อรายงานลงเวลาและการลาให้ถูกต้อง (แก้ id รายงานเป็น number) และลบไฟล์ที่ไม่ได้ใช้แล้วทิ้ง 2025-10-07 10:50:59 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
7a833e0ee5 style(registry-temp):display columns isPosition 2025-10-06 14:41:55 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a65e6645bc style(placement):layout 2025-10-06 14:30:52 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
f258a9fcfe style(transfer):responsive 2025-10-06 11:10:42 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
4bf8daf8dc fix(retire-old):resetFilter 2025-10-06 10:21:17 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e08e0e7da2 fix(leave) : max-date บันทึกวันลาย้อนหลัง 2025-10-03 17:54:44 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
2e3fb77655 style(registry): gov => position add q-ml-md 2025-10-03 16:55:08 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
17afb2ed0d fix(development): path API profile/development 2025-10-03 16:13:35 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d38f488935 fix(retire-old): resetfilter year-1 2025-10-03 11:58:29 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
1b67db241b fix(development):sort 2025-10-03 10:52:47 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
8674269934 feat(retirement): add Page retire-old 2025-10-02 17:25:20 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a97775e66a fix(KPI):sort 2025-10-02 16:27:36 +07:00
8287e4e3c1 fix bug registry retire 2025-10-02 16:14:03 +07:00