 黎永顺
|
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 |