Commit Graph

70 Commits

Author SHA1 Message Date
黎永顺 888df02e07 hotfix/2.12.1.2405.01 2024-05-16 10:03:05 +08:00
黎永顺 85c222def8 feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2024-03-26 09:14:32 +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
黎永顺 194e575e25 hotfix/2.10.1.2402.01 2024-02-27 16:33:50 +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
黎永顺 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
黎永顺 d866cc07cf feature/2.10.1.2401.01-社保福利方案重构 2024-02-02 16:09:03 +08:00
黎永顺 f50257e1b5 feature/2.10.1.2401.01-工资单查看与调薪记录分开展示 2024-01-25 15:09:30 +08:00
黎永顺 e5d30f224b feature/2.10.1.2401.01-社保福利台账列表页面重构 2024-01-23 10:51:38 +08:00
黎永顺 c01c03f1b0 feature/2.9.10.2312.02-薪资档案页面重构 2024-01-08 16:05:00 +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
黎永顺 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
黎永顺 2b4b5623bc hotfix/2.9.9.2312.01
查看薪資核算页面添加权限,移动端薪资查看修改
2023-12-06 18:28:02 +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
黎永顺 24cf38e964 Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02 2023-11-24 14:06:48 +08:00
黎永顺 94b3f056f4 hotfix/2.9.42311.02-我的薪资福利页面重构 2023-11-20 17:48:44 +08:00
黎永顺 0a1173faaa feature/2.9.42311.02-我的薪资福利移动端列表查看 2023-11-13 10:41:47 +08:00
黎永顺 b14fce7949 feature/2.9.42310.02-社保福利档案页面重构 2023-10-31 15:30:21 +08:00
黎永顺 015e29ac47 Merge branch 'feature/2.9.42310.01-薪资项目拓扑图' into develop 2023-10-27 17:28:21 +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
黎永顺 63dcd77589 Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into develop 2023-10-23 18:30:47 +08:00
黎永顺 d0aa6e93a0 feature/2.9.42310.01-薪资项目拓扑图 2023-10-20 10:27:00 +08:00
黎永顺 dadb749c4c feature/2.9.42310.01-工资单发放页面重构 2023-10-18 17:12:44 +08:00
黎永顺 2256d9e0a1 Merge branch 'feature/2.9.42310.01-调薪记录' into develop 2023-10-18 10:40:20 +08:00
黎永顺 984192fdf2 Merge branch 'release/2.9.42310.01' into feature/2.9.42310.01-调薪记录 2023-10-16 14:13:53 +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
黎永顺 ca5b60f6aa feature/2.9.42310.01-个税申报表页面重构 2023-10-12 13:57:14 +08:00
黎永顺 321275d406 feature/2.9.42310.01-薪资核算页面重构 2023-10-09 13:17:54 +08:00
黎永顺 06f19c74db feature/2.9.42310.01-工资单发放导出PDF
20230926
2023-09-27 09:13:02 +08:00
黎永顺 8a90d58196 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-14 10:25:22 +08:00
黎永顺 78e08d7c26 系统数字输入框保留小数位数配置 2023-08-25 16:12:05 +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
黎永顺 92c73b846a 产品-工资单水印设置与预览等功能 2023-06-15 18:28:06 +08:00
黎永顺 93d07961c7 薪酬统计分析-员工明细列表开发 2023-05-25 13:27:17 +08:00
黎永顺 7c60a44e66 产品-薪酬统计分析模块 2023-04-20 15:36:51 +08:00
黎永顺 dfae2661a6 产品功能-薪酬统计分析 2023-04-11 13:41:56 +08:00
黎永顺 a6cf191c29 非系统人员管理-新功能开发 2023-03-13 10:43:25 +08:00
黎永顺 b8f941d575 新增的字段管理页面样式修改 2023-02-07 15:18:30 +08:00
黎永顺 cd897394b6 字段管理 2023-01-28 10:10:00 +08:00
黎永顺 2631e8065e 薪资账套页面重构 2022-12-06 16:06:35 +08:00
黎永顺 a5213cb370 薪资档案的发薪员工页面的调薪记录添加编辑和删除的功能 2022-11-15 15:42:09 +08:00
18652063575 72478c3fd8 专项附加扣除模块 2022-11-03 17:52:02 +08:00
18652063575 d7fcdd2637 薪资档案以及社保福利档案页面添加四个tab的列表查询 2022-10-17 10:03:01 +08:00