 黎永顺
|
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 |
|
黎永顺
|
1a57f4e392
|
release/2.9.9.2312.02-个税
|
2023-12-18 14:56:18 +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 |
|
黎永顺
|
8cd49ed05b
|
Merge branch 'hotfix/2.9.9.2312.01-个税' into release/2.9.9.2312.01-个税
|
2023-12-08 19:32:34 +08:00 |
|
黎永顺
|
c50f9c0056
|
hotfix/2.9.9.2312.01-个税
|
2023-12-08 19:32:06 +08:00 |
|
黎永顺
|
3be7f6cd50
|
hotfix/2.9.9.2312.01-个税
|
2023-12-08 19:09:52 +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 |
|
黎永顺
|
9f63f4e3a8
|
Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税
|
2023-12-07 16:03:04 +08:00 |
|
黎永顺
|
4fc6d1fabd
|
hotfix/2.9.9.2312.01-个税
个税扣缴义务人部门备案
|
2023-12-07 15:43:37 +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 |
|
黎永顺
|
f4adb94893
|
release/2.9.9.2312.01-个税
|
2023-12-06 18:51:17 +08:00 |
|
黎永顺
|
2b4b5623bc
|
hotfix/2.9.9.2312.01
查看薪資核算页面添加权限，移动端薪资查看修改
|
2023-12-06 18:28:02 +08:00 |
|
黎永顺
|
49ade22f26
|
release/2.9.9.2312.01-个税
人员信息报送导出的功能开发
|
2023-12-06 17:06:44 +08:00 |
|
黎永顺
|
a8ce369ce6
|
Merge branch 'hotfix/2.9.9.2312.01' into release/2.9.9.2312.01-个税
|
2023-12-06 16:22:19 +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 |
|
黎永顺
|
beddc62901
|
Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税
|
2023-12-06 14:50:24 +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 |
|
黎永顺
|
3638249033
|
release/2.9.9.2312.01-个税
|
2023-12-05 17:22:41 +08:00 |
|
黎永顺
|
ce1acae344
|
Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税
|
2023-12-05 17:16:37 +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 |
|
黎永顺
|
7fd754ad0f
|
release/2.9.9.2312.01-个税
|
2023-11-30 13:48:33 +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 |
|
黎永顺
|
b163858722
|
release/2.9.9.2312.01-个税
|
2023-11-29 15:38:10 +08:00 |
|
黎永顺
|
198c7c8b76
|
Merge branch 'feature/2.9.42310.01-薪资项目拓扑图' into release/2.9.9.2312.01-个税
|
2023-11-29 15:08:46 +08:00 |
|
黎永顺
|
79fca386d3
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-29 14:02:53 +08:00 |
|
黎永顺
|
80cf2835d3
|
Merge branch 'master' into release/2.9.42311.02-个税
|
2023-11-28 15:25:28 +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 |
|
黎永顺
|
4ffd2731ee
|
Merge branch 'hotfix/2.9.42311.02' into release/2.9.42311.02-个税
|
2023-11-17 13:47:56 +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 |
|
黎永顺
|
ff870c110c
|
hotfix/2.9.42311.02-薪资核算名称修改
|
2023-11-13 16:51:40 +08:00 |
|
黎永顺
|
f51de57661
|
feature/2.9.42311.02-我的薪资福利移动端列表查看
|
2023-11-13 15:49:45 +08:00 |
|
黎永顺
|
1d110fe25d
|
feature/2.9.42311.02-我的薪资福利移动端列表查看
|
2023-11-13 15:35:43 +08:00 |
|
黎永顺
|
115a0ee64f
|
Merge branch 'hotfix/2.9.42311.02'
|
2023-11-13 14:18:16 +08:00 |
|
黎永顺
|
0798d2bf96
|
hotfix/2.9.42311.02
|
2023-11-13 14:15:49 +08:00 |
|
黎永顺
|
3ab54027f9
|
feature/2.9.42311.02-我的薪资福利移动端列表查看
|
2023-11-13 14:13:03 +08:00 |
|
黎永顺
|
9f114e9867
|
hotfix/2.9.42311.02
|
2023-11-13 11:17:38 +08:00 |
|
黎永顺
|
28c50dc563
|
hotfix/2.9.42311.02
|
2023-11-13 11:03:19 +08:00 |
|
黎永顺
|
0a1173faaa
|
feature/2.9.42311.02-我的薪资福利移动端列表查看
|
2023-11-13 10:41:47 +08:00 |
|
黎永顺
|
3ec45fc1ba
|
Merge branch 'release/2.9.42311.01' into release/2.9.42311.01-个税
|
2023-11-10 13:35:41 +08:00 |
|
黎永顺
|
d46f40b086
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-10 13:34:36 +08:00 |
|
黎永顺
|
436db457db
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-09 17:51:38 +08:00 |
|
黎永顺
|
7908f925ea
|
release/2.9.42311.01
|
2023-11-09 16:27:33 +08:00 |
|
黎永顺
|
c194711c78
|
Merge branch 'release/2.9.42311.01' into release/2.9.42310.01-个税
|
2023-11-09 15:36:38 +08:00 |