qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,796 Commits 181 Branches 0 Tags 9.3 MiB
Commit Graph

1785 Commits

Author SHA1 Message Date
黎永顺 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
黎永顺 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
黎永顺 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
黎永顺 1afaa04129 1release/2.9.42311.01 2023-11-09 15:36:13 +08:00
黎永顺 f0f4bfb877 feature/2.9.42310.02-社保福利档案页面重构 2023-11-09 13:54:34 +08:00
黎永顺 aa1cef89b2 feature/2.9.42310.02-社保福利档案页面重构 2023-11-09 13:52:54 +08:00
黎永顺 8252cebd98 1release/2.9.42311.01 2023-11-08 18:11:38 +08:00
黎永顺 84a908e94e feature/2.9.42310.02-社保福利档案页面重构 2023-11-08 16:14:10 +08:00
黎永顺 1eac37cd38 feature/2.9.42310.02-社保福利档案页面重构 2023-11-08 13:37:33 +08:00
黎永顺 a075c4a479 Merge branch 'feature/2.9.42310.01-社保档案操作日志' into release/2.9.42311.01 2023-11-07 19:16:27 +08:00
黎永顺 147d0908f1 Merge branch 'feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置' into release/2.9.42311.01 
# Conflicts:
#	pc4mobx/hrmSalary/apis/statistics.js
 2023-11-07 19:16:10 +08:00
黎永顺 8162e02796 feature/2.9.42310.02-社保福利档案页面重构 2023-11-07 19:13:38 +08:00
黎永顺 675d583557 feature/2.9.42310.02-社保福利档案页面重构 2023-11-07 16:57:47 +08:00
黎永顺 d9a7814080 feature/2.9.42310.01-接口fetch重新封装 2023-11-07 16:43:23 +08:00
黎永顺 5fd2120f14 feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置 2023-11-07 16:21:17 +08:00
黎永顺 858b694568 feature/2.9.42310.01-接口fetch重新封装 2023-11-07 11:26:08 +08:00
黎永顺 4c7b3f9a6a feature/2.9.42310.02-社保福利档案页面重构 2023-11-07 10:28:44 +08:00
黎永顺 8bd1cd51af feature/2.9.42310.02-薪酬统计报表统计项目设置 2023-11-06 17:05:26 +08:00
黎永顺 eefa47164a feature/2.9.42310.02-社保福利档案页面重构 2023-11-06 16:09:23 +08:00
黎永顺 560af8a703 feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
黎永顺 68bd42c2c0 feature/2.9.42310.02-社保福利档案页面重构 2023-11-03 09:54:02 +08:00
黎永顺 b0500cf8f9 feature/2.9.42310.02-社保福利档案页面重构 2023-11-02 18:17:30 +08:00
黎永顺 a617c40c1f feature/2.9.42310.02-社保福利档案页面重构 2023-11-02 16:33:16 +08:00
黎永顺 f9f47324e5 feature/2.9.42310.02-薪酬统计报表统计项目设置 2023-11-02 14:30:18 +08:00
黎永顺 8a3a1dcf76 feature/2.9.42310.02-社保福利档案页面重构 2023-11-02 09:18:16 +08:00
黎永顺 121d82d379 feature/2.9.42310.02-社保福利档案页面重构 2023-11-01 16:18:51 +08:00
黎永顺 b2dda3a728 feature/2.9.42310.02-社保福利档案页面重构 2023-11-01 09:10:28 +08:00
黎永顺 c068959e73 feature/2.9.42310.02-社保福利档案页面重构 2023-10-31 16:59:50 +08:00
黎永顺 a21982bf62 hotfix/2.9.42310.02 2023-10-31 15:50:52 +08:00
黎永顺 6aed11a411 hotfix/2.9.42310.02 2023-10-31 15:45:15 +08:00
黎永顺 b14fce7949 feature/2.9.42310.02-社保福利档案页面重构 2023-10-31 15:30:21 +08:00
黎永顺 cd9964a329 Merge branch 'hotfix/2.9.42310.02' into develop 2023-10-31 09:44:59 +08:00
黎永顺 e246e10af7 hotfix/2.9.42310.02 2023-10-30 15:54:25 +08:00
黎永顺 4acdff060c hotfix/2.9.42310.02 2023-10-30 08:55:15 +08:00
黎永顺 015e29ac47 Merge branch 'feature/2.9.42310.01-薪资项目拓扑图' into develop 2023-10-27 17:28:21 +08:00
黎永顺 c44f92fb56 Merge branch 'hotfix/2.9.42310.02' into develop 2023-10-27 17:28:11 +08:00
黎永顺 32e01016c1 hotfix/2.9.42310.02 2023-10-27 16:27:01 +08:00
黎永顺 eed8d3a5bd feature/2.9.42310.01-薪资项目拓扑图 2023-10-27 16:14:59 +08:00
黎永顺 235e7cc6f0 feature/2.9.42310.01-薪资项目拓扑图 2023-10-27 10:43:23 +08:00
黎永顺 7d09c5b55b hotfix/2.9.42310.02 
数据采集日期组件选择失败的bug处理
 2023-10-25 15:45:38 +08:00
