 黎永顺
|
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 |
|
黎永顺
|
196763681a
|
Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01
|
2024-03-15 09:20:34 +08:00 |
|
黎永顺
|
5e3c20edc0
|
release/3.0.0.2403.01
|
2024-03-15 09:19:59 +08:00 |
|
黎永顺
|
0a23b261b1
|
release/3.0.0.2403.01
|
2024-03-14 10:14:06 +08:00 |
|
黎永顺
|
0771ad9ed3
|
hotfix/3.0.0.2403.01
数据采集页面导入修改重构
|
2024-03-13 17:27:49 +08:00 |
|
黎永顺
|
ffaf5dc036
|
hotfix/3.0.0.2403.01
|
2024-03-13 14:23:08 +08:00 |
|
黎永顺
|
a12a097916
|
Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01
|
2024-03-13 11:23:30 +08:00 |
|
黎永顺
|
b1ddea5305
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-13 11:22:54 +08:00 |
|
黎永顺
|
dc49211090
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-13 09:26:29 +08:00 |
|
黎永顺
|
20796bc14c
|
Merge branch 'hotfix/2.10.1.2402.01' into release/3.0.0.2403.01
|
2024-03-12 09:37:44 +08:00 |
|
黎永顺
|
e4d272481c
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-11 17:19:20 +08:00 |
|
黎永顺
|
650f10a1ea
|
Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01
|
2024-03-08 10:22:00 +08:00 |
|
黎永顺
|
3b0f7bd5ce
|
薪酬报表设置修改
|
2024-03-07 10:31:56 +08:00 |
|
黎永顺
|
d1f8f5d9aa
|
薪酬报表修复
|
2024-03-07 10:10:04 +08:00 |
|
黎永顺
|
dbc68102dd
|
日志bug修复
|
2024-03-07 09:48:11 +08:00 |
|
黎永顺
|
f70d539ef4
|
日志bug修复
|
2024-03-07 09:09:07 +08:00 |
|
黎永顺
|
439ed5c822
|
hotfix/2.10.1.2402.01
|
2024-03-06 15:19:21 +08:00 |
|
黎永顺
|
0301618fc5
|
Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01
|
2024-03-06 14:33:55 +08:00 |
|
黎永顺
|
fce72a71fc
|
hotfix/2.10.1.2402.01
|
2024-03-06 14:33:28 +08:00 |
|
黎永顺
|
3c30951bd0
|
Merge branch 'feature/2.10.1.2402.01-社保台账导入缓存' into release/2.10.1.2402.01
|
2024-03-06 14:08:15 +08:00 |
|
黎永顺
|
87d699c59d
|
feature/2.10.1.2402.01-社保台账导入缓存
|
2024-03-06 14:04:47 +08:00 |
|
黎永顺
|
df9e9c9a21
|
feature/2.10.1.2402.01-社保台账导入缓存
|
2024-03-05 17:49:37 +08:00 |
|
黎永顺
|
f732bcaafb
|
Merge branch 'feature/2.10.1.2401.01-页面操作日志添加' into release/2.10.1.2402.01
# Conflicts:
# pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
# pc4mobx/hrmSalary/stores/baseForm.js
|
2024-03-05 14:38:57 +08:00 |
|
黎永顺
|
3f23bc29e5
|
Merge branch 'feature/2.10.1.2402.01-我的薪资福利显示基础配置' into release/2.10.1.2402.01
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2024-03-05 14:25:33 +08:00 |
|
黎永顺
|
91bc849b49
|
feature/2.10.1.2402.01-社保台账导入缓存
|
2024-03-05 14:23:13 +08:00 |
|
黎永顺
|
752eb6b6d1
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-28 16:42:15 +08:00 |
|
黎永顺
|
5e9a9c2822
|
hotfix/2.10.1.2402.01
薪酬统计报表设置添加薪资账套的设置项
|
2024-02-28 15:48:22 +08:00 |
|
黎永顺
|
194e575e25
|
hotfix/2.10.1.2402.01
|
2024-02-27 16:33:50 +08:00 |
|
黎永顺
|
07e19164d8
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-27 13:49:21 +08:00 |
|
黎永顺
|
86c5e50bb0
|
Merge branch 'hotfix/2.10.1.2402.01' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-27 11:34:28 +08:00 |
|
黎永顺
|
9120ee93d5
|
hotfix/2.10.1.2402.01
|
2024-02-27 11:32:54 +08:00 |
|
黎永顺
|
b42f9c8e13
|
feature/2.10.1.2402.01-我的薪资福利显示基础配置
|
2024-02-26 15:29:04 +08:00 |
|
黎永顺
|
ac479676e0
|
release/2.10.1.2402.01-个税
|
2024-02-23 17:38:42 +08:00 |
|
黎永顺
|
fe95424386
|
feature/2.10.1.2402.01-我的薪资福利显示基础配置
|
2024-02-23 16:20:29 +08:00 |
|
黎永顺
|
7b66f866df
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-23 15:59:06 +08:00 |
|
黎永顺
|
6f7b21ce5b
|
feature/2.10.1.2401.01-最优年终奖计税方案
|
2024-02-23 15:20:22 +08:00 |
|
黎永顺
|
7078b1c6c4
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-23 10:13:43 +08:00 |
|
黎永顺
|
949b907e89
|
Merge branch 'release/2.10.1.2401.02' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-21 10:50:36 +08:00 |
|
黎永顺
|
0e16bab13c
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-20 17:03:51 +08:00 |
|
黎永顺
|
eec52e34c1
|
Merge branch 'feature/2.10.1.2401.01-社保福利方案重构' into release/2.10.1.2401.02
|
2024-02-20 15:53:18 +08:00 |
|
黎永顺
|
2d6383eebc
|
Merge branch 'feature/2.10.1.2401.01-社保福利台账列表页面重构' into release/2.10.1.2401.02
|
2024-02-20 15:52:51 +08:00 |
|
黎永顺
|
e389d7f024
|
Merge branch 'feature/2.10.1.2401.01-工资单配置反馈开关' into release/2.10.1.2401.02
|
2024-02-20 15:52:20 +08:00 |
|
黎永顺
|
5afb7e107a
|
0release/2.10.1.2401.01
|
2024-02-20 15:45:31 +08:00 |
|
黎永顺
|
d6ec6c71e8
|
feature/2.10.1.2401.01-工资单配置反馈开关
|
2024-02-19 11:11:58 +08:00 |
|
黎永顺
|
4b95f6811f
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-19 09:03:40 +08:00 |
|
黎永顺
|
47608b0522
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-18 14:48:06 +08:00 |
|
黎永顺
|
5614a0da6d
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-06 17:36:15 +08:00 |
|
黎永顺
|
4be5c373ec
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-06 16:56:10 +08:00 |
|
黎永顺
|
dc624af9bd
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-05 14:53:38 +08:00 |
|
黎永顺
|
8ed92e793d
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-04 17:04:05 +08:00 |
|
黎永顺
|
d866cc07cf
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-02 16:09:03 +08:00 |
|
黎永顺
|
3c57000afc
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-01 14:04:55 +08:00 |
|
黎永顺
|
e2898441cf
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-31 11:37:20 +08:00 |
|
黎永顺
|
3093279f29
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-31 11:31:14 +08:00 |
|
黎永顺
|
9697e5aa81
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-31 11:29:16 +08:00 |
|
黎永顺
|
4a47fa1e85
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-31 11:27:40 +08:00 |
|
黎永顺
|
a6f382a36b
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-31 10:24:15 +08:00 |
|
黎永顺
|
169f90d44b
|
Merge branch 'feature/2.10.1.2401.01-社保福利台账列表页面重构' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-30 17:52:05 +08:00 |
|
黎永顺
|
671f0c42b4
|
Merge branch 'release/2.10.1.2401.01' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-30 17:38:14 +08:00 |
|
黎永顺
|
0b3c97a53f
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-30 17:34:02 +08:00 |
|
黎永顺
|
0e5c97d447
|
0release/2.10.1.2401.01
|
2024-01-30 16:59:05 +08:00 |
|
黎永顺
|
817f9767fc
|
feature/2.10.1.2401.01-工资单配置反馈开关
|
2024-01-30 16:57:21 +08:00 |
|
黎永顺
|
c260c31bf8
|
release/2.10.1.2401.01
bug修复
|
2024-01-30 15:48:42 +08:00 |
|
黎永顺
|
ba49afb85d
|
release/2.10.1.2401.01
bug修复
|
2024-01-30 15:46:37 +08:00 |
|
黎永顺
|
cf9d8f41e0
|
Merge branch 'feature/2.10.1.2401.01-工资单查看与调薪记录分开展示' into release/2.10.1.2401.01
|
2024-01-30 15:30:27 +08:00 |
|
黎永顺
|
5a65c42179
|
Merge branch 'feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置' into release/2.10.1.2401.01
|
2024-01-30 15:29:36 +08:00 |
|
黎永顺
|
095a833084
|
release/2.10.1.2401.01
|
2024-01-29 10:39:12 +08:00 |
|
黎永顺
|
13d67c5066
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-26 10:56:23 +08:00 |
|
黎永顺
|
93c17d1a35
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-26 10:25:32 +08:00 |
|
黎永顺
|
240cb316a1
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-26 09:57:30 +08:00 |
|
黎永顺
|
eb0ed15a15
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-26 09:38:08 +08:00 |
|
黎永顺
|
fe83bf0286
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-26 09:30:38 +08:00 |
|
黎永顺
|
1364c52674
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-25 17:56:56 +08:00 |
|
黎永顺
|
b638aea4b9
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-25 17:25:36 +08:00 |
|
黎永顺
|
314b3f594c
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-25 17:19:51 +08:00 |
|
黎永顺
|
876629e413
|
Merge branch 'release/2.10.1.2401.01' into feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-25 17:13:35 +08:00 |
|
黎永顺
|
866376e7de
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-25 16:47:55 +08:00 |
|
黎永顺
|
4242856f0e
|
release/2.10.1.2401.01
薪资档案-非系统人员调薪修改
|
2024-01-25 16:11:00 +08:00 |
|
黎永顺
|
b82ae4f4ce
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-25 15:45:33 +08:00 |
|
黎永顺
|
e86e4871d8
|
release/2.10.1.2401.01
|
2024-01-25 15:11:35 +08:00 |
|
黎永顺
|
f50257e1b5
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-25 15:09:30 +08:00 |
|
黎永顺
|
c45f1fe066
|
Merge branch 'hotfix/2.10.1.2401.01' into release/2.10.1.2401.01
|
2024-01-25 14:44:39 +08:00 |
|
黎永顺
|
9d0d04be9d
|
hotfix/2.10.1.2401.01
|
2024-01-25 14:44:12 +08:00 |
|
黎永顺
|
a07823c74a
|
0release/2.10.1.2401.01
|
2024-01-25 14:15:32 +08:00 |
|
黎永顺
|
8f8f2a32e9
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-25 14:02:34 +08:00 |
|
黎永顺
|
7cb1b157eb
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-25 11:52:10 +08:00 |
|
黎永顺
|
9e81e8244a
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-25 09:16:57 +08:00 |
|
黎永顺
|
9087e50aae
|
hotfix/2.10.1.2401.01
社保方案列表名称文字过长的处理
|
2024-01-24 17:30:26 +08:00 |
|
黎永顺
|
eb9d043d74
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-24 16:29:27 +08:00 |
|
黎永顺
|
687de497ae
|
feature/2.10.1.2401.01-社保福利台账列表页面重构
|
2024-01-24 15:37:09 +08:00 |
|
黎永顺
|
c6ad730e1e
|
feature/2.10.1.2401.01-社保福利台账列表页面重构
|
2024-01-24 13:50:45 +08:00 |
|
黎永顺
|
6a91ce8b3c
|
feature/2.10.1.2401.01-社保福利台账列表页面重构
|
2024-01-23 19:05:57 +08:00 |
|
黎永顺
|
e15a88b1f4
|
feature/2.10.1.2401.01-社保福利台账列表页面重构
|
2024-01-23 15:38:03 +08:00 |
|
黎永顺
|
e5d30f224b
|
feature/2.10.1.2401.01-社保福利台账列表页面重构
|
2024-01-23 10:51:38 +08:00 |
|
黎永顺
|
a4da6674c5
|
hotfix-2.9.10.2312.02
|
2024-01-19 17:30:41 +08:00 |
|
黎永顺
|
8d09f81115
|
release/2.9.10.2312.02
|
2024-01-19 10:00:36 +08:00 |
|
黎永顺
|
98f35401e6
|
release/2.9.10.2312.02
工资单样式修改
|
2024-01-18 14:44:24 +08:00 |
|
黎永顺
|
73716cee7d
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2024-01-17 11:12:09 +08:00 |
|
黎永顺
|
e4e9083fe9
|
1release/2.9.10.2312.02
|
2024-01-17 11:11:41 +08:00 |
 钱涛
