Commit Graph

1398 Commits

Author SHA1 Message Date
黎永顺 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
黎永顺 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
黎永顺 a0771be0b9 Merge branch 'release/2.9.9.2312.01' 2023-12-12 10:55:27 +08:00
黎永顺 2e38e5a5c6 hotfix/2.9.9.2312.01
薪资核算导入下载模板
2023-12-12 10:25:02 +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
黎永顺 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
黎永顺 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
黎永顺 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
黎永顺 7d1b3f840f Merge branch 'release/2.9.42311.02' 2023-11-28 13:53:37 +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