fcli
|
fdf343dbbd
|
fix: 字段管理可以切换薪资引用
|
2023-02-09 11:08:03 +08:00 |
|
fcli
|
0a1198f17d
|
fix: 个税扣缴义务人范围非空判断
|
2023-02-06 17:16:11 +08:00 |
|
fcli
|
78f8630465
|
feat: 薪资账套项目列表分权
|
2023-02-01 11:23:43 +08:00 |
|
fcli
|
e92ea00b02
|
fix: 薪资项目公式按分权处理。
薪资项目管理列表取出薪资档案引用列
|
2023-01-31 14:31:46 +08:00 |
|
fcli
|
da47210b22
|
fix: 薪资档案根据薪资项目分权展示
|
2023-01-31 14:05:40 +08:00 |
|
fcli
|
bd2597541d
|
feat: 字段管理
|
2023-01-18 09:38:43 +08:00 |
|
fcli
|
24e0e180be
|
feat: 薪资项目分权，修改查询
|
2023-01-12 14:20:09 +08:00 |
|
fcli
|
5aff04c834
|
feat: 薪资项目分权oracle异常问题
|
2023-01-12 14:19:54 +08:00 |
|
fcli
|
3ec5c34589
|
feat: 薪资项目分权oracle异常问题
|
2023-01-12 14:19:50 +08:00 |
|
fcli
|
f1bdd0ada9
|
feat: 薪资项目分权，修改落库
|
2023-01-12 14:19:46 +08:00 |
|
fcli
|
4bcd355254
|
feat: 薪资项目分权，修改查询
|
2023-01-12 14:19:43 +08:00 |
|
fcli
|
90b2edb96c
|
feat: 薪资项目分权代码合并
|
2023-01-12 14:19:39 +08:00 |
Harryxzy
|
4726b9560c
|
Merge branch 'fix/V3-backItemImportBug-1229' into release/2.5.2.22.12.04
|
2022-12-29 15:05:40 +08:00 |
|
Harryxzy
|
dd03efaf9e
|
Merge branch 'feature/V3-salaryArchiveAddWorkCode-1229' into release/2.5.2.22.12.04
|
2022-12-29 15:04:18 +08:00 |
sy
|
ea763bd20c
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountProcessDeal-1229' into release/2.5.2.22.12.04
|
2022-12-29 10:19:49 +08:00 |
|
sy
|
a9168afe58
|
薪酬系统-福利台账，初次核算前为台账项设置基础数值（socialPay,fundPay,otherPay）
|
2022-12-29 10:17:54 +08:00 |
|
sy
|
e4df660cd9
|
Merge branch 'feature/v3-siAccountProcessDeal-1229' into release/2.5.2.22.12.04
|
2022-12-29 10:07:22 +08:00 |
|
sy
|
42d57163a9
|
薪酬系统-福利台账，福利核算无核算人员时，直接进度完成
|
2022-12-29 10:05:52 +08:00 |
|
fcli
|
8ccc1a0ec3
|
Merge branch 'feature/加密方法&分页merge' into release/2.5.2.22.12.04
|
2022-12-28 15:43:33 +08:00 |
|
fcli
|
45292dfc4f
|
feat: null处理
|
2022-12-27 11:39:52 +08:00 |
|
Harryxzy
|
6262f62292
|
薪资回算Excel导入BUG
|
2022-12-26 23:17:32 +08:00 |
|
Harryxzy
|
d7127e29e4
|
薪资档案中默认显示工号
|
2022-12-26 14:58:41 +08:00 |
|
sy
|
c49017f63b
|
Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-23 18:45:48 +08:00 |
|
sy
|
011d66e298
|
薪酬系统-福利台账，补差数据导入，过滤未启用福利项
|
2022-12-23 18:45:10 +08:00 |
|
sy
|
fe5847aed6
|
Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-23 17:51:30 +08:00 |
|
sy
|
df2ac4754d
|
薪酬系统-福利台账，补差数据导入，缴纳费用非有效数值型数据，直接跳过
|
2022-12-23 17:50:12 +08:00 |
|
sy
|
cea78e6594
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-23 16:35:33 +08:00 |
|
sy
|
5f4ddeabd4
|
薪酬系统-福利台账，补差数据待编辑数据过滤空值字段
|
2022-12-23 16:34:12 +08:00 |
|
sy
|
d2be8e86ea
|
Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-22 09:09:00 +08:00 |
|
Harryxzy
|
43511f7922
|
Merge branch 'feature/V3-backItem-1215' into release/2.4.2.2212.03
|
2022-12-21 16:39:55 +08:00 |
|
sy
|
28d1d16844
|
薪酬系统-福利台账，补差数据参与薪资核算
|
2022-12-21 11:12:14 +08:00 |
 钱涛