黎永顺 d75aac6bf7 Merge branch 'hotfix/2.9.42310.02' into develop 2023-10-24 18:38:38 +08:00
黎永顺 d0cc845911 hotfix/2.9.42310.02 2023-10-23 18:38:07 +08:00
黎永顺 63dcd77589 Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into develop 2023-10-23 18:30:47 +08:00
黎永顺 4a392f2357 Merge branch 'hotfix/2.9.42310.02' into develop 2023-10-23 18:30:35 +08:00
黎永顺 bc28d4ea2f Merge branch 'feature/2.9.42310.01-社保档案操作日志' into develop 2023-10-23 18:30:25 +08:00
黎永顺 967d0bacd1 feature/2.9.42310.01-社保档案操作日志 2023-10-23 18:28:29 +08:00
黎永顺 510e46045e feature/2.9.42310.01-社保档案操作日志 2023-10-23 18:06:09 +08:00
黎永顺 8b7bb221e2 feature/2.9.42310.01-社保档案操作日志 2023-10-23 17:37:17 +08:00
黎永顺 452c22c262 feature/2.9.42310.01-社保档案操作日志 2023-10-23 15:29:26 +08:00
黎永顺 d075fceb05 hotfix/2.9.42310.01 2023-10-20 14:41:42 +08:00
黎永顺 4898ff8335 hotfix/2.9.42310.01 2023-10-20 11:39:20 +08:00
黎永顺 26b25e04df hotfix/2.9.42310.01 2023-10-20 11:21:14 +08:00
黎永顺 f78a59285a hotfix/2.9.42310.01 2023-10-20 11:18:27 +08:00
黎永顺 d0aa6e93a0 feature/2.9.42310.01-薪资项目拓扑图 2023-10-20 10:27:00 +08:00
黎永顺 fafbfbe253 Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-19 13:38:26 +08:00
黎永顺 8838566b05 hotfix/2.9.42310.01 2023-10-19 13:38:00 +08:00
黎永顺 bec2e5a5b2 feature/2.9.42310.01-工资单发放页面重构 2023-10-19 11:51:41 +08:00
黎永顺 5031d3a032 feature/2.9.42310.01-工资单发放页面重构 2023-10-19 09:42:46 +08:00
黎永顺 3dd6ede31c Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-18 17:19:14 +08:00
黎永顺 429853a6a6 hotfix/2.9.42310.01 
公式测试结果显示修改
 2023-10-18 17:18:44 +08:00