|
f312e66017
|
工资单标题字体大小改为25px
|
2024-01-17 10:00:19 +08:00 |
|
黎永顺
|
1a38752cc6
|
1release/2.9.10.2312.02
|
2024-01-17 09:44:50 +08:00 |
|
黎永顺
|
93a0c76753
|
1release/2.9.10.2312.02
|
2024-01-16 16:23:29 +08:00 |
|
黎永顺
|
5a90471e74
|
1release/2.9.10.2312.02
|
2024-01-16 09:32:12 +08:00 |
|
黎永顺
|
9614583c3d
|
Merge branch 'feature/2.9.10.2312.02-薪资档案页面重构' into release/2.9.10.2312.02
|
2024-01-16 09:29:03 +08:00 |
|
黎永顺
|
38b7806b49
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-16 09:28:37 +08:00 |
|
黎永顺
|
4ef8cc66f8
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-15 19:24:49 +08:00 |
|
黎永顺
|
f4ac281c11
|
Merge branch 'feature/2.9.10.2312.02-薪资档案页面重构' into release/2.9.10.2312.02
|
2024-01-15 18:20:11 +08:00 |
|
黎永顺
|
30c73ccf88
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-15 18:18:26 +08:00 |
|
黎永顺
|
5895cf793c
|
hotfix/2.9.10.2312.02
工资单查看-移动端备注信息展示错误的修改
|
2024-01-15 10:15:41 +08:00 |
|
黎永顺
|
b5cfdb8b69
|
hotfix/2.9.10.2312.02
工资单查看-移动端备注信息展示错误的修改
|
2024-01-15 09:35:31 +08:00 |
|
黎永顺
|
43ff36d59f
|
hotfix/2.9.10.2312.02
工资单查看-移动端备注信息展示错误的修改
|
2024-01-15 09:34:49 +08:00 |
Harryxzy
|
12531b4ab3
|
240112temp2
|
2024-01-12 14:49:57 +08:00 |
|
Harryxzy
|
2ae026a657
|
240112temp
|
2024-01-12 14:49:24 +08:00 |
|
黎永顺
|
c6e71bd069
|
hotfix/2.9.10.2312.02
|
2024-01-11 14:50:28 +08:00 |
|
黎永顺
|
36f763a133
|
hotfix/2.9.10.2312.02
|
2024-01-11 14:23:14 +08:00 |
|
黎永顺
|
15bc21ecd5
|
release/2.9.10.2312.02
|
2024-01-10 14:43:07 +08:00 |
|
黎永顺
|
b7a3fcccfd
|
1release/2.9.10.2312.02
|
2024-01-09 17:44:36 +08:00 |
|
黎永顺
|
252d4e0ff7
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-09 17:42:40 +08:00 |
|
黎永顺
|
c01c03f1b0
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-08 16:05:00 +08:00 |
|
黎永顺
|
da7194d6b1
|
Merge branch 'feature/2.9.10.2312.02-社保档案个人和公司基数设置' into release/2.9.10.2312.02
|
2024-01-08 13:45:11 +08:00 |
|
黎永顺
|
3155c2eb89
|
Merge branch 'feature/2.9.42310.02-社保福利档案页面重构' into release/2.9.10.2312.02
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
|
2024-01-08 13:44:57 +08:00 |
|
黎永顺
|
cd9d67b358
|
Merge branch 'hotfix/2.9.10.2312.02' into release/2.9.10.2312.02
|
2024-01-08 13:43:00 +08:00 |
|
黎永顺
|
5e5acc012c
|
hotfix/2.9.10.2312.02
薪资项目添加显示宽度项
|
2024-01-04 18:36:20 +08:00 |
|
黎永顺
|
68e9fd5ad1
|
Merge branch 'feature/2.9.9.2312.01-工资单查看页面重构' into release/2.9.10.2312.02
|
2023-12-29 13:53:51 +08:00 |
|
黎永顺
|
69091b34ec
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-29 13:53:26 +08:00 |
|
黎永顺
|
3a83207915
|
Merge branch 'feature/2.9.9.2312.01-薪资核算查看权限' into release/2.9.10.2312.02
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
|
2023-12-29 10:14:39 +08:00 |
|
黎永顺
|
93ceea808d
|
Merge branch 'feature/2.9.9.2312.01-薪资核算列表在线编辑' into release/2.9.10.2312.02
|
2023-12-29 10:09:04 +08:00 |
|
黎永顺
|
6a7220ffc2
|
Merge branch 'feature/2.9.9.2312.01-工资单查看页面重构' into release/2.9.10.2312.02
|
2023-12-29 10:08:36 +08:00 |
|
黎永顺
|
1a8c6d5924
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-29 10:04:54 +08:00 |
|
黎永顺
|
d5fa8d7e84
|
hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
|
2023-12-25 14:54:55 +08:00 |
|
黎永顺
|
854949ab62
|
hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
|
2023-12-25 14:37:14 +08:00 |
|
黎永顺
|
238d97798a
|
hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
|
2023-12-22 14:42:27 +08:00 |
|
黎永顺
|
a59bc06d7a
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-20 13:25:47 +08:00 |
|
黎永顺
|
7db9e03b0d
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-20 10:18:58 +08:00 |
|
黎永顺
|
8bcf268ed0
|
hotfix/2.9.10.2312.02
|
2023-12-19 16:18:44 +08:00 |
|
黎永顺
|
446aaf2cad
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-15 13:37:21 +08:00 |
|
黎永顺
|
cf47cdeb56
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-14 14:14:32 +08:00 |
|
黎永顺
|
8c06171190
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-14 09:54:27 +08:00 |
|
黎永顺
|
670bbbbb75
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-13 17:21:16 +08:00 |
|
黎永顺
|
61f2b76440
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-13 11:12:18 +08:00 |
|
黎永顺
|
1eba04d9c8
|
Merge branch 'feature/2.9.42310.02-社保福利档案页面重构' into feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-13 10:21:14 +08:00 |
|
黎永顺
|
ffcb81650b
|
hotfix/2.9.10.2312.02
工资单模板bug修复
|
2023-12-13 10:19:37 +08:00 |
|
黎永顺
|
90ef0e1360
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-12-12 18:29:46 +08:00 |
|
黎永顺
|
8772a7eac7
|
Merge branch 'release/2.9.9.2312.01'
|
2023-12-12 17:19:23 +08:00 |
|
黎永顺
|
be8aceedaa
|
Merge branch 'release/2.9.9.2312.01'
|
2023-12-12 17:18:30 +08:00 |
|
黎永顺
|
a9bd1dc625
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-12-12 17:18:06 +08:00 |
|
黎永顺
|
41baa15ef2
|
hotfix/2.9.9.2312.01
|
2023-12-12 16:40:58 +08:00 |
|
黎永顺
|
4acefa765c
|
hotfix/2.9.9.2312.01
导入组件优化
|
2023-12-12 15:19:59 +08:00 |
|
黎永顺
|
b5dba954c6
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-12 13:41:59 +08:00 |
|
黎永顺
|
a0771be0b9
|
Merge branch 'release/2.9.9.2312.01'
|
2023-12-12 10:55:27 +08:00 |
|
黎永顺
|
717a88667c
|
feature/2.9.9.2312.01-薪资核算列表在线编辑
|
2023-12-12 10:41:33 +08:00 |
|
黎永顺
|
2e38e5a5c6
|
hotfix/2.9.9.2312.01
薪资核算导入下载模板
|
2023-12-12 10:25:02 +08:00 |
|
黎永顺
|
253ba3cc8c
|
薪资核算批量编辑
|
2023-12-11 13:32:17 +08:00 |
|
黎永顺
|
254d19c44e
|
薪资核算批量编辑
|
2023-12-11 13:31:46 +08:00 |
|
黎永顺
|
43012b2025
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-08 15:56:39 +08:00 |
|
黎永顺
|
3eb8c47a87
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-08 13:39:55 +08:00 |
|
黎永顺
|
5617392a7c
|
feature/2.9.9.2312.01-薪资核算查看权限
|
2023-12-08 09:19:43 +08:00 |
|
黎永顺
|
197849ecaa
|
Merge branch 'master' into feature/2.9.9.2312.01-薪资核算查看权限
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/calculate/calculate.js
|
2023-12-07 16:45:47 +08:00 |
|
黎永顺
|
23911d8e37
|
feature/2.9.9.2312.01-薪资核算查看权限
|
2023-12-07 16:44:38 +08:00 |
|
黎永顺
|
676d8d2850
|
Merge branch 'release/2.9.9.2312.01'
|
2023-12-07 16:35:19 +08:00 |
|
黎永顺
|
e4573bb95e
|
hotfix/2.9.9.2312.01
|
2023-12-07 13:55:52 +08:00 |
|
黎永顺
|
2864e1e446
|
feature/2.9.9.2312.01-薪资核算列表在线编辑
|
2023-12-07 09:40:34 +08:00 |
|
黎永顺
|
2b4b5623bc
|
hotfix/2.9.9.2312.01
查看薪資核算页面添加权限，移动端薪资查看修改
|
2023-12-06 18:28:02 +08:00 |
|
黎永顺
|
3dca9da904
|
hotfix/2.9.9.2312.01
|
2023-12-06 16:19:05 +08:00 |
|
黎永顺
|
8a8804f0c1
|
1release/2.9.9.2312.01
|
2023-12-06 15:55:44 +08:00 |
|
黎永顺
|
f1b0fc588a
|
1release/2.9.9.2312.01
|
2023-12-06 14:49:34 +08:00 |
|
黎永顺
|
bc78a26578
|
Merge branch 'feature/2.9.42311.02-我的薪资福利移动端列表查看' into release/2.9.9.2312.01
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2023-12-06 14:48:35 +08:00 |
|
黎永顺
|
6e56b436d6
|
feature/2.9.9.2312.01-薪资核算列表在线编辑-批量更新薪资项目项
|
2023-12-06 14:46:36 +08:00 |
|
黎永顺
|
72d02ad754
|
feature/2.9.9.2312.01-薪资核算列表在线编辑
|
2023-12-05 17:15:55 +08:00 |
|
黎永顺
|
143e9503e1
|
Merge branch 'feature/2.9.9.2312.01-社保核算以及薪资账套查询优化' into release/2.9.9.2312.01
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js
|
2023-12-05 11:34:00 +08:00 |
|
黎永顺
|
07c6ca839f
|
hotfix/2.9.9.2312.01
|
2023-12-01 17:56:16 +08:00 |
|
黎永顺
|
04ab495c25
|
hotfix/2.9.9.2312.01
|
2023-12-01 17:22:34 +08:00 |
|
黎永顺
|
78aaac8115
|
工资单修改
|
2023-12-01 16:39:31 +08:00 |
|
黎永顺
|
4448393373
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-12-01 11:21:01 +08:00 |
|
黎永顺
|
66392e6e10
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-12-01 09:25:33 +08:00 |
|
黎永顺
|
49eab11325
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-30 15:41:55 +08:00 |
|
黎永顺
|
b14c2f9f87
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-30 15:13:09 +08:00 |
|
黎永顺
|
f113cb437f
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-30 14:52:14 +08:00 |
|
黎永顺
|
36eb6eae6a
|
feature/2.9.9.2312.01-接口复写合并
|
2023-11-30 14:04:57 +08:00 |
|
黎永顺
|
39650fa172
|
Merge branch 'feature/2.9.42310.01-接口fetch重新封装' into feature/2.9.9.2312.01-接口复写合并
# Conflicts:
# pc4mobx/hrmSalary/apis/archive.js
|
2023-11-30 13:55:38 +08:00 |
|
黎永顺
|
2196dde486
|
Merge branch 'master' into hotfix/2.9.9.2312.01
|
2023-11-30 09:22:40 +08:00 |
|
黎永顺
|
4f23b8db3c
|
hotfix/2.9.9.2312.01
|
2023-11-30 09:22:35 +08:00 |
|
黎永顺
|
9949df47fb
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-30 09:10:59 +08:00 |
|
黎永顺
|
84d4df6d3d
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-29 18:29:55 +08:00 |
|
黎永顺
|
79fca386d3
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-29 14:02:53 +08:00 |
|
黎永顺
|
3da1d6964b
|
1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-28 15:24:48 +08:00 |
|
黎永顺
|
7cc9e422b1
|
1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-28 13:44:53 +08:00 |
|
黎永顺
|
23f15bd423
|
feature/2.9.42311.02-社保核算以及薪资账套查询优化
|
2023-11-27 19:17:44 +08:00 |
|
黎永顺
|
e01b5bf1c9
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-27 17:52:17 +08:00 |
|
黎永顺
|
5e60775029
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-27 17:45:11 +08:00 |
|
黎永顺
|
2c7633b0c9
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-27 15:29:07 +08:00 |
|
黎永顺
|
7579a8cd31
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-24 14:45:37 +08:00 |
|
黎永顺
|
24cf38e964
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02
|
2023-11-24 14:06:48 +08:00 |
|
黎永顺
|
bbb9bce35a
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-11-24 13:55:58 +08:00 |
|
黎永顺
|
c2f4c4372c
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-24 11:43:03 +08:00 |
|
黎永顺
|
6f9f24f7a8
|
feature/2.9.42310.01-工资单发放页面重构-添加短信设置的发送设置
|
2023-11-23 15:50:21 +08:00 |
|
黎永顺
|
94b3f056f4
|
hotfix/2.9.42311.02-我的薪资福利页面重构
|
2023-11-20 17:48:44 +08:00 |
|
黎永顺
|
373b0aad56
|
hotfix/2.9.42311.02
|
2023-11-17 13:33:56 +08:00 |
|
黎永顺
|
f4574570d9
|
hotfix/2.9.42311.02
|
2023-11-15 13:53:56 +08:00 |
|
黎永顺
|
f0b657f26e
|
Merge branch 'release/2.9.42311.02' into hotfix/2.9.42311.02
|
2023-11-15 13:32:40 +08:00 |
|
黎永顺
|
7dfd328aae
|
hotfix/2.9.42311.02
|
2023-11-14 14:45:13 +08:00 |