 钱涛
|
a3aa0f5ca1
|
自适应文字长度
|
2024-01-17 10:55:42 +08:00 |
Harryxzy
|
7945c84fbb
|
薪资项目宽度
|
2024-01-02 16:37:07 +08:00 |
|
钱涛
|
7e22711dcd
|
导入工具
|
2023-12-28 15:47:05 +08:00 |
|
钱涛
|
06fe3144ba
|
导入模板
|
2023-12-28 15:37:01 +08:00 |
|
钱涛
|
04e3225c98
|
自适应
|
2023-12-12 10:07:31 +08:00 |
|
钱涛
|
e495c1799f
|
自定义
|
2023-12-11 09:52:47 +08:00 |
sy
|
ce10204dab
|
Merge remote-tracking branch 'remotes/origin/feature/231102-福利台账，补差待编辑项扩充其他可缴纳福利项' into release/2.9.9.2312.01
|
2023-12-05 11:26:48 +08:00 |
|
钱涛
|
e0f7ec3256
|
申报表提示日期优化
|
2023-11-22 16:37:48 +08:00 |
|
sy
|
c9b279049d
|
薪酬系统-福利台账，福利核算出现异常时，优化核算进度获取逻辑
|
2023-11-21 14:40:30 +08:00 |
|
钱涛
|
bcee3c5e5a
|
人员属性扩展
|
2023-11-07 19:06:43 +08:00 |
|
钱涛
|
74f7c71ffe
|
扩展维度属性
|
2023-11-06 11:19:00 +08:00 |
|
Harryxzy
|
07c1785714
|
Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01
|
2023-10-12 14:27:57 +08:00 |
|
钱涛
|
db71ba0e5f
|
fix null
|
2023-10-12 14:13:25 +08:00 |
|
Harryxzy
|
c83539460c
|
薪酬token
|
2023-10-11 15:54:08 +08:00 |
|
Harryxzy
|
b71633d744
|
token
|
2023-10-11 15:28:58 +08:00 |
|
Harryxzy
|
03d3befbdd
|
token
|
2023-10-11 14:07:23 +08:00 |
|
钱涛
|
d98933832a
|
Merge branch 'feature/生成签名pdf' into release/2.9.6.2310.01
# Conflicts:
# src/com/engine/salary/web/SalaryBillController.java
|
2023-10-07 15:19:38 +08:00 |
|
Harryxzy
|
efa818f8b9
|
核算结果导出数值项excel格式为数值
|
2023-09-21 13:36:23 +08:00 |
|
钱涛
|
12480f8306
|
生成工资单pdf签名
|
2023-09-18 18:45:59 +08:00 |
|
钱涛
|
7b3f7b2e39
|
签名
|
2023-09-18 10:25:43 +08:00 |
|
钱涛
|
2b13d0c7ef
|
定薪账套
|
2023-09-14 11:56:00 +08:00 |
|
sy
|
4ffca1872a
|
薪酬系统-福利台账，核算明细列表合计行导出
|
2023-08-18 17:58:36 +08:00 |
|
钱涛
|
2480525fa6
|
修复同步档案bug
缓存公共接口
|
2023-06-15 10:44:31 +08:00 |
|
Harryxzy
|
b2f39f56e2
|
Merge branch 'fix/sysSalaryItemSearchBUG' into release/2.8.3.2306.01
|
2023-06-09 09:50:25 +08:00 |
|
Harryxzy
|
dbb2a97be4
|
系统薪资项目列表显示改造
|
2023-06-08 11:10:40 +08:00 |
|
钱涛
|
a4679d7a5b
|
展示底层异常
|
2023-06-08 10:14:37 +08:00 |
|
钱涛
|
d0e5a3a643
|
Merge branch 'feature/报表v2' into release/2.8.2.2305.02
|
2023-05-15 09:29:00 +08:00 |
|
钱涛
|
c87db92ee8
|
公式扩展核算基本信息和核算日期
|
2023-05-10 14:26:39 +08:00 |
|
钱涛
|
2941b5f304
|
删除报表同时删除项目
|
2023-05-09 17:37:05 +08:00 |
|
钱涛
|
797d5095eb
|
适配if
|
2023-05-09 10:43:51 +08:00 |
|
钱涛
|
6b19445a1a
|
Merge branch 'release/2.8.2.2305.02' into feature/公式
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
|
2023-05-08 11:22:23 +08:00 |
|
钱涛
|
9dc41706b2
|
Merge branch 'release/2.7.4.2304.02' into feature/公式
|
2023-05-04 14:40:50 +08:00 |
|
钱涛
|
2d8b4b07d0
|
Merge branch 'release/2.7.4.2304.02' into feature/报表
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2023-04-28 10:49:33 +08:00 |
|
钱涛
|
14fca43e18
|
暂存
|
2023-04-26 15:17:08 +08:00 |
|
钱涛
|
40cd70e2a3
|
Merge branch 'release/2.7.4.2304.02' into feature/公式
|
2023-04-25 17:39:33 +08:00 |
|
sy
|
cb36dc2904
|
薪酬系统-福利档案，档案编辑功能增加对年月的格式校验
|
2023-04-25 17:38:54 +08:00 |
|
sy
|
d56e9aff82
|
薪酬系统，导出excel的title行背景置为灰色
|
2023-04-23 13:35:17 +08:00 |
|
钱涛
|
a19b19e23d
|
公式
|
2023-04-19 10:15:01 +08:00 |
|
sy
|
31bf7cfd99
|
薪酬系统-薪资核算和档案，excel导出行高自适应
|
2023-03-30 17:26:55 +08:00 |
|
sy
|
dc2cb5f448
|
薪酬系统-薪资核算，薪资核算和薪资档案导出excel通用格式改造
|
2023-03-16 13:51:41 +08:00 |
|
sy
|
acc382b835
|
薪酬系统-薪资核算，核算导出excel格式改造
|
2023-03-15 10:20:46 +08:00 |
|
钱涛
|
a37e874614
|
修复工资单模板显示问题
|
2023-03-02 10:41:21 +08:00 |
|
钱涛
|
a8fc666e79
|
fix json转换问题
|
2023-03-02 10:12:00 +08:00 |
|
sy
|
1a5afd6c6d
|
Merge branch 'feature/v4-siFunctionImprove2-0228' into release/2.6.2.2302.02
|
2023-02-22 14:10:46 +08:00 |
|
sy
|
39cb3b0df1
|
薪酬系统-福利档案，方案明细中添加福利项上下限数据
|
2023-02-16 13:14:17 +08:00 |
|
钱涛
|
b57bdcc7eb
|
接口报错时打印参数
|
2023-02-16 10:47:30 +08:00 |
|
钱涛
|
a2e9c482a4
|
修复账套根据名称查询bug
去除调整前后值的限制
|
2023-02-15 16:38:54 +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 |
|
钱涛
|
9bedcf6d38
|
年终奖
|
2023-01-31 14:15:27 +08:00 |
|
fcli
|
90b2edb96c
|
feat: 薪资项目分权代码合并
|
2023-01-12 14:19:39 +08:00 |