 黎永顺
|
ef16acd638
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-14 11:41:29 +08:00 |
|
黎永顺
|
38e2b1b61b
|
Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into release/2.8.3.2308.01
# Conflicts:
# pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
|
2023-08-17 08:43:43 +08:00 |
|
黎永顺
|
9633bcabfb
|
Merge branch 'feature/2.8.3.2308.01-社保福利方案自定义方案添加删除功能' into release/2.8.3.2308.01
|
2023-08-17 08:38:06 +08:00 |
|
黎永顺
|
290c3e51d3
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into release/2.8.3.2308.01
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
|
2023-08-17 08:37:56 +08:00 |
|
黎永顺
|
bc12a12097
|
产品-非系统人员管理导入
|
2023-08-01 17:44:59 +08:00 |
|
黎永顺
|
8071a62ec8
|
产品-社保福利方案自定义方案添加删除功能
|
2023-07-27 14:58:32 +08:00 |
|
黎永顺
|
ada5aee430
|
产品-社保档案基础信息修改
|
2023-07-25 16:16:39 +08:00 |
|
黎永顺
|
e963bcfb57
|
产品-社保档案基础信息修改
|
2023-07-24 18:22:24 +08:00 |
|
黎永顺
|
c062f172f6
|
Merge branch 'feature/V2-非系统人员管理开发' into release/2.8.3.2307.02
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-20 13:47:42 +08:00 |
|
黎永顺
|
88b6c23aed
|
Merge branch 'feature/2.8.3.2307.02-薪资核算按自定义列导出' into release/2.8.3.2307.02
|
2023-07-20 13:44:33 +08:00 |
|
黎永顺
|
57958f9bf9
|
产品-薪资核算按自定义列导出
|
2023-07-17 16:49:02 +08:00 |
|
黎永顺
|
bcecb87dc5
|
Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01
# Conflicts:
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
|
2023-07-17 14:44:05 +08:00 |
|
黎永顺
|
2af9059775
|
产品-工资单反馈跳转验证
|
2023-07-17 14:43:01 +08:00 |
|
黎永顺
|
25f2c2efd6
|
Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01
# Conflicts:
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-17 13:50:54 +08:00 |
|
黎永顺
|
1542d8c982
|
非系统人员配置功能
|
2023-07-14 14:09:27 +08:00 |
|
黎永顺
|
0650acb1fc
|
Merge branch 'feature/230701-工资单移动端查看二次密码验证设置' into release/2.8.3.2307.01
|
2023-07-13 09:43:41 +08:00 |
|
黎永顺
|
b8c8297cf0
|
产品-工资单反馈
|
2023-07-12 10:14:38 +08:00 |
|
黎永顺
|
ce50c9cf91
|
Merge branch 'release/2.8.3.2307.01' into feature/V2-非系统人员管理开发
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
# pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
# pc4mobx/hrmSalary/util/index.js
|
2023-07-11 17:36:38 +08:00 |
|
黎永顺
|
eb2d77e399
|
产品-工资单反馈
|
2023-07-11 17:27:45 +08:00 |
|
黎永顺
|
d8fdc8096b
|
产品-工资单模板移动端二次密码设置
|
2023-07-11 11:43:05 +08:00 |
|
黎永顺
|
9226ef19b3
|
产品-移动端二次验证密码设置
|
2023-07-10 09:21:57 +08:00 |
|
黎永顺
|
0c9d4cc47e
|
产品-个税申报撤回配置
|
2023-06-30 16:51:07 +08:00 |
|
黎永顺
|
9cea2259bc
|
产品-薪资档案社保福利档案删除功能开发完成
|
2023-06-30 16:13:46 +08:00 |
|
黎永顺
|
9ed8b79e64
|
产品-薪资核算详情页面以及薪资核算的线下对比页面添加查看权限功能
|
2023-06-27 17:11:52 +08:00 |
|
黎永顺
|
0b6571c04d
|
产品-系统设置添加薪资核算人员匹配规则
|
2023-06-19 13:49:31 +08:00 |
|
黎永顺
|
80a44a4a69
|
Merge branch 'feature/0616-工资单验证方式' into develop
|
2023-06-16 17:37:21 +08:00 |
|
黎永顺
|
adc34bb9b9
|
Merge branch 'feature/0612-个税申报表添加配置撤回的功能' into develop
|
2023-06-16 17:37:08 +08:00 |
|
黎永顺
|
ab3e5fbbf5
|
Merge branch 'feature/0612-工资单水印设置' into feature/0616-工资单验证方式
# Conflicts:
# pc4mobx/hrmSalary/apis/payroll.js
|
2023-06-16 15:33:15 +08:00 |
|
黎永顺
|
e9546e5329
|
产品-工资单验证方式
|
2023-06-16 15:32:05 +08:00 |
|
黎永顺
|
a80c4a37d5
|
产品-工资单验证方式修改
|
2023-06-16 11:12:20 +08:00 |
|
黎永顺
|
92c73b846a
|
产品-工资单水印设置与预览等功能
|
2023-06-15 18:28:06 +08:00 |
|
黎永顺
|
4d91a9b365
|
产品-个税申报表添加撤回的功能
|
2023-06-12 14:51:09 +08:00 |
|
黎永顺
|
5ed50dd98b
|
Merge branch 'feature/V2-数据透视' into release-2023-06-08
|
2023-06-08 11:28:38 +08:00 |
|
黎永顺
|
8f7a8e4192
|
产品-数据统计-数据透视
|
2023-06-08 11:24:05 +08:00 |
|
黎永顺
|
be6aadbe7e
|
产品-工资单发放添加发放设置以及添加进度条
|
2023-06-07 11:08:08 +08:00 |
|
黎永顺
|
e4495d6959
|
Merge branch 'feature/V2-薪酬统计分析' into develop
|
2023-05-26 16:06:19 +08:00 |
|
黎永顺
|
e3434bc953
|
薪酬统计分析-员工明细列表开发
|
2023-05-24 15:13:31 +08:00 |
|
黎永顺
|
ee72c81d9b
|
Merge branch 'feature/V2-工资单二次验证修改' into develop
|
2023-05-18 09:58:29 +08:00 |
|
黎永顺
|
eecd18cfa5
|
产品-工资单发放移动端页面权限认证
|
2023-05-18 09:06:17 +08:00 |
|
黎永顺
|
27d3762efa
|
Merge branch 'master' into feature/V2-薪酬统计分析
|
2023-05-16 14:09:01 +08:00 |
|
黎永顺
|
6c615453f7
|
产品-薪酬统计分析页面开发
|
2023-05-15 18:21:23 +08:00 |
|
黎永顺
|
8bd124c7dc
|
产品-薪酬统计分析报表
|
2023-05-12 10:18:39 +08:00 |
|
黎永顺
|
c0b4b2eb4a
|
Merge branch 'master' into feature/V2-公式编辑器
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2023-05-08 11:40:20 +08:00 |
|
黎永顺
|
d2c8928eba
|
Merge branch 'master' into feature/V2-薪酬统计分析
|
2023-04-28 10:53:05 +08:00 |
|
黎永顺
|
3fda510b57
|
产品-公式编辑器组件修改
|
2023-04-26 15:08:03 +08:00 |
|
黎永顺
|
c048565890
|
产品-薪酬统计分析管理
|
2023-04-24 16:25:07 +08:00 |
|
黎永顺
|
ac9aab6f5f
|
产品-薪酬统计分析管理
|
2023-04-24 09:28:25 +08:00 |
|
黎永顺
|
8f3320ae11
|
产品-薪酬统计分析管理
|
2023-04-23 11:28:18 +08:00 |
|
黎永顺
|
d09562355c
|
产品-薪酬统计分析管理
|
2023-04-19 09:29:38 +08:00 |
|
黎永顺
|
4929ff4db5
|
产品-薪酬统计分析
|
2023-04-17 17:32:16 +08:00 |