hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
7557 commits 1 branch 86 tags 71 MiB
Commit graph

7557 commits

This branch
This branch
All branches
Author SHA1 Message Date
waruneeauy
ddabdb573b Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m36s
Details 
* develop:
  เปิดปุ่มแก้ไขเป้ามายตามแผน ของผู้เกี่ยวข้องส่วนของโครงการะบบพัฒนา
 2026-02-06 20:44:38 +07:00
waruneeauy
188d12f34b เปิดปุ่มแก้ไขเป้ามายตามแผน ของผู้เกี่ยวข้องส่วนของโครงการะบบพัฒนา 2026-02-06 20:44:14 +07:00
waruneeauy
726c4fa818 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m52s
Details 
* develop:
  fix
  add code show salary history
 2026-02-06 17:33:50 +07:00
waruneeauy
34217aff11 fix 2026-02-06 17:33:38 +07:00
waruneeauy
2dcc167355 Merge branch 'develop' of github.com:Frappet/hrms-mgt into develop 
* 'develop' of github.com:Frappet/hrms-mgt:
  fix(development):display btn projectStatus !== 'FINISH'
  fix(registry):display govAgeBkk
 2026-02-06 17:05:39 +07:00
waruneeauy
b7d9555b87 add code show salary history 2026-02-06 17:05:13 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e3fd96d479 Merge branch 'develop' into dev
Some checks failed
Build & Deploy on Dev / build (push) Failing after 1m58s
Details
2026-02-06 17:03:27 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b0b64059f1 fix(development):display btn projectStatus !== 'FINISH' 2026-02-06 17:03:11 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
78d1a06942 fix(development): display btn projectStatus !== 'FINISH' 2026-02-06 17:01:41 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
7deec1a5c6 Merge branch 'develop' into dev
Some checks failed
Build & Deploy on Dev / build (push) Failing after 2m11s
Details
2026-02-06 15:06:42 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d1600281f9 fix(registry):display govAgeBkk 2026-02-06 15:06:28 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
aa90e8b9db Merge branch 'develop' into dev
Some checks failed
Build & Deploy on Dev / build (push) Failing after 2m38s
Details
2026-02-06 11:01:54 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
597cbc4ed3 fix:API plan role special edit-indicator 2026-02-06 10:53:50 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
2f060d2522 fix(KPI-LIST):checkPermission.attrIsUpdate 2026-02-06 10:48:57 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6ff749ab5f fix: rules prefix 2026-02-06 10:32:36 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b0b16131ab fix:bug showload profile 2026-02-06 10:07:32 +07:00
waruneeauy
cc128ccbb9 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 4m2s
Details 
* develop:
  add: leaveCount in permission leave
 2026-02-05 12:16:32 +07:00
waruneeauy
91c870955b add: leaveCount in permission leave 2026-02-05 12:16:18 +07:00
waruneeauy
1da61d9be9 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 4m10s
Details 
* develop:
  fix: upload file
 2026-02-05 11:07:55 +07:00
waruneeauy
906c6066e3 fix: upload file 2026-02-05 11:06:10 +07:00
waruneeauy
13c14c7382 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 5m3s
Details 
* develop:
  issue: add menu issue
 2026-02-04 21:49:07 +07:00
waruneeauy
af54914bbb issue: add menu issue 2026-02-04 21:48:48 +07:00
waruneeauy
d25d4a8213 Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 5m44s
Details 
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
 2026-02-04 21:05:43 +07:00
waruneeauy
4d65ed9991 Merge branch 'develop' into dev 
* develop:
  fix(registry-officer):add btn delete btn edit
  fix:add btn delete development
 2026-02-04 21:05:27 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
49bcb5673a Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m40s
Details
2026-02-04 16:29:24 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
7daf29d974 fix(registry-officer):add btn delete btn edit 2026-02-04 16:29:08 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e5a44f4b64 Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m30s
Details
2026-02-04 15:06:45 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6737b5b5f1 Merge branch 'develop' into dev 2026-02-04 15:06:37 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
488e959809 fix:add btn delete development 2026-02-04 15:06:19 +07:00
waruneeauy
56b1d800ef Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m35s
Details 
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
 2026-02-04 13:44:46 +07:00
