MustangDeng
|
5abd648e9b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-25 13:23:15 +08:00 |
|
MustangDeng
|
402a3304cc
|
福利核算数据量过大的情况
|
2022-05-25 13:23:02 +08:00 |
 钱涛
|
f066d1ef64
|
fix档案分页
|
2022-05-25 13:13:03 +08:00 |
|
钱涛
|
e1b579d480
|
暂存
|
2022-05-25 13:10:03 +08:00 |
|
钱涛
|
99fda7ecc3
|
修复调薪记录
|
2022-05-25 11:09:48 +08:00 |
|
钱涛
|
bf364a7639
|
暂存
|
2022-05-24 15:20:12 +08:00 |
|
MustangDeng
|
5cd4e46b8a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-24 13:42:25 +08:00 |
|
MustangDeng
|
fe1cb27004
|
修复 自定义福利中已经停用某项福利，但新增方案时候还能引用
|
2022-05-24 13:42:15 +08:00 |
|
钱涛
|
895d258a44
|
分权基本控制开发完毕
|
2022-05-24 13:25:56 +08:00 |
|
钱涛
|
082d02ae67
|
Merge branch 'develop' into auth
|
2022-05-24 11:26:37 +08:00 |
|
钱涛
|
f555192e70
|
升级
|
2022-05-24 11:24:21 +08:00 |
|
钱涛
|
705f10f153
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-24 10:54:58 +08:00 |
|
钱涛
|
bccd246b2c
|
fix分页异常
|
2022-05-24 10:54:46 +08:00 |
|
MustangDeng
|
78234f7554
|
工资单默认模板
|
2022-05-24 10:24:17 +08:00 |
|
钱涛
|
cb1a53c649
|
暂存
|
2022-05-24 09:14:26 +08:00 |
|
MustangDeng
|
46a0b77611
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-23 13:39:08 +08:00 |
|
MustangDeng
|
5f2c20eaec
|
默认不启用非标功能
|
2022-05-23 13:38:48 +08:00 |
|
钱涛
|
49cd388df1
|
暂存
|
2022-05-20 15:58:58 +08:00 |
|
钱涛
|
4f36f89e53
|
Merge branch 'develop' into auth
|
2022-05-20 14:56:25 +08:00 |
|
钱涛
|
d77e8b0de4
|
累计扣除字段
|
2022-05-20 14:41:42 +08:00 |
|
钱涛
|
ac934c901c
|
暂存
|
2022-05-19 16:56:57 +08:00 |
|
钱涛
|
2c03d4bc27
|
暂存
|
2022-05-19 16:36:18 +08:00 |
|
MustangDeng
|
6b9200121e
|
福利台账归档
|
2022-05-19 16:32:33 +08:00 |
|
钱涛
|
ed0ba7ed6d
|
暂存
|
2022-05-19 14:50:01 +08:00 |
|
MustangDeng
|
1f636c28d6
|
福利台账异动清单
|
2022-05-19 11:23:25 +08:00 |
|
MustangDeng
|
6024a69e84
|
福利档案导出
|
2022-05-19 10:20:23 +08:00 |
|
MustangDeng
|
0909e37741
|
数据采集高级搜索
|
2022-05-19 09:45:02 +08:00 |
|
MustangDeng
|
69246485ee
|
福利导入模板
|
2022-05-19 09:33:07 +08:00 |
|
MustangDeng
|
f8105537c9
|
福利导入
|
2022-05-18 18:53:30 +08:00 |
|
MustangDeng
|
14daede3d0
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-18 16:37:34 +08:00 |
|
MustangDeng
|
fcbc6c7202
|
福利方案分页创建
|
2022-05-18 16:37:23 +08:00 |
|
钱涛
|
647d4ae28b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-18 16:08:13 +08:00 |
|
钱涛
|
bb66f80906
|
fix 新增系统薪资项目，模糊搜索
|
2022-05-18 16:07:51 +08:00 |
|
MustangDeng
|
51e5649dd8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-18 14:36:46 +08:00 |
|
MustangDeng
|
604d3d453e
|
福利方案判断重复
|
2022-05-18 14:36:37 +08:00 |
|
钱涛
|
dc1c865a4b
|
账套项目删除bug
|
2022-05-18 14:34:06 +08:00 |
|
钱涛
|
fa4d605c8d
|
暂存
|
2022-05-18 09:19:50 +08:00 |
|
钱涛
|
27b04da333
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-16 17:04:19 +08:00 |
|
钱涛
|
a4c285dfd4
|
异常
|
2022-05-16 17:03:17 +08:00 |
|
MustangDeng
|
4bd082efb0
|
福利档案导出
|
2022-05-13 16:29:18 +08:00 |
|
钱涛
|
9540b0a2ce
|
自增bug
|
2022-05-13 11:27:25 +08:00 |
|
钱涛
|
022a78b659
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-13 11:22:18 +08:00 |
|
钱涛
|
282c0abc22
|
薪资项目不使用自增
|
2022-05-13 11:22:10 +08:00 |
|
MustangDeng
|
ed9a9012ad
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-13 10:32:06 +08:00 |
|
MustangDeng
|
0750ea0f51
|
福利档案列表报错问题
|
2022-05-13 10:31:51 +08:00 |
|
钱涛
|
e49bc9943f
|
薪酬核算第一步不使用线程池
|
2022-05-12 15:41:12 +08:00 |
|
钱涛
|
a2c59d15f4
|
项目分类bug
|
2022-05-12 14:36:16 +08:00 |
|
钱涛
|
83cc76ba77
|
个税扣缴义务人不存在提醒
|
2022-05-11 11:23:28 +08:00 |
|
钱涛
|
9dc5a396f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-10 17:27:10 +08:00 |
|
钱涛
|
c440ccd0a6
|
修复
|
2022-05-10 17:26:58 +08:00 |
|
MustangDeng
|
b3ca582e3a
|
我的薪资列表调薪记录
|
2022-05-10 16:17:37 +08:00 |
|
MustangDeng
|
c68af43652
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-10 10:55:02 +08:00 |
|
MustangDeng
|
fbf6baa676
|
我的薪资列表工资单列表
|
2022-05-10 10:54:41 +08:00 |
|
钱涛
|
08ff95bf77
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-09 17:47:37 +08:00 |
|
钱涛
|
6f3d8e85c0
|
个税申报bug
|
2022-05-09 17:47:19 +08:00 |
|
MustangDeng
|
db4cbea487
|
Merge branch '20220505' into develop
|
2022-05-09 16:40:48 +08:00 |
|
MustangDeng
|
733bd2b034
|
档案导入模板调整
|
2022-05-09 16:40:14 +08:00 |
|
钱涛
|
2c432ab1c0
|
可删除
|
2022-05-09 16:39:04 +08:00 |
|
钱涛
|
fd856e0750
|
入职日期
|
2022-05-09 14:24:40 +08:00 |
|
钱涛
|
bf37add9dd
|
修复导出异常
|
2022-05-09 14:11:07 +08:00 |
|
MustangDeng
|
c287aca4a8
|
工资单撤回
|
2022-05-09 12:28:59 +08:00 |
|
MustangDeng
|
9dd71e5045
|
工资单撤回
|
2022-05-09 12:15:13 +08:00 |
|
钱涛
|
d2a37df97f
|
申报表异常
|
2022-05-09 11:46:49 +08:00 |
|
MustangDeng
|
22de36ce59
|
Merge branch '20220505' into develop
|
2022-05-09 11:19:35 +08:00 |
|
MustangDeng
|
2200d0c793
|
工资单撤回
|
2022-05-09 11:18:54 +08:00 |
|
钱涛
|
b0b18ecb5e
|
导出日志和申报表异常
|
2022-05-09 10:32:14 +08:00 |
|
钱涛
|
525fcc49a7
|
公式模拟运行
|
2022-05-08 12:34:05 +08:00 |
|
钱涛
|
c852211b0e
|
核算log
|
2022-05-07 15:20:39 +08:00 |
|
MustangDeng
|
10f76c102c
|
福利档案导入模板
|
2022-05-06 16:58:01 +08:00 |
|
钱涛
|
0b523846d7
|
日期类型处理
|
2022-05-06 16:54:58 +08:00 |
|
钱涛
|
d2a564cb92
|
sql兼容性处理
|
2022-05-06 16:01:33 +08:00 |
|
钱涛
|
ba67612e40
|
sql兼容性处理
|
2022-05-06 13:22:16 +08:00 |
|
钱涛
|
5a406d52f3
|
系统项目及公式初始化脚本
|
2022-05-06 10:23:23 +08:00 |
|
钱涛
|
0a2640b459
|
公式变量累计
|
2022-05-05 15:22:12 +08:00 |
|
钱涛
|
88b94b7aac
|
薪资项目列表优化
|
2022-05-05 15:02:12 +08:00 |
|
钱涛
|
231961663f
|
核算结果导出
|
2022-05-05 14:10:19 +08:00 |
|
钱涛
|
fafd206101
|
账套删除校验
|
2022-05-05 11:19:13 +08:00 |
|
钱涛
|
a530532a45
|
去除run方法
|
2022-05-05 10:35:58 +08:00 |
|
钱涛
|
f2f678c6d1
|
核算进度
|
2022-04-29 17:15:22 +08:00 |
|
钱涛
|
ad6ab6daff
|
核算3.0
|
2022-04-29 14:56:33 +08:00 |
|
钱涛
|
dff9657c3d
|
核算字段
|
2022-04-29 14:17:31 +08:00 |
|
钱涛
|
e445e654de
|
往期累计
|
2022-04-28 19:32:38 +08:00 |
|
钱涛
|
beb725fb8a
|
导入
|
2022-04-28 18:27:25 +08:00 |
|
钱涛
|
712e4edb0b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-28 17:44:36 +08:00 |
|
钱涛
|
b0ee96eb41
|
导入模板改为内存生成
|
2022-04-28 17:44:26 +08:00 |
|
MustangDeng
|
48429fdcf6
|
福利档案列表添加delete_type判断
|
2022-04-28 17:29:40 +08:00 |
|
钱涛
|
23da0fb5e4
|
sql公式
|
2022-04-28 15:02:11 +08:00 |
|
钱涛
|
5c2bb1bf58
|
入职日期改为String
|
2022-04-28 10:05:27 +08:00 |
|
钱涛
|
e74931aa54
|
人员字段默认删除
|
2022-04-27 18:48:41 +08:00 |
|
钱涛
|
6ca41e8e59
|
字段分类
|
2022-04-27 18:29:38 +08:00 |
|
钱涛
|
c899d370a9
|
默认员工字段不可删除
|
2022-04-27 17:20:33 +08:00 |
 reset
|
2d68d686ca
|
!33 提供字段描述给薪资账
Merge pull request !33 from reset/archive
|
2022-04-27 08:23:19 +00:00 |
|
Chengliang
|
fb4f1a13fb
|
提供字段描述给薪资账套
|
2022-04-27 16:21:24 +08:00 |
|
reset
|
5dc9b79633
|
!32 增加福利数据供账套使用
Merge pull request !32 from reset/archive
|
2022-04-27 06:37:51 +00:00 |
|
Chengliang
|
7e28c952cc
|
增加福利数据供账套使用
|
2022-04-27 14:36:05 +08:00 |
|
钱涛
|
01354b2be9
|
fix线下对比404
|
2022-04-27 13:33:44 +08:00 |
|
钱涛
|
8abfb7631e
|
fix线下对比404
|
2022-04-27 09:43:24 +08:00 |
|
钱涛
|
8b2f54afc2
|
线下对比公式详情
|
2022-04-26 16:42:22 +08:00 |
|
钱涛
|
151fa2b575
|
线下对比
|
2022-04-26 16:39:41 +08:00 |
|
钱涛
|
d521bf5bf7
|
账套周期
|
2022-04-26 14:44:42 +08:00 |