Commit Graph

68 Commits

Author SHA1 Message Date
黎永顺 9f63f4e3a8 Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税 2023-12-07 16:03:04 +08:00
黎永顺 2b4b5623bc hotfix/2.9.9.2312.01
查看薪資核算页面添加权限,移动端薪资查看修改
2023-12-06 18:28:02 +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
黎永顺 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
黎永顺 198c7c8b76 Merge branch 'feature/2.9.42310.01-薪资项目拓扑图' into release/2.9.9.2312.01-个税 2023-11-29 15:08:46 +08:00
黎永顺 80cf2835d3 Merge branch 'master' into release/2.9.42311.02-个税 2023-11-28 15:25:28 +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
黎永顺 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
黎永顺 e21bbcb3f8 Merge branch 'feature/2.9.42310.01-个税申报表页面重构' into release/2.9.42310.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/index.js
#	pc4mobx/hrmSalary/pages/declare/index.less
#	pc4mobx/hrmSalary/stores/declare.js
2023-10-23 10:57:05 +08:00
黎永顺 d0aa6e93a0 feature/2.9.42310.01-薪资项目拓扑图 2023-10-20 10:27:00 +08:00
黎永顺 86980f33b0 Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/index.js
2023-10-19 13:39:53 +08:00
黎永顺 dadb749c4c feature/2.9.42310.01-工资单发放页面重构 2023-10-18 17:12:44 +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
黎永顺 f3e1e1e166 Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税 2023-10-08 16:14:59 +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
黎永顺 dac0ec3197 Merge branch 'release/2.9.42308.02' into release/2.9.42308.02-个税
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculateDetail/index.less
2023-09-04 09:32:57 +08:00
黎永顺 78e08d7c26 系统数字输入框保留小数位数配置 2023-08-25 16:12:05 +08:00
黎永顺 89b28b1d2e 个税在线申报-申报表导出功能的完成 2023-08-24 13:43:01 +08:00
黎永顺 c4d0dbf296 个税在线申报-个税申报表在线申报功能开发 2023-08-23 15:41:38 +08:00
黎永顺 55994f1980 个税对接-在线申报详情页面开发 2023-08-18 15:27:27 +08:00
黎永顺 892e0f10f9 Merge branch 'feature/2.8.3.2308-人员信息报送' into feature/v2-对接e10个税扣缴义务人设置-1121
# Conflicts:
#	pc4mobx/hrmSalary/index.js
2023-08-14 17:24:49 +08:00
黎永顺 a2c2292e60 汉桑-社保福利台账添加福利导入的功能 2023-08-11 16:06:21 +08:00
黎永顺 c2eb4400c4 Merge branch 'feature/2.8.3-2308-智能算薪' into feature/v2-对接e10个税扣缴义务人设置-1121 2023-08-09 11:47:37 +08:00
黎永顺 82b65d903b 产品-人员信息报送 2023-07-24 10:29:29 +08:00
黎永顺 aabcbd2519 产品-智能算薪 2023-07-19 17:27:39 +08:00
黎永顺 64797acaea 产品个税对接-个税扣缴义务人设置 2023-07-18 14:24:52 +08:00
黎永顺 37cb0f050a Merge branch 'master' into feature/v2-对接e10个税扣缴义务人设置-1121
# Conflicts:
#	pc4mobx/hrmSalary/util/index.js
2023-07-18 09:35:33 +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
黎永顺 80f6181219 个税扣缴义务人页面改造 2022-11-22 10:54:59 +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
18652063575 1d1ced8d77 社保福利台账添加线下对比的页面功能 2022-09-29 15:45:23 +08:00
18652063575 0cec0873fe 统一所有页面你的弹框以及抽屉头部组件 2022-09-13 16:39:15 +08:00