waruneeauy
c9e5f1cd71 Merge branch 'develop' into dev 
* develop:
  fix:add fiedl email phone
  fix: show workflow EMP
  fix:disable radio Digital
  fix:profileId To citizenId
  fix: form upload Attachment
  fix:bug
  fix:btn position
  fix: img
  fix:interface
  feat:page issues
  fix:org name
  fix:path upload
  fix
  fix: max-file-size="5000000"
  feat:issue
 2026-02-04 13:44:40 +07:00
Warunee.T
8646e76d70
Merge pull request #1538 from Frappet/feat/issue 
feat:issue
 2026-02-04 13:44:04 +07:00
waruneeauy
e3f35a189c Merge branch 'develop' into feat/issue 
* develop:
  fix: show workflow EMP
  fix:disable radio Digital
  fix:profileId To citizenId
  fix: form upload Attachment
  fix:bug
  fix: active act org level 0 only
  add: บันทึกรักษาการในตำแหน่ง (owner only)
  fix: convertCommandCodeName columns commandCode
  test
  fix:default profileAvatar
  fix:show btn delete avatar active
  fix: approveCheck
  fix: statusCheck PENDING
  fix(leave):approveCheck logic for commander approval status
  fix: disabled organization view
  fix(indicator-plan):fix nodeDnaId
  fix: title by issue #2156 ปรับระดับชั้นงาน-ย้ายลูกจ้าง (ข้อความเมนูไม่เหมือนกัน)
  fix(timestamp):clear_rowData
  ปิดปุ่มแก้ไข และเพิ่มของประวัติตำแหน่ง เงินเดือน แก้ได้แค่ owner เท่านั้น

# Conflicts:
#	src/api/02_organizational/api.organization.ts
 2026-02-04 13:43:52 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
5c7be2e4a8 fix:add fiedl email phone 2026-02-04 13:01:41 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a40fe7605e Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m0s
Details
2026-02-03 16:36:19 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
2c25c2838e fix: show workflow EMP 2026-02-03 16:35:42 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6ad94b760c fix:disable radio Digital 2026-02-03 16:34:16 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ae4e874f42 fix:profileId To citizenId 2026-02-03 16:23:08 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
79d1a14ec4 fix: form upload Attachment 2026-02-03 15:08:24 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b1609de979 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m47s
Details
2026-02-03 10:58:15 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a8c3b77bce fix:bug 2026-02-03 10:57:32 +07:00
waruneeauy
d7bdd82b85 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m34s
Details 
* develop:
  fix: active act org level 0 only
 2026-02-02 17:21:11 +07:00
waruneeauy
e1969db62e fix: active act org level 0 only 2026-02-02 17:20:57 +07:00
waruneeauy
67066797fd Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m42s
Details 
* develop:
  add: บันทึกรักษาการในตำแหน่ง (owner only)
 2026-02-02 17:06:03 +07:00
waruneeauy
81fcb1253f add: บันทึกรักษาการในตำแหน่ง (owner only) 2026-02-02 17:05:47 +07:00
waruneeauy
57a28a2b8d Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 5m55s
Details 
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
  fix:test build
 2026-01-31 12:56:56 +07:00
waruneeauy
8d4a9d8c72 Merge branch 'develop' into dev 
* develop:
  fix: convertCommandCodeName columns commandCode
  test
  fix:default profileAvatar
  fix:show btn delete avatar active
  fix: approveCheck
  fix: statusCheck PENDING
  fix(leave):approveCheck logic for commander approval status
 2026-01-31 12:56:50 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
72f3cdcdc0 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m48s
Details
2026-01-30 18:08:18 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
28fa6fbaf7 fix: convertCommandCodeName columns commandCode 2026-01-30 17:55:09 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6676113c2c Merge branch 'develop' into dev
Some checks failed
Build & Deploy on Dev / build (push) Failing after 10s
Details 
# Conflicts:
#	src/modules/04_registryPerson/views/listView.vue
 2026-01-30 17:41:41 +07:00