|
85739933a5
|
单次核算5000
|
2022-12-20 16:45:09 +08:00 |
|
sy
|
e75d0c5872
|
薪酬系统-福利台账，补差数据导入逻辑问题修复,福利类合计为0时，不允许补差其包含的福利项
|
2022-12-20 15:20:42 +08:00 |
|
sy
|
cd671b5ae2
|
薪酬系统-福利台账，补差数据导入逻辑问题修复
|
2022-12-20 09:25:55 +08:00 |
|
Harryxzy
|
07292531db
|
重新回算提示
|
2022-12-19 18:03:17 +08:00 |
|
sy
|
547e7cd662
|
薪酬系统-福利台账，补差数据导入时，拒绝对于未设置社保、公积金、其他福利的正常缴纳项进行补差
|
2022-12-19 17:26:44 +08:00 |
|
sy
|
2f10986e2b
|
薪酬系统-福利台账，重新核算时，保留已有补差数据，但是bill_batch统计信息只统计补差相关缴费数额，不统计补差相关人数信息
|
2022-12-19 14:47:49 +08:00 |
|
sy
|
f1ebf947de
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208
|
2022-12-19 11:44:43 +08:00 |
|
sy
|
53d48d63b0
|
薪酬系统-福利台账，补差新增数据时，过滤重复数据
|
2022-12-19 11:43:20 +08:00 |
|
Harryxzy
|
ddea8c9066
|
回算工资单发放调整
|
2022-12-19 11:12:26 +08:00 |
|
sy
|
8157cafc98
|
薪酬系统-福利档案，取消停缴功能，添加人员是否在对应的个税扣缴义务人下的判断
|
2022-12-19 10:01:32 +08:00 |
|
钱涛
|
6ce7ef0b7e
|
Merge branch 'hotfix/处理流程操作者' into release/2.4.2.2212.03
|
2022-12-16 17:58:03 +08:00 |
|
fcli
|
4b2549f420
|
Merge branch 'feature/加密方法&分页merge' into release/2.4.2.2212.03
|
2022-12-16 17:57:17 +08:00 |
|
Harryxzy
|
eaa9b7515f
|
工资单发放详情模板名称调整
|
2022-12-16 15:53:34 +08:00 |
|
Harryxzy
|
0ace75ab06
|
工资单发放模板展示
|
2022-12-16 14:55:11 +08:00 |
|
Harryxzy
|
82577f97e0
|
舍入规则保存错误
|
2022-12-16 11:22:43 +08:00 |
|
sy
|
69e0d7e441
|
薪酬系统-福利台账，补差tab添加
|
2022-12-16 11:13:28 +08:00 |
|
钱涛
|
2fbd66ac19
|
操作者
|
2022-12-16 10:32:45 +08:00 |
|
fcli
|
c70964a8e2
|
feat: 继承类问题修改
|
2022-12-16 10:18:26 +08:00 |
|
fcli
|
bf870cc9aa
|
feat: 继承类问题修改
|
2022-12-16 10:11:41 +08:00 |