黎永顺 dadb749c4c feature/2.9.42310.01-工资单发放页面重构 2023-10-18 17:12:44 +08:00
黎永顺 55c6fd80be hotfix/2.9.42310.01-社保福利档案非系统人员tab显示控制 2023-10-18 11:09:37 +08:00
黎永顺 50b56c76d1 Merge branch 'hotfix/2.9.42310.01' into develop 2023-10-18 10:40:51 +08:00
黎永顺 2256d9e0a1 Merge branch 'feature/2.9.42310.01-调薪记录' into develop 2023-10-18 10:40:20 +08:00
黎永顺 a61e6eb847 Merge branch 'feature/2.9.42310.01-调薪记录' into release/2.9.42310.01 2023-10-18 10:25:08 +08:00
黎永顺 4519401f64 Merge branch 'feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换' into release/2.9.42310.01 2023-10-18 10:24:54 +08:00
黎永顺 5a78344e2f Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-18 10:24:41 +08:00
黎永顺 db166275c4 hotfix/2.9.42310.01-社保福利档案非系统人员tab显示控制 2023-10-18 10:24:13 +08:00
黎永顺 0acc570a24 feature/2.9.42310.01-工资单发放页面重构单 2023-10-18 10:18:26 +08:00
黎永顺 7e30f73069 feature/2.9.42310.01-工资单发放页面重构单 2023-10-17 17:17:01 +08:00
黎永顺 2e613014fe feature/2.9.42310.01-工资单发放页面重构 2023-10-17 09:17:37 +08:00
黎永顺 6ea39d8255 feature/2.9.42310.01-工资单发放页面重构 2023-10-16 16:09:30 +08:00
黎永顺 9a03c6ad8b feature/2.9.42310.01-调薪记录 2023-10-16 15:27:29 +08:00
黎永顺 984192fdf2 Merge branch 'release/2.9.42310.01' into feature/2.9.42310.01-调薪记录 2023-10-16 14:13:53 +08:00
黎永顺 3c9cf1c730 feature/2.9.42310.01-工资单发放页面重构 2023-10-16 11:13:44 +08:00
黎永顺 c2efaf193b feature/2.9.42310.01-工资单发放页面重构 2023-10-13 15:53:43 +08:00
黎永顺 53ddc607b3 feature/2.9.42310.01-工资单发放页面重构 2023-10-13 14:52:59 +08:00
黎永顺 79a3f460e7 feature/2.9.42310.01-工资单发放页面重构 2023-10-13 10:57:47 +08:00
黎永顺 ab3be2c1f9 feature/2.9.42310.01-工资单发放页面重构 2023-10-13 10:20:14 +08:00
黎永顺 7b79fe5dc5 feature/2.9.42310.01-调薪记录 2023-10-13 09:51:50 +08:00
黎永顺 02863814ba feature/2.9.42310.01-工资单发放页面重构 2023-10-13 09:17:54 +08:00
黎永顺 89d6eebf77 Merge branch 'feature/2.9.42310.01-个税申报表页面重构' into develop 2023-10-12 15:52:54 +08:00
黎永顺 9f4e8468e7 Merge branch 'feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换' into develop 2023-10-12 15:52:44 +08:00
黎永顺 b260a41c7e feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换 2023-10-12 15:52:15 +08:00
黎永顺 618d9f12cd Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-12 14:14:42 +08:00
黎永顺 f2027627f4 hotfix/2.9.42310.01 2023-10-12 14:08:48 +08:00
黎永顺 ca5b60f6aa feature/2.9.42310.01-个税申报表页面重构 2023-10-12 13:57:14 +08:00
黎永顺 4d76443438 Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-11 18:23:44 +08:00
黎永顺 d67b8bc6ab hotfix/2.9.42310.01 2023-10-11 18:23:19 +08:00
黎永顺 afc4ad4d1d Merge branch 'feature/2.9.42310.01-薪资核算页面重构' into develop 2023-10-11 16:43:01 +08:00
黎永顺 9e5e941a3f Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into develop 2023-10-11 16:42:33 +08:00