Harryxzy
|
d60d24ea2e
|
新建定量维度时数据透视没有值
|
2023-06-20 14:31:06 +08:00 |
|
Harryxzy
|
ee7936a9bf
|
考勤引用校验能够否删除
|
2023-06-16 13:33:38 +08:00 |
|
Harryxzy
|
512510c623
|
考勤引用校验能够否删除
|
2023-06-16 11:49:23 +08:00 |
sy
|
f33f309262
|
Merge remote-tracking branch 'remotes/origin/feature/v4-importAndExportHeaderUnified-0615' into release/2.8.4.2306.02
|
2023-06-15 16:35:52 +08:00 |
 钱涛
|
87a9338a73
|
Merge remote-tracking branch 'origin/release/2.8.4.2306.02' into release/2.8.4.2306.02
|
2023-06-15 10:44:42 +08:00 |
|
钱涛
|
2480525fa6
|
修复同步档案bug
缓存公共接口
|
2023-06-15 10:44:31 +08:00 |
|
sy
|
c87a754888
|
薪酬系统，薪资账套、个税扣缴义务人、薪资项目列表按照创建时间降序排列
|
2023-06-15 10:23:03 +08:00 |
|
sy
|
3638fb469f
|
薪酬系统-薪资档案，列表导入、导出统一表头内容和顺序，不包括自选表头
|
2023-06-14 10:33:26 +08:00 |
|
sy
|
12b4977067
|
薪酬系统-福利台账，退差新增逻辑优化
|
2023-06-13 15:43:10 +08:00 |
|
sy
|
1460d32ae4
|
薪酬系统-社保福利，列表导入、导出统一表头内容和顺序，不包括自选表头
|
2023-06-13 14:49:26 +08:00 |
|
Harryxzy
|
a74bddf326
|
Merge branch 'fix/salaryAcctResutAutoLock' into release/2.8.4.2306.02
|
2023-06-13 13:19:13 +08:00 |
|
Harryxzy
|
e034954d79
|
Merge branch 'fix/statisticsEditDelete' into release/2.8.4.2306.02
|
2023-06-13 10:19:37 +08:00 |
|
钱涛
|
8bde871286
|
档案返回列表状态
|
2023-06-12 15:36:27 +08:00 |
|
钱涛
|
34046646b3
|
还原脚本
|
2023-06-12 15:17:21 +08:00 |
|
Harryxzy
|
155a00623a
|
导入编辑自动锁定 根据confValue判断
|
2023-06-12 10:45:01 +08:00 |
|
Harryxzy
|
b2f39f56e2
|
Merge branch 'fix/sysSalaryItemSearchBUG' into release/2.8.3.2306.01
|
2023-06-09 09:50:25 +08:00 |
|
Harryxzy
|
849ea1e2d0
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-06-09 09:49:22 +08:00 |
|
Harryxzy
|
5bee0f3b4d
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01
|
2023-06-09 09:48:56 +08:00 |
|
Harryxzy
|
e24579f363
|
Merge branch 'feature/statisticDataPerspective' into release/2.8.3.2306.01
|
2023-06-09 09:48:27 +08:00 |
|
钱涛
|
892f99052b
|
报表数据接口返回报表id
|
2023-06-09 09:46:03 +08:00 |
|
Harryxzy
|
93a7dcd59f
|
数据透视 fix WeaTable
|
2023-06-08 18:04:25 +08:00 |
|
钱涛
|
f881fa2766
|
取消注释
|
2023-06-08 17:19:19 +08:00 |
|
Harryxzy
|
e464ca8ba6
|
薪资账套中薪资项目可以删除
|
2023-06-08 15:30:52 +08:00 |
|
Harryxzy
|
4b574c9e57
|
报表数据透视提速
|
2023-06-08 14:00:51 +08:00 |
|
Harryxzy
|
3d11c74d32
|
报表数据透视fixbug
|
2023-06-08 12:25:11 +08:00 |
|
Harryxzy
|
d013d14e31
|
系统薪资项目列表显示改造- 数据库适配
|
2023-06-08 11:38:53 +08:00 |
|
Harryxzy
|
dbb2a97be4
|
系统薪资项目列表显示改造
|
2023-06-08 11:10:40 +08:00 |
|
钱涛
|
7b0648cc68
|
拦截工资单demo
|
2023-06-08 10:40:00 +08:00 |
|
Harryxzy
|
50fd5812d4
|
数据透视功能改为post
|
2023-06-08 10:24:28 +08:00 |
|
钱涛
|
458b04703d
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-06-08 10:15:59 +08:00 |
|
钱涛
|
a4679d7a5b
|
展示底层异常
|
2023-06-08 10:14:37 +08:00 |
|
Harryxzy
|
94edee7f8c
|
Merge branch 'feature/taxAgentSorted' into release/2.8.3.2306.01
|
2023-06-08 09:03:21 +08:00 |
|
sy
|
5a54b83b4a
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-06-07 18:41:22 +08:00 |
|
sy
|
054d880afa
|
薪酬系统-福利档案，likecondition条件取消mysql指定
|
2023-06-07 18:40:55 +08:00 |
|
钱涛
|
799b3d9f64
|
Merge branch 'feature/短信邮件' into release/2.8.3.2306.01
|
2023-06-07 17:32:48 +08:00 |
|
钱涛
|
7701420430
|
邮件去除图片
|
2023-06-07 17:19:00 +08:00 |
|
Harryxzy
|
dcb28b052f
|
数据透视功能-分页+排序
|
2023-06-07 16:50:09 +08:00 |
|
Harryxzy
|
deaa9acfa0
|
Merge branch 'release/2.8.3.2306.01' into feature/statisticDataPerspective
|
2023-06-07 15:44:51 +08:00 |
|
Harryxzy
|
4617005e1f
|
数据透视功能
|
2023-06-07 15:43:23 +08:00 |
|
sy
|
4c1e7da51b
|
薪酬系统-福利档案，福利档案导出增加工号信息
|
2023-06-07 15:40:38 +08:00 |
|
钱涛
|
77e9b0a74b
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-06-07 15:12:40 +08:00 |
|
Harryxzy
|
9e794c988a
|
Merge branch 'fix/balanceImportBUG_0511' into release/2.8.3.2306.01
|
2023-06-07 14:36:27 +08:00 |
|
钱涛
|
3498005a11
|
工资单发放
|
2023-06-07 14:21:47 +08:00 |
|
Harryxzy
|
a6356a7d3d
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01
|
2023-06-07 12:27:29 +08:00 |
|
Harryxzy
|
f4627b53f9
|
fix没有公式id内容bug
|
2023-06-07 12:23:05 +08:00 |
|
钱涛
|
37d9c04a30
|
去除发放状态中文转换
|
2023-06-07 09:43:54 +08:00 |
|
钱涛
|
d4c8a66fcf
|
注释优化
|
2023-06-07 09:31:46 +08:00 |
|
钱涛
|
4a258aa45b
|
替换短信发送方法
|
2023-06-06 16:40:09 +08:00 |
|
钱涛
|
f154753698
|
拦截短信
|
2023-06-06 15:02:53 +08:00 |
|
Harryxzy
|
1584a27fe8
|
个税扣缴义务人排序
|
2023-06-06 14:44:00 +08:00 |