hrms-mgt

hrms-bangkok/hrms-mgt

Fork 0

Commit graph

69d130bdd8 Merge branch 'develop' into warunee-dev waruneeta 2023-07-25 11:05:18 +07:00
a24e2298c0 Merge branch 'develop' into nice_dev $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-25 11:01:49 +07:00
a8dc849917 no message $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-25 11:01:31 +07:00
5e8940852b Merge branch 'develop' into dev-tee setthawutttty 2023-07-25 10:54:33 +07:00
c28de1d33c no message setthawutttty 2023-07-25 10:54:15 +07:00
befd2db27b Merge branch 'nice_dev' into develop $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-25 10:03:34 +07:00
1b6157165a no message $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-25 10:03:28 +07:00
576dbf9fbe Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop setthawutttty 2023-07-25 09:33:25 +07:00
cd683d2296 no message setthawutttty 2023-07-25 09:32:45 +07:00
37722a0916 แก้เมนูออกคำสั่ง AnandaTon 2023-07-25 09:27:52 +07:00
707d3f13a2 Merge branch 'develop' into dev-tee setthawutttty 2023-07-25 09:25:32 +07:00
b40bd12492 หน้าเเรกประกาศเกษียณ setthawutttty 2023-07-25 09:23:39 +07:00
9b5b77a304 Merge branch 'develop' into warunee-dev waruneeta 2023-07-25 09:23:18 +07:00
8066a92c33 Merge branch 'anandadev' into develop AnandaTon 2023-07-25 09:20:19 +07:00
a37b989525 Merge branch 'develop' into warunee-dev waruneeta 2023-07-25 09:13:29 +07:00
ecbd8f5518 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-25 09:11:36 +07:00
a5917e6f6d Merge branch 'develop' into nice_dev $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-25 09:06:32 +07:00
a50ac34978 no message $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-25 09:04:49 +07:00
672d014936 Merge branch 'develop' into warunee-dev waruneeta 2023-07-25 07:14:53 +07:00
ebf15d6918 แก้ไข router retirement $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-24 18:14:25 +07:00
bb7b0c37d1 เพิ่มเมนู Probation AnandaTon 2023-07-24 17:47:24 +07:00
cf0fad18ef Merge branch 'develop' into dev-tee setthawutttty 2023-07-24 17:40:33 +07:00
3e626d48e1 โครง get (ยังไม่เสร็จ) ประกาศเกษียณ setthawutttty 2023-07-24 17:38:57 +07:00
b7ee12468a แก้ tap ข้างขวาใน addEmployee AnandaTon 2023-07-24 17:29:21 +07:00
fd280ddabf Merge branch 'develop' into warunee-dev waruneeta 2023-07-24 17:16:13 +07:00
5d20d4f279 ui เพิ่ม เพิ่มข้อมูลทะเบียนประวัติลูกจ้าง // api AnandaTon 2023-07-24 17:11:12 +07:00
03619ab42a Merge branch 'develop' into warunee-dev waruneeta 2023-07-24 16:09:26 +07:00
5d2fdf254d no message $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-24 16:01:11 +07:00
440b6523c8 no message $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-24 15:37:59 +07:00
5e70fd7c70 no message $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-24 15:29:33 +07:00
4d369dbad7 Merge branch 'nice_dev' into develop $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-24 15:27:45 +07:00
6f40ad3de8 ui พ้นราชการ $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-24 15:26:22 +07:00
7ba050df55 Merge branch 'develop' into warunee-dev waruneeta 2023-07-24 14:55:38 +07:00
e31b55595b update probation detail waruneeta 2023-07-24 14:54:58 +07:00
1e51577963 Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me Thanit Konmek 2023-07-24 14:42:02 +07:00
1a4163e76a ทะเบียนประวัติลูกจ้าง popup กำหนดตำแหน่ง Thanit Konmek 2023-07-24 14:41:52 +07:00
b6fd446e73 no message setthawutttty 2023-07-24 13:26:27 +07:00
6dd84473b6 no message setthawutttty 2023-07-24 13:20:02 +07:00
ac4fb71f09 ui ลาออก ถึงเเก่กรรม setthawutttty 2023-07-24 13:19:14 +07:00
17e4dba176 update process probation waruneeta 2023-07-24 09:28:49 +07:00
1b4465bf36 Merge branch 'develop' into work Kittapath 2023-07-22 23:13:37 +07:00
41b8c39045 no message Kittapath 2023-07-22 23:13:04 +07:00
6e15c59bde update style send placement popup waruneeta 2023-07-21 17:13:48 +07:00
1951d23eab Merge branch 'nice_dev' into develop $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-21 16:38:10 +07:00
14e1394128 no message $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-21 16:38:02 +07:00
6a68e7f05c Merge branch 'nice_dev' into develop $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-21 15:31:17 +07:00
c13df46549 เพิ่มเมนูย่อย retirement $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-21 15:30:54 +07:00
79b9239cb9 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop AnandaTon 2023-07-21 15:16:02 +07:00
b95e363042 แก้ icon AnandaTon 2023-07-21 15:15:50 +07:00
7ee8387d42 Merge branch 'develop' into dev-tee setthawutttty 2023-07-21 15:10:18 +07:00
cf7a653160 copy ออกคำสั่ง => /resign-order setthawutttty 2023-07-21 15:08:37 +07:00
cecb277d8a ui เพิ่ม เมนูย่อยทะเบียนประะวัติโปรไฟล์ AnandaTon 2023-07-21 15:05:25 +07:00
59cdff8851 Merge branch 'develop' into dev-tee setthawutttty 2023-07-21 14:44:12 +07:00
f41c0ba653 ui หน้าฟอร์มมอบหมายงาน setthawutttty 2023-07-21 14:42:18 +07:00
e62d78ccb1 Merge branch 'nice_dev' into develop $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-21 14:25:27 +07:00
701355ed57 expanded tree $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-21 14:25:01 +07:00
2dd7d8988f Merge branch 'develop' into work Kittapath 2023-07-21 14:21:35 +07:00
4547e3ea34 ui ค้นหาทะเบียนประวัติ Kittapath 2023-07-21 14:21:19 +07:00
696ab7c4b2 ปรับ drawer เมนูย่อยเพิ่มเติม Tanyalak 2023-07-21 13:57:47 +07:00
81a57354b5 Merge branch 'anandadev' into develop AnandaTon 2023-07-21 12:22:36 +07:00
c44585a8b4 api รายชื่อลูกจ้างชั่วคราว AnandaTon 2023-07-21 12:22:14 +07:00
ad26c94921 Merge branch 'nice_dev' into develop $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-21 11:44:38 +07:00
01c10f48b9 แก้ไข status draft $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-21 11:43:55 +07:00
4d6b0d809c Merge branch 'develop' into warunee-dev waruneeta 2023-07-21 11:42:53 +07:00
47909bf034 update filter tree selected waruneeta 2023-07-21 11:41:53 +07:00
640bde71be แก้ router ระบบบรรจุ Tanyalak 2023-07-21 10:27:51 +07:00
f1d1b722d8 Merge branch 'nice_dev' into develop $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-20 17:57:31 +07:00
9ce455e100 no message $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-20 17:57:05 +07:00
1b8396e68d Merge branch 'develop' into working Tanyalak 2023-07-20 15:17:39 +07:00
7944b49d8a ปรับ ui ระบบบรรจุ > บันทึกผลการทดลองปฏิบัติหน้าที่ราชการ > /probation/work/1 Tanyalak 2023-07-20 15:17:01 +07:00
d33f423655 ปรับ ui ออกคำสั่ง Thanit Konmek 2023-07-20 14:53:05 +07:00
6b80d6804f Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop AnandaTon 2023-07-19 15:30:16 +07:00
e79b52dc06 เพิ่ม tap เมนู AnandaTon 2023-07-19 15:30:13 +07:00
f2dc9e948b แก้ tap menu AnandaTon 2023-07-19 15:29:59 +07:00
87ecd70e03 Merge commit 'afa42c0133' into develop Tanyalak 2023-07-19 10:48:27 +07:00
800c87aa07 ปรับ css เพิ่มเติม Tanyalak 2023-07-19 10:46:40 +07:00
afa42c0133 จัดหน้า router Thanit Konmek 2023-07-17 17:00:50 +07:00
9fbc60e8b4 Merge branch 'develop' into nice_dev $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-17 16:13:25 +07:00
1782765dba เพิ่ม button back $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-17 16:13:18 +07:00
d0b31e21e7 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop AnandaTon 2023-07-17 16:07:34 +07:00
0245e1f228 fix route AnandaTon 2023-07-17 16:03:00 +07:00
9d3e90e9b2 Merge branch 'nice_dev' into develop $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-17 16:01:09 +07:00
57e46133ef เพิ่มลิงค์ $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-17 16:00:29 +07:00
9edb214a6e Merge branch 'anandadev' into develop AnandaTon 2023-07-17 15:58:26 +07:00
d62883f5a1 Merge branch 'develop' into nice_dev $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-17 14:59:24 +07:00
18d9947936 Ui เครื่องราช $DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-17 14:56:08 +07:00
6e91a8717d Merge branch 'develop' into warunee-dev waruneeta 2023-07-17 14:47:38 +07:00
85b31c2bd6 ui หน้าเครื่องราช , ui เหรียญจักรพรรดิมาลา Thanit Konmek 2023-07-17 14:18:31 +07:00
27b4e9dd4c อัพเดท type //เมนูเครื่องราช AnandaTon 2023-07-17 14:02:44 +07:00
d626279c6c ui เพิ่มรอบการเสนอขอพระราชทานเครื่องราชอิสริยาภรณ์ AnandaTon 2023-07-17 10:38:48 +07:00
5ac26b80ca Merge branch 'anandadev' into develop AnandaTon 2023-07-17 09:37:33 +07:00
8e7a74fe85 Ui รายการรอบการเสนอขอพระราชทานเครื่องราชอิสริยาภรณ์ AnandaTon 2023-07-17 09:35:49 +07:00
6fa564de69 Merge branch 'develop' into warunee-dev waruneeta 2023-07-17 08:59:04 +07:00
836fb5a5fc บรรจุไม่แสดงตำแหน่งสงวน Kittapath 2023-07-15 13:39:48 +07:00
65b112b234 Merge branch 'develop' into warunee-dev waruneeta 2023-07-14 15:49:11 +07:00
bfe7d6ffd4 fix link redirect ออกคำสั่ง waruneeta 2023-07-14 15:48:31 +07:00
d81d9bcf22 Merge branch 'working' into develop Tanyalak 2023-07-14 15:39:32 +07:00
332e61599b ปรับ css ระบบทะเบียนประวัติลูกจ้าง,พ้นจากราชการ Tanyalak 2023-07-14 15:38:09 +07:00
6349698188 แก้ฟังก์ชั่น guid Thanit Konmek 2023-07-14 15:34:59 +07:00
a4966331e5 Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me Thanit Konmek 2023-07-14 13:35:16 +07:00