 钱涛
|
57fdc79e7b
|
修复引用日期转换问题
|
2024-10-18 15:58:43 +08:00 |
|
钱涛
|
96a7be5625
|
修复核算列表次账号不显示问题
|
2024-10-18 11:03:33 +08:00 |
|
钱涛
|
313b91297f
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
# Conflicts:
# src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
|
2024-10-18 10:39:12 +08:00 |
|
钱涛
|
9f498551e4
|
单元格锁定字段改成字符型
|
2024-10-18 10:20:29 +08:00 |
|
钱涛
|
641b085a28
|
单元格锁定sql
|
2024-10-17 18:53:37 +08:00 |
|
钱涛
|
be2d6b693a
|
单元格锁定
|
2024-10-17 18:27:37 +08:00 |
Harryxzy
|
c6fdbe6403
|
社保停缴action最后缴纳月支持分开设置
|
2024-10-17 16:39:24 +08:00 |
|
Harryxzy
|
f664536bce
|
社保停缴action最后缴纳月支持分开设置
|
2024-10-17 15:51:05 +08:00 |
|
钱涛
|
4ec883cd9c
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
|
2024-10-17 14:28:08 +08:00 |
|
钱涛
|
cede931b0d
|
版本
|
2024-10-17 14:21:46 +08:00 |
|
钱涛
|
38f773d125
|
优化核算导入效率
|
2024-10-17 14:07:27 +08:00 |
|
钱涛
|
70429df180
|
Merge branch 'custom/上海电力设计院' into release/2.16.1.2410.01
|
2024-10-17 13:42:23 +08:00 |
|
钱涛
|
0d100d9f53
|
修复报表分部条件过滤不生效
|
2024-10-17 10:20:58 +08:00 |
|
钱涛
|
fb8595ac00
|
次账号规则
|
2024-10-16 18:20:11 +08:00 |
|
钱涛
|
070a2a75ac
|
Merge branch 'release/2.15.2.2409.01' into feature/次账号
|
2024-10-16 17:19:43 +08:00 |
|
钱涛
|
d42e9768c2
|
处理sqlserver浮动数据bug
|
2024-10-16 16:53:24 +08:00 |
|
Harryxzy
|
fc88f03904
|
浮动薪酬加解密
|
2024-10-16 15:47:18 +08:00 |
|
钱涛
|
53ce7c7b43
|
核算人员显示次账号
|
2024-10-16 15:25:48 +08:00 |
|
Harryxzy
|
35a0349f38
|
Merge remote-tracking branch 'origin/release/2.15.2.2409.01' into release/2.15.2.2409.01
|
2024-10-16 09:42:10 +08:00 |
|
Harryxzy
|
e8559e1afa
|
修复社保福利导入报无人员 （历史数据兼容bug）
|
2024-10-16 09:41:55 +08:00 |
|
钱涛
|
5f50c26640
|
取消核算导入vlookup支持
|
2024-10-16 09:30:10 +08:00 |
|
钱涛
|
6ec7210720
|
除去核算支持函数
|
2024-10-15 14:40:04 +08:00 |
|
钱涛
|
6336ae24a0
|
Merge branch 'release/2.15.2.2409.01' into custom/上海电力设计院
|
2024-10-15 14:27:55 +08:00 |
|
钱涛
|
d3050117d1
|
支持次账号
|
2024-10-15 14:24:37 +08:00 |
|
Harryxzy
|
4c551dae87
|
Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01
|
2024-10-14 15:06:52 +08:00 |
|
Harryxzy
|
dbd1b574e0
|
浮动薪酬优化
|
2024-10-14 15:05:22 +08:00 |
|
Harryxzy
|
3ac5da2b31
|
社保台账sqlserver 2100bug
|
2024-10-14 14:34:46 +08:00 |
|
Harryxzy
|
49cbb7a7cc
|
浮动薪酬
|
2024-10-14 10:38:30 +08:00 |
|
钱涛
|
779d519a6f
|
Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置
|
2024-10-12 11:11:44 +08:00 |
|
钱涛
|
c209399566
|
修复模板设置主键
|
2024-10-12 09:38:08 +08:00 |
|
钱涛
|
265ca2a54e
|
默认展示所有薪资明细列
|
2024-10-11 18:02:52 +08:00 |
|
钱涛
|
a0bc3b5452
|
记录核算日志
|
2024-10-11 17:32:02 +08:00 |
|
钱涛
|
3a224170f1
|
导入字段持久化
|
2024-10-11 17:17:07 +08:00 |
|
钱涛
|
4c4b6ab57d
|
导入字段持久化
|
2024-10-11 17:14:14 +08:00 |
|
钱涛
|
b6c7a7f2bd
|
自定义列全局设置
|
2024-10-11 17:04:13 +08:00 |
|
钱涛
|
32b3ce97a9
|
Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置
|
2024-10-11 15:34:44 +08:00 |
|
钱涛
|
64ac30c05f
|
自定义列全局设置
|
2024-10-11 15:34:17 +08:00 |
|
Harryxzy
|
310c77a270
|
excel设置列宽 超过255报错
|
2024-10-11 15:14:21 +08:00 |
|
Harryxzy
|
bbbb29a3d9
|
社保台账人员信息快照sql
|
2024-10-11 10:41:52 +08:00 |
|
Harryxzy
|
8d8fc5c15d
|
社保台账人员信息快照
|
2024-10-11 10:17:35 +08:00 |
|
钱涛
|
da4e908a7d
|
模板sql
|
2024-10-10 14:16:57 +08:00 |
|
钱涛
|
861cda00fa
|
1、批量锁定、批量解锁选择人员的所在行的工资项目，需根据人员的选择来设置。
2、导入薪资项目时，优化下当前导入表头能否自动为上次选择的表头信息
|
2024-10-10 11:39:22 +08:00 |
|
钱涛
|
2ba4bb72db
|
薪资明细增加入职日期
|
2024-10-09 18:10:38 +08:00 |
|
钱涛
|
3a128a4c5b
|
报表快照
|
2024-10-09 14:59:33 +08:00 |
|
钱涛
|
a40188659f
|
报表快照
|
2024-10-09 13:21:28 +08:00 |
|
Harryxzy
|
752de1fa8e
|
社保福利台账人员信息快照
|
2024-10-09 10:57:23 +08:00 |
|
钱涛
|
09ccda7883
|
Merge branch 'release/2.15.2.2409.01' into feature/快照条件搜索报表
|
2024-10-08 16:12:08 +08:00 |
|
钱涛
|
61dee5d3a1
|
薪资明细排序
|
2024-10-08 15:48:33 +08:00 |
|
钱涛
|
ff5419f2bb
|
薪资明细排序
|
2024-10-08 15:45:12 +08:00 |
|
钱涛
|
edb07052b5
|
员工明细排序
|
2024-10-08 14:36:18 +08:00 |