 钱涛
|
6792b4c5aa
|
Merge branch 'feature/通过userid查询工资单详情'
|
2023-02-10 16:45:45 +08:00 |
|
钱涛
|
d1b4ae4a0b
|
过滤
|
2023-02-10 16:38:43 +08:00 |
Harryxzy
|
3b657db52a
|
线下对比Oracle导入报错
|
2023-02-10 09:59:18 +08:00 |
|
Harryxzy
|
510a2e7d29
|
处理工资单发放历史数据执行时间提前
|
2023-02-09 19:43:43 +08:00 |
|
Harryxzy
|
d30870e28d
|
调薪不支持字符
|
2023-02-09 19:24:25 +08:00 |
|
钱涛
|
4186526743
|
Merge remote-tracking branch 'origin/release/2.6.1.2301.02' into release/2.6.1.2301.02
|
2023-02-09 19:04:02 +08:00 |
|
钱涛
|
0f9222e1e4
|
fix年终奖申报备注为0
|
2023-02-09 19:03:53 +08:00 |
fcli
|
5b50903b55
|
Merge branch 'feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02
|
2023-02-09 18:48:35 +08:00 |
|
fcli
|
e99abfddcd
|
feat: 保存更新判断薪资档案引用
|
2023-02-09 18:47:48 +08:00 |
|
Harryxzy
|
cbc1c13e4d
|
Merge branch 'feature/V3-TaxAgentImport_AddState-0209' into release/2.6.1.2301.02
|
2023-02-09 17:40:49 +08:00 |
|
钱涛
|
8d011d8d49
|
Merge branch 'feature/账套群组不变' into release/2.6.1.2301.02
|
2023-02-09 17:32:00 +08:00 |
|
钱涛
|
995689bb1d
|
Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02
|
2023-02-09 17:31:42 +08:00 |
|
钱涛
|
5feed81803
|
Merge branch 'feature/通过userid查询工资单详情' into release/2.6.1.2301.02
|
2023-02-09 17:31:34 +08:00 |
sy
|
ba267d9dce
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siSchemeAddPaymentCycle-0202' into release/2.6.1.2301.02
|
2023-02-09 17:24:29 +08:00 |
|
fcli
|
308a44a9a6
|
Merge remote-tracking branch 'origin/feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02
|
2023-02-09 17:23:07 +08:00 |
|
fcli
|
5ee8097b3e
|
Merge branch 'feat/salaryBillSaveItem042' into release/2.6.1.2301.02
|
2023-02-09 17:22:53 +08:00 |
|
钱涛
|
b6429eb41c
|
通过id查询工资单详情
|
2023-02-09 17:05:07 +08:00 |
|
钱涛
|
2c37086e70
|
账套群组保持不变
|
2023-02-09 15:33:35 +08:00 |
|
fcli
|
fdf343dbbd
|
fix: 字段管理可以切换薪资引用
|
2023-02-09 11:08:03 +08:00 |
|
Harryxzy
|
69dd9cc61c
|
个税扣缴义务人、薪资账套 导入添加员工状态导入功能
|
2023-02-08 17:48:14 +08:00 |
|
sy
|
390d2d7851
|
薪酬系统-福利台账，补缴起始缴纳月之前的福利默认为空
|
2023-02-08 14:50:45 +08:00 |
|
sy
|
5657d5cc64
|
薪酬系统-福利台账，福利补缴方式一和二不允许补缴起始缴纳月之前的月份
|
2023-02-08 13:04:23 +08:00 |
|
Harryxzy
|
22027cde6b
|
Merge branch 'fix/MySalaryPageBug' into release/2.6.1.2301.02
|
2023-02-08 12:14:39 +08:00 |
|
Harryxzy
|
091221d0d4
|
我的薪资福利分页BUG
|
2023-02-08 12:12:45 +08:00 |
|
sy
|
de5b5d4c19
|
薪酬系统-福利台账，福利缴纳周期核算时考虑起始缴纳月相关逻辑，福利补缴不允许补缴起始缴纳月之前的月份
|
2023-02-08 11:33:17 +08:00 |
|
fcli
|
0a1198f17d
|
fix: 个税扣缴义务人范围非空判断
|
2023-02-06 17:16:11 +08:00 |
|
钱涛
|
2ff5ff0dce
|
考勤列表和导出
|
2023-02-06 16:28:56 +08:00 |
|
钱涛
|
0fb9fb51a0
|
修复调薪记录显示问题
|
2023-02-06 11:08:59 +08:00 |
|
钱涛
|
a3775babd3
|
考勤引用
|
2023-02-06 10:33:12 +08:00 |
|
sy
|
45d9fa4c12
|
薪酬系统-福利台账，补缴核算时按照补缴月份考虑缴纳周期
|
2023-02-03 17:04:30 +08:00 |
|
sy
|
9a4b58b2ee
|
薪酬系统-福利台账，只勾选医疗保险和养老保险时的补缴核算过程加入福利方案缴纳周期逻辑
|
2023-02-03 13:38:12 +08:00 |
|
钱涛
|
cdfced412f
|
Merge branch 'feature/年终奖' into release/2.6.1.2301.02
|
2023-02-02 16:13:05 +08:00 |
|
钱涛
|
abdd85effd
|
Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02
|
2023-02-02 16:12:41 +08:00 |
|
fcli
|
003dfe0d35
|
feat: 请求方式修改
|
2023-02-02 15:47:17 +08:00 |
|
sy
|
2e7ea046f2
|
薪酬系统-福利台账，补缴核算过程加入福利方案缴纳周期逻辑
|
2023-02-02 14:47:39 +08:00 |
|
钱涛
|
810cfe7f5e
|
考勤引用本身报表
|
2023-02-01 14:03:13 +08:00 |
|
fcli
|
3f145e133b
|
feat: 添加是否补发参数
|
2023-02-01 13:39:14 +08:00 |
|
fcli
|
5851ea20be
|
feat: 发放模板获取可用分组或项目
|
2023-02-01 13:10:05 +08:00 |
|
fcli
|
78f8630465
|
feat: 薪资账套项目列表分权
|
2023-02-01 11:23:43 +08:00 |
|
fcli
|
dec7c89856
|
feat: 发放模板获取可用分组或项目
|
2023-02-01 11:22:38 +08:00 |
|
钱涛
|
f76ac415ba
|
修复年终奖备注字符不对应
|
2023-02-01 10:05:02 +08:00 |
|
sy
|
6abc2068ea
|
薪酬系统-福利方案，福利方案新增、编辑、查看方法改进，福利核算加入福利方案中的缴纳周期因素
|
2023-01-31 17:40:34 +08:00 |
|
fcli
|
e92ea00b02
|
fix: 薪资项目公式按分权处理。
薪资项目管理列表取出薪资档案引用列
|
2023-01-31 14:31:46 +08:00 |
|
钱涛
|
9bedcf6d38
|
年终奖
|
2023-01-31 14:15:27 +08:00 |
|
fcli
|
da47210b22
|
fix: 薪资档案根据薪资项目分权展示
|
2023-01-31 14:05:40 +08:00 |
|
钱涛
|
857c39bd2d
|
年终奖
|
2023-01-30 17:32:58 +08:00 |
|
sy
|
ae6822dc91
|
薪酬系统-福利方案，福利方案对象的相关数据载体（po,dto）增加缴纳周期相关新字段，并对sql中的查询字段进行添加
|
2023-01-30 17:29:07 +08:00 |
|
sy
|
63ae86978f
|
薪酬系统-福利档案，导出excel文件名添加日期信息
|
2023-01-30 09:31:31 +08:00 |
|
钱涛
|
d881b63327
|
年终奖
|
2023-01-29 14:58:51 +08:00 |
|
fcli
|
80019a029c
|
feat: 获取部分字段
|
2023-01-28 13:56:02 +08:00 |