Commit Graph

1785 Commits

Author SHA1 Message Date
黎永顺 44c63e874a Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-13 16:14:28 +08:00
黎永顺 d9fc164504 hotfix/2.15.1.2407.01 2024-08-13 16:12:43 +08:00
黎永顺 9479a4ba9a feature/2.15.1.2407.01-导入工具 2024-08-13 14:33:10 +08:00
黎永顺 a2c1fbd485 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-12 16:57:53 +08:00
黎永顺 74ba398c90 feature/2.15.1.2407.01-导入工具 2024-08-12 16:56:51 +08:00
黎永顺 f05c43d011 feature/2.15.1.2407.01-浮动薪酬 2024-08-12 14:58:36 +08:00
黎永顺 df2283d0f4 feature/2.15.1.2407.01-浮动薪酬 2024-08-12 11:12:10 +08:00
黎永顺 4a5f5b6e7a feature/2.15.1.2407.01-浮动薪酬 2024-08-12 09:56:58 +08:00
黎永顺 8c038c8d74 Merge branch 'hotfix/2.15.1.2407.01' into feature/2.15.1.2407.01-浮动薪酬 2024-08-12 09:27:43 +08:00
黎永顺 9d99557f4b feature/2.15.1.2407.01-浮动薪酬 2024-08-12 09:24:11 +08:00
黎永顺 86de787ed4 feature/2.15.1.2407.01-浮动薪酬 2024-08-08 18:24:45 +08:00
黎永顺 70fe54efb7 feature/2.15.1.2407.01-浮动薪酬 2024-08-08 17:32:54 +08:00
黎永顺 36d90b35a6 feature/2.15.1.2407.01-浮动薪酬 2024-08-08 14:36:11 +08:00
黎永顺 75b6c0969a feature/2.15.1.2407.01-导入工具 2024-08-07 15:22:10 +08:00
黎永顺 99d93b041e hotfix/2.15.1.2407.01 2024-08-07 14:05:32 +08:00
黎永顺 334a582d62 hotfix/2.15.1.2407.01
考勤引用,薪资账套多选
2024-08-07 11:11:53 +08:00
黎永顺 25b7a2341e hotfix/2.15.1.2407.01 2024-08-05 11:05:25 +08:00
黎永顺 d09c5f1d96 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-07-26 17:31:53 +08:00
黎永顺 964af55e3a hotfix/2.15.1.2407.01 2024-07-26 10:02:35 +08:00
黎永顺 d3ad76f711 hotfix/2.15.1.2407.01 2024-07-23 11:15:05 +08:00
黎永顺 c16272755a release/2.15.1.2407.01 2024-07-19 14:07:45 +08:00
黎永顺 6a33d3d99c hotfix/2.15.1.2407.01 2024-07-19 10:52:09 +08:00
黎永顺 892114dbc2 hotfix/2.15.1.2407.01 2024-07-18 15:37:30 +08:00
黎永顺 af8a0a1bab hotfix/2.15.1.2407.01 2024-07-16 15:59:38 +08:00
黎永顺 cff964c7f1 feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能 2024-07-16 11:10:48 +08:00
黎永顺 adf8b1bddc feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能 2024-07-16 09:31:56 +08:00
黎永顺 fef6bac256 feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能 2024-07-16 09:15:53 +08:00
黎永顺 5f5d6f95de feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能 2024-07-15 18:45:56 +08:00
黎永顺 0628c1499b feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能 2024-07-15 18:42:26 +08:00
黎永顺 6d73b146c4 feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能 2024-07-15 18:18:57 +08:00
黎永顺 b349327088 feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能 2024-07-15 17:14:55 +08:00
黎永顺 84ed52dfde Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03 2024-07-15 11:36:41 +08:00
黎永顺 8df63d4a8c hotfix/2.14.2.2406.02 2024-07-15 11:35:53 +08:00
黎永顺 4d2058b180 hotfix/2.14.2.2406.02 2024-07-11 15:05:00 +08:00
黎永顺 acd27d2381 Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03 2024-07-02 15:07:28 +08:00
黎永顺 5a2ecefa6f hotfix/2.14.2.2406.02 2024-07-02 15:05:17 +08:00
黎永顺 b7ececb0c4 Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03 2024-06-28 17:00:13 +08:00
黎永顺 230aea8d62 hotfix/2.14.2.2406.02 2024-06-28 16:57:05 +08:00
黎永顺 e8793795ba Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03 2024-06-26 10:08:11 +08:00
黎永顺 3ee2ece60d hotfix/2.14.2.2406.02 2024-06-26 10:07:45 +08:00
黎永顺 210e788b38 Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03 2024-06-26 10:03:13 +08:00
黎永顺 da6a8266f6 hotfix/2.14.2.2406.02 2024-06-26 10:02:45 +08:00
黎永顺 bf0ce0ecac Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02 2024-06-21 10:44:32 +08:00
黎永顺 a4e072e3ee hotfix/2.14.2.2406.02 2024-06-21 10:05:47 +08:00
黎永顺 d2b8906773 Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02 2024-06-20 17:26:13 +08:00
黎永顺 6bb79ab685 hotfix/2.14.2.2406.02 2024-06-20 17:25:55 +08:00
黎永顺 d229730efe Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02 2024-06-20 17:18:32 +08:00
黎永顺 3ba1544842 hotfix/2.14.2.2406.02 2024-06-20 17:18:12 +08:00
黎永顺 9a9a934fb7 Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02 2024-06-20 14:06:36 +08:00
黎永顺 4d56e8284f hotfix/2.14.2.2406.02 2024-06-20 14:06:16 +08:00
黎永顺 7d47a0b4fd Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02 2024-06-20 11:17:50 +08:00
黎永顺 93c39cad41 hotfix/2.14.2.2406.02 2024-06-20 11:17:30 +08:00
黎永顺 4a5328791d Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02 2024-06-20 10:04:44 +08:00
黎永顺 6f29f9c56a hotfix/2.14.2.2406.02 2024-06-20 09:15:07 +08:00
黎永顺 c39515d7f9 hotfix/2.14.2.2406.02 2024-06-19 11:43:08 +08:00
黎永顺 823788e531 hotfix/2.14.2.2406.02 2024-06-19 11:24:59 +08:00
黎永顺 10c7903892 hotfix/2.14.2.2406.02 2024-06-18 17:48:08 +08:00
黎永顺 e50be3d3f3 Merge branch 'feature/2.14.4.2406.02-工资单发放预览' into release/2.14.4.2406.02 2024-06-18 15:31:19 +08:00
黎永顺 1c67adbd25 feature/2.14.4.2406.02-工资单发放预览 2024-06-18 15:30:46 +08:00
黎永顺 7221d910ca hotfix/2.14.2.240默认值 2024-06-18 10:44:48 +08:00
黎永顺 2e775eb205 feature/2.14.4.2406.02-工资单发放预览 2024-06-18 09:07:43 +08:00
黎永顺 40fe79c0e5 hotfix/2.14.2.2406.02 2024-06-17 17:24:21 +08:00
黎永顺 4ebb3a422e feature/2.14.4.2406.02-工资单发放预览 2024-06-17 17:20:01 +08:00
黎永顺 e0b6dc4585 feature/2.14.4.2406.02-工资单发放预览 2024-06-17 16:47:08 +08:00
黎永顺 add6a70abd hotfix/2.14.2.2406.02 2024-06-17 16:17:16 +08:00
黎永顺 f4cbacd591 hotfix/2.14.2.2406.02 2024-06-14 16:33:26 +08:00
黎永顺 24f9d7e57f hotfix/2.14.2.2406.02 2024-06-13 09:06:22 +08:00
黎永顺 c80a1c73fe hotfix/2.14.2.2406.02 2024-06-12 18:56:02 +08:00
黎永顺 1ddcab4f38 hotfix/2.14.2.2406.02 2024-06-12 17:38:34 +08:00
黎永顺 76db508066 产品优化 - 社保福利台账小数位数优化 2024-06-11 15:27:22 +08:00
黎永顺 15c81c8156 release/2.14.3.2406.01 2024-06-06 17:25:31 +08:00
黎永顺 1a2bf2bc6e 0release/2.14.3.2406.01 2024-06-05 09:10:04 +08:00
黎永顺 6d89db8dfe Merge branch 'feature/2.14.3.2406.01-薪资核算添加锁定人员数据' into release/2.14.3.2406.01 2024-05-30 17:07:50 +08:00
黎永顺 c9f4f23927 Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.3.2406.01 2024-05-30 17:07:21 +08:00
黎永顺 017a04a0c4 hotfix/2.14.2.2405.02 2024-05-30 14:15:55 +08:00
黎永顺 6bfde3d28f feature/2.14.3.2406.01-薪资核算添加锁定人员数据 2024-05-29 10:32:41 +08:00
黎永顺 c0079fe4b4 feature/2.14.3.2406.01-薪资核算添加锁定人员数据 2024-05-29 10:32:17 +08:00
黎永顺 c87e62815c Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.3.2406.01 2024-05-28 16:42:39 +08:00
黎永顺 411ba9744b hotfix/2.14.2.2405.02 2024-05-28 16:42:21 +08:00
黎永顺 3418bfe4aa hotfix/2.14.2.2405.02
公式编辑
2024-05-28 16:25:25 +08:00
黎永顺 53b6058b7e Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.2.2405.02 2024-05-28 11:42:42 +08:00
黎永顺 bd811da894 hotfix/2.14.2.2405.02
工资单查看报错
2024-05-28 11:42:26 +08:00
黎永顺 c6cc7c5cea Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.2.2405.02 2024-05-27 16:52:19 +08:00
黎永顺 9577462831 hotfix/2.14.2.2405.02 2024-05-24 09:57:35 +08:00
黎永顺 e0bec67c0b Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.2.2405.02 2024-05-23 15:42:51 +08:00
黎永顺 655dd6afb4 hotfix/2.14.2.2405.02 2024-05-23 15:42:14 +08:00
黎永顺 bf477457d7 Merge branch 'feature/2.12.1.2403.02-社保档案保存修改' into release/2.14.2.2405.02 2024-05-23 11:04:54 +08:00
黎永顺 a4b98f253c Merge branch 'feature/2.12.1.2404.02-薪资核算判断账套是否修改提示' into release/2.14.2.2405.02 2024-05-23 11:04:34 +08:00
黎永顺 b7aeae0aeb hotfix/2.14.2.2405.02 2024-05-23 11:01:06 +08:00
黎永顺 fb64d5e344 hotfix/2.14.2.2405.02 2024-05-21 17:33:47 +08:00
黎永顺 4eabe19035 hotfix/2.14.2.2405.02 2024-05-21 15:58:28 +08:00
黎永顺 fd6fb3bd9d hotfix/2.14.2.2405.02 2024-05-21 15:11:52 +08:00
黎永顺 8f8f6c5ed1 feature/2.12.1.2403.02-社保档案保存修改 2024-05-17 10:51:56 +08:00
黎永顺 888df02e07 hotfix/2.12.1.2405.01 2024-05-16 10:03:05 +08:00
黎永顺 a04be74c9c hotfix/2.12.1.2404.02 2024-05-13 17:06:41 +08:00
黎永顺 8f582ad3dd hotfix/2.12.1.2404.02 2024-05-11 15:06:47 +08:00
黎永顺 78142d32fe hotfix/2.12.1.2404.02 2024-05-11 11:33:09 +08:00
黎永顺 166dfa6979 hotfix/2.12.1.2404.02 2024-05-11 11:09:13 +08:00
黎永顺 342dacae9c hotfix/2.12.1.2404.02 2024-05-11 10:41:55 +08:00
黎永顺 aaf733fdd2 hotfix/2.12.1.2404.02
薪酬统计报表合计行展示列表优化
2024-05-10 16:33:02 +08:00
黎永顺 7cf0cc3357 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-05-07 14:13:12 +08:00
黎永顺 eeea664a8a feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-05-07 14:09:08 +08:00
黎永顺 3b90b1def4 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-05-07 10:48:52 +08:00
黎永顺 020af95921 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-05-06 16:58:42 +08:00
黎永顺 70d7449602 hotfix/2.12.1.2404.02 2024-05-06 10:21:55 +08:00
黎永顺 d8bad17514 hotfix/2.12.1.2404.02 2024-05-06 09:48:04 +08:00
黎永顺 29b5f9eb50 hotfix/2.12.1.2404.02 2024-04-29 17:55:37 +08:00
黎永顺 718d1929bb hotfix/2.12.1.2404.02 2024-04-29 11:27:49 +08:00
黎永顺 64bfb45618 hotfix/2.12.1.2404.02
薪酬统计报表修改表格
2024-04-28 13:48:20 +08:00
黎永顺 c43e69af5d hotfix/2.12.1.2404.02
薪酬统计报表数据透视 表格变形问题处理
2024-04-28 09:07:40 +08:00
黎永顺 ae427c033a feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-04-26 17:37:22 +08:00
黎永顺 2fb3c89947 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-04-26 16:53:51 +08:00
黎永顺 f1670a0380 hotfix/2.12.1.2404.02
档案tab总数显示的优化
2024-04-26 14:57:06 +08:00
黎永顺 8751c14002 hotfix/2.12.1.2404.02 2024-04-25 16:39:58 +08:00
黎永顺 825549595a hotfix/2.12.1.2404.02 2024-04-25 16:23:31 +08:00
黎永顺 7dee340ab8 hotfix/2.12.1.2404.02 2024-04-24 15:20:13 +08:00
黎永顺 0241c017b8 hotfix/2.12.1.2404.02
更多按钮
2024-04-24 10:42:04 +08:00
黎永顺 11618b6aff hotfix/2.12.1.2403.02 2024-04-17 14:44:30 +08:00
黎永顺 6d56f162b1 hotfix/2.12.1.2403.02 2024-04-16 17:10:31 +08:00
黎永顺 709ec6abd7 hotfix/2.12.1.2403.02
规则设置-加密解密修改
2024-04-15 16:07:41 +08:00
黎永顺 f8e78a97ac hotfix/2.12.1.2403.02
工资单发放页面去掉导出PDF的功能
2024-04-11 15:15:26 +08:00
黎永顺 bd3aa05c29 hotfix/2.12.1.2403.02 2024-04-07 13:59:51 +08:00
黎永顺 342aeed953 多语言bug 2024-04-02 17:45:59 +08:00
黎永顺 75bb200e9d release/2.12.1.2403.02
薪资明细以及薪资核算模板管理设置合并
2024-04-01 14:00:50 +08:00
黎永顺 223142e384 Merge branch 'feature/2.12.1.2403.02-薪资核算自定义导出模板设置' into release/2.12.1.2403.02 2024-04-01 13:59:18 +08:00
黎永顺 8dac6eab6b feature/2.12.1.2403.02-薪资核算自定义导出模板设置 2024-03-29 16:52:28 +08:00
黎永顺 3ab97c5a70 feature/2.12.1.2403.02-薪资核算自定义导出模板设置 2024-03-29 16:15:11 +08:00
黎永顺 8a7f3fcb7a feature/2.12.1.2403.02-薪资核算自定义导出模板设置 2024-03-29 14:37:49 +08:00
黎永顺 1fad3eabdf release/2.12.1.2403.02
暂时去掉薪酬统计报表中的薪资明细tab
2024-03-29 10:48:31 +08:00
黎永顺 e5f1ede772 hotfix/2.12.1.2403.02
工资单模板bug修复
2024-03-29 10:36:39 +08:00
黎永顺 a768470afb feature/2.12.1.2403.02-个税-外籍人员信息报送 2024-03-29 10:19:33 +08:00
黎永顺 9471a5a737 feature/2.12.1.2403.02-薪资核算自定义导出模板设置 2024-03-28 16:49:44 +08:00
黎永顺 15439581f4 feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
2024-03-27 14:07:25 +08:00
黎永顺 618c0edfb2 Merge branch 'release/2.12.1.2403.02' into hotfix/2.12.1.2403.02 2024-03-27 13:49:29 +08:00
黎永顺 e5078dc37b feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
2024-03-27 10:11:30 +08:00
黎永顺 7fcc3594e5 feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
2024-03-26 17:08:06 +08:00
黎永顺 8d58561b88 feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
2024-03-26 17:07:21 +08:00
黎永顺 85c222def8 feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2024-03-26 09:14:32 +08:00
黎永顺 c51c93c812 hotfix/2.12.1.2403.02
调薪列表样式修改
2024-03-25 17:23:42 +08:00
黎永顺 b1cba712d8 Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02 2024-03-21 13:49:51 +08:00
黎永顺 a7e75331e1 hotfix/2.12.1.2403.02
1、工资单发放-查看详情-高级搜索 部门能多选, 多选分部
2、社保福利台账:正常缴纳、补缴、退差、补差 高级搜索增加部门筛选,多分部筛选
2024-03-21 13:49:18 +08:00
黎永顺 1deceeb3e8 feature/2.12.1.2403.02-社保档案保存修改 2024-03-20 16:36:56 +08:00
黎永顺 59a2dbb300 Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02 2024-03-20 15:30:07 +08:00
黎永顺 272e45d3e5 hotfix/2.12.1.2403.02
薪资档案调薪,薪资小数位配置
2024-03-20 09:10:06 +08:00
黎永顺 8af1f0a79a hotfix/2.12.1.2403.02
完成导入报错的问题处理
2024-03-19 17:55:37 +08:00
黎永顺 d9f3fafd51 hotfix/2.12.1.2403.02
数据透视导出功能
2024-03-19 14:29:00 +08:00
黎永顺 90bfeedba3 Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02 2024-03-18 16:03:31 +08:00
黎永顺 80acc5f18a hotfix/2.12.1.2403.02 2024-03-18 16:03:04 +08:00
黎永顺 77cdcf2356 Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01 2024-03-15 15:09:54 +08:00
黎永顺 689c837749 hotfix/3.00.0.2403.01
考情管理修改
2024-03-15 15:09:16 +08:00