 黎永顺
|
2e38e5a5c6
|
hotfix/2.9.9.2312.01
薪资核算导入下载模板
|
2023-12-12 10:25:02 +08:00 |
|
黎永顺
|
253ba3cc8c
|
薪资核算批量编辑
|
2023-12-11 13:32:17 +08:00 |
|
黎永顺
|
254d19c44e
|
薪资核算批量编辑
|
2023-12-11 13:31:46 +08:00 |
|
黎永顺
|
43012b2025
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-08 15:56:39 +08:00 |
|
黎永顺
|
3eb8c47a87
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-08 13:39:55 +08:00 |
|
黎永顺
|
5617392a7c
|
feature/2.9.9.2312.01-薪资核算查看权限
|
2023-12-08 09:19:43 +08:00 |
|
黎永顺
|
197849ecaa
|
Merge branch 'master' into feature/2.9.9.2312.01-薪资核算查看权限
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/calculate/calculate.js
|
2023-12-07 16:45:47 +08:00 |
|
黎永顺
|
23911d8e37
|
feature/2.9.9.2312.01-薪资核算查看权限
|
2023-12-07 16:44:38 +08:00 |
|
黎永顺
|
676d8d2850
|
Merge branch 'release/2.9.9.2312.01'
|
2023-12-07 16:35:19 +08:00 |
|
黎永顺
|
e4573bb95e
|
hotfix/2.9.9.2312.01
|
2023-12-07 13:55:52 +08:00 |
|
黎永顺
|
2864e1e446
|
feature/2.9.9.2312.01-薪资核算列表在线编辑
|
2023-12-07 09:40:34 +08:00 |
|
黎永顺
|
2b4b5623bc
|
hotfix/2.9.9.2312.01
查看薪資核算页面添加权限，移动端薪资查看修改
|
2023-12-06 18:28:02 +08:00 |
|
黎永顺
|
3dca9da904
|
hotfix/2.9.9.2312.01
|
2023-12-06 16:19:05 +08:00 |
|
黎永顺
|
8a8804f0c1
|
1release/2.9.9.2312.01
|
2023-12-06 15:55:44 +08:00 |
|
黎永顺
|
f1b0fc588a
|
1release/2.9.9.2312.01
|
2023-12-06 14:49:34 +08:00 |
|
黎永顺
|
bc78a26578
|
Merge branch 'feature/2.9.42311.02-我的薪资福利移动端列表查看' into release/2.9.9.2312.01
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2023-12-06 14:48:35 +08:00 |
|
黎永顺
|
6e56b436d6
|
feature/2.9.9.2312.01-薪资核算列表在线编辑-批量更新薪资项目项
|
2023-12-06 14:46:36 +08:00 |
|
黎永顺
|
72d02ad754
|
feature/2.9.9.2312.01-薪资核算列表在线编辑
|
2023-12-05 17:15:55 +08:00 |
|
黎永顺
|
143e9503e1
|
Merge branch 'feature/2.9.9.2312.01-社保核算以及薪资账套查询优化' into release/2.9.9.2312.01
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js
|
2023-12-05 11:34:00 +08:00 |
|
黎永顺
|
07c6ca839f
|
hotfix/2.9.9.2312.01
|
2023-12-01 17:56:16 +08:00 |
|
黎永顺
|
04ab495c25
|
hotfix/2.9.9.2312.01
|
2023-12-01 17:22:34 +08:00 |
|
黎永顺
|
78aaac8115
|
工资单修改
|
2023-12-01 16:39:31 +08:00 |
|
黎永顺
|
4448393373
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-12-01 11:21:01 +08:00 |
|
黎永顺
|
66392e6e10
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-12-01 09:25:33 +08:00 |
|
黎永顺
|
49eab11325
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-30 15:41:55 +08:00 |
|
黎永顺
|
b14c2f9f87
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-30 15:13:09 +08:00 |
|
黎永顺
|
f113cb437f
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-30 14:52:14 +08:00 |
|
黎永顺
|
36eb6eae6a
|
feature/2.9.9.2312.01-接口复写合并
|
2023-11-30 14:04:57 +08:00 |
|
黎永顺
|
39650fa172
|
Merge branch 'feature/2.9.42310.01-接口fetch重新封装' into feature/2.9.9.2312.01-接口复写合并
# Conflicts:
# pc4mobx/hrmSalary/apis/archive.js
|
2023-11-30 13:55:38 +08:00 |
|
黎永顺
|
2196dde486
|
Merge branch 'master' into hotfix/2.9.9.2312.01
|
2023-11-30 09:22:40 +08:00 |
|
黎永顺
|
4f23b8db3c
|
hotfix/2.9.9.2312.01
|
2023-11-30 09:22:35 +08:00 |
|
黎永顺
|
9949df47fb
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-30 09:10:59 +08:00 |
|
黎永顺
|
84d4df6d3d
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-29 18:29:55 +08:00 |
|
黎永顺
|
79fca386d3
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-29 14:02:53 +08:00 |
|
黎永顺
|
3da1d6964b
|
1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-28 15:24:48 +08:00 |
|
黎永顺
|
7cc9e422b1
|
1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-28 13:44:53 +08:00 |
|
黎永顺
|
23f15bd423
|
feature/2.9.42311.02-社保核算以及薪资账套查询优化
|
2023-11-27 19:17:44 +08:00 |
|
黎永顺
|
e01b5bf1c9
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-27 17:52:17 +08:00 |
|
黎永顺
|
5e60775029
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-27 17:45:11 +08:00 |
|
黎永顺
|
2c7633b0c9
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-27 15:29:07 +08:00 |
|
黎永顺
|
7579a8cd31
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-24 14:45:37 +08:00 |
|
黎永顺
|
24cf38e964
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02
|
2023-11-24 14:06:48 +08:00 |
|
黎永顺
|
bbb9bce35a
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-11-24 13:55:58 +08:00 |
|
黎永顺
|
c2f4c4372c
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-24 11:43:03 +08:00 |
|
黎永顺
|
6f9f24f7a8
|
feature/2.9.42310.01-工资单发放页面重构-添加短信设置的发送设置
|
2023-11-23 15:50:21 +08:00 |
|
黎永顺
|
94b3f056f4
|
hotfix/2.9.42311.02-我的薪资福利页面重构
|
2023-11-20 17:48:44 +08:00 |
|
黎永顺
|
373b0aad56
|
hotfix/2.9.42311.02
|
2023-11-17 13:33:56 +08:00 |
|
黎永顺
|
f4574570d9
|
hotfix/2.9.42311.02
|
2023-11-15 13:53:56 +08:00 |
|
黎永顺
|
f0b657f26e
|
Merge branch 'release/2.9.42311.02' into hotfix/2.9.42311.02
|
2023-11-15 13:32:40 +08:00 |
|
黎永顺
|
7dfd328aae
|
hotfix/2.9.42311.02
|
2023-11-14 14:45:13 +08:00 |
|
黎永顺
|
ff870c110c
|
hotfix/2.9.42311.02-薪资核算名称修改
|
2023-11-13 16:51:40 +08:00 |
|
黎永顺
|
f51de57661
|
feature/2.9.42311.02-我的薪资福利移动端列表查看
|
2023-11-13 15:49:45 +08:00 |
|
黎永顺
|
1d110fe25d
|
feature/2.9.42311.02-我的薪资福利移动端列表查看
|
2023-11-13 15:35:43 +08:00 |
|
黎永顺
|
115a0ee64f
|
Merge branch 'hotfix/2.9.42311.02'
|
2023-11-13 14:18:16 +08:00 |
|
黎永顺
|
0798d2bf96
|
hotfix/2.9.42311.02
|
2023-11-13 14:15:49 +08:00 |
|
黎永顺
|
3ab54027f9
|
feature/2.9.42311.02-我的薪资福利移动端列表查看
|
2023-11-13 14:13:03 +08:00 |
|
黎永顺
|
9f114e9867
|
hotfix/2.9.42311.02
|
2023-11-13 11:17:38 +08:00 |
|
黎永顺
|
28c50dc563
|
hotfix/2.9.42311.02
|
2023-11-13 11:03:19 +08:00 |
|
黎永顺
|
0a1173faaa
|
feature/2.9.42311.02-我的薪资福利移动端列表查看
|
2023-11-13 10:41:47 +08:00 |
|
黎永顺
|
d46f40b086
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-10 13:34:36 +08:00 |
|
黎永顺
|
436db457db
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-09 17:51:38 +08:00 |
|
黎永顺
|
7908f925ea
|
release/2.9.42311.01
|
2023-11-09 16:27:33 +08:00 |
|
黎永顺
|
1afaa04129
|
1release/2.9.42311.01
|
2023-11-09 15:36:13 +08:00 |
|
黎永顺
|
f0f4bfb877
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-09 13:54:34 +08:00 |
|
黎永顺
|
aa1cef89b2
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-09 13:52:54 +08:00 |
|
黎永顺
|
8252cebd98
|
1release/2.9.42311.01
|
2023-11-08 18:11:38 +08:00 |
|
黎永顺
|
84a908e94e
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-08 16:14:10 +08:00 |
|
黎永顺
|
1eac37cd38
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-08 13:37:33 +08:00 |
|
黎永顺
|
a075c4a479
|
Merge branch 'feature/2.9.42310.01-社保档案操作日志' into release/2.9.42311.01
|
2023-11-07 19:16:27 +08:00 |
|
黎永顺
|
147d0908f1
|
Merge branch 'feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置' into release/2.9.42311.01
# Conflicts:
# pc4mobx/hrmSalary/apis/statistics.js
|
2023-11-07 19:16:10 +08:00 |
|
黎永顺
|
8162e02796
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-07 19:13:38 +08:00 |
|
黎永顺
|
675d583557
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-07 16:57:47 +08:00 |
|
黎永顺
|
d9a7814080
|
feature/2.9.42310.01-接口fetch重新封装
|
2023-11-07 16:43:23 +08:00 |
|
黎永顺
|
5fd2120f14
|
feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置
|
2023-11-07 16:21:17 +08:00 |
|
黎永顺
|
858b694568
|
feature/2.9.42310.01-接口fetch重新封装
|
2023-11-07 11:26:08 +08:00 |
|
黎永顺
|
4c7b3f9a6a
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-07 10:28:44 +08:00 |
|
黎永顺
|
8bd1cd51af
|
feature/2.9.42310.02-薪酬统计报表统计项目设置
|
2023-11-06 17:05:26 +08:00 |
|
黎永顺
|
eefa47164a
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-06 16:09:23 +08:00 |
|
黎永顺
|
560af8a703
|
feature/2.9.42310.01-接口fetch重新封装
|
2023-11-06 09:24:47 +08:00 |
|
黎永顺
|
68bd42c2c0
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-03 09:54:02 +08:00 |
|
黎永顺
|
b0500cf8f9
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-02 18:17:30 +08:00 |
|
黎永顺
|
a617c40c1f
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-02 16:33:16 +08:00 |
|
黎永顺
|
f9f47324e5
|
feature/2.9.42310.02-薪酬统计报表统计项目设置
|
2023-11-02 14:30:18 +08:00 |
|
黎永顺
|
8a3a1dcf76
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-02 09:18:16 +08:00 |
|
黎永顺
|
121d82d379
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-01 16:18:51 +08:00 |
|
黎永顺
|
b2dda3a728
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-01 09:10:28 +08:00 |
|
黎永顺
|
c068959e73
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-10-31 16:59:50 +08:00 |
|
黎永顺
|
a21982bf62
|
hotfix/2.9.42310.02
|
2023-10-31 15:50:52 +08:00 |
|
黎永顺
|
6aed11a411
|
hotfix/2.9.42310.02
|
2023-10-31 15:45:15 +08:00 |
|
黎永顺
|
b14fce7949
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-10-31 15:30:21 +08:00 |
|
黎永顺
|
cd9964a329
|
Merge branch 'hotfix/2.9.42310.02' into develop
|
2023-10-31 09:44:59 +08:00 |
|
黎永顺
|
e246e10af7
|
hotfix/2.9.42310.02
|
2023-10-30 15:54:25 +08:00 |
|
黎永顺
|
4acdff060c
|
hotfix/2.9.42310.02
|
2023-10-30 08:55:15 +08:00 |
|
黎永顺
|
015e29ac47
|
Merge branch 'feature/2.9.42310.01-薪资项目拓扑图' into develop
|
2023-10-27 17:28:21 +08:00 |
|
黎永顺
|
c44f92fb56
|
Merge branch 'hotfix/2.9.42310.02' into develop
|
2023-10-27 17:28:11 +08:00 |
|
黎永顺
|
32e01016c1
|
hotfix/2.9.42310.02
|
2023-10-27 16:27:01 +08:00 |
|
黎永顺
|
eed8d3a5bd
|
feature/2.9.42310.01-薪资项目拓扑图
|
2023-10-27 16:14:59 +08:00 |
|
黎永顺
|
235e7cc6f0
|
feature/2.9.42310.01-薪资项目拓扑图
|
2023-10-27 10:43:23 +08:00 |
|
黎永顺
|
7d09c5b55b
|
hotfix/2.9.42310.02
数据采集日期组件选择失败的bug处理
|
2023-10-25 15:45:38 +08:00 |
|
黎永顺
|
d75aac6bf7
|
Merge branch 'hotfix/2.9.42310.02' into develop
|
2023-10-24 18:38:38 +08:00 |
|
黎永顺
|
d0cc845911
|
hotfix/2.9.42310.02
|
2023-10-23 18:38:07 +08:00 |
|
黎永顺
|
63dcd77589
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into develop
|
2023-10-23 18:30:47 +08:00 |
|
黎永顺
|
4a392f2357
|
Merge branch 'hotfix/2.9.42310.02' into develop
|
2023-10-23 18:30:35 +08:00 |
|
黎永顺
|
bc28d4ea2f
|
Merge branch 'feature/2.9.42310.01-社保档案操作日志' into develop
|
2023-10-23 18:30:25 +08:00 |
|
黎永顺
|
967d0bacd1
|
feature/2.9.42310.01-社保档案操作日志
|
2023-10-23 18:28:29 +08:00 |
|
黎永顺
|
510e46045e
|
feature/2.9.42310.01-社保档案操作日志
|
2023-10-23 18:06:09 +08:00 |
|
黎永顺
|
8b7bb221e2
|
feature/2.9.42310.01-社保档案操作日志
|
2023-10-23 17:37:17 +08:00 |
|
黎永顺
|
452c22c262
|
feature/2.9.42310.01-社保档案操作日志
|
2023-10-23 15:29:26 +08:00 |
|
黎永顺
|
d075fceb05
|
hotfix/2.9.42310.01
|
2023-10-20 14:41:42 +08:00 |
|
黎永顺
|
4898ff8335
|
hotfix/2.9.42310.01
|
2023-10-20 11:39:20 +08:00 |
|
黎永顺
|
26b25e04df
|
hotfix/2.9.42310.01
|
2023-10-20 11:21:14 +08:00 |
|
黎永顺
|
f78a59285a
|
hotfix/2.9.42310.01
|
2023-10-20 11:18:27 +08:00 |
|
黎永顺
|
d0aa6e93a0
|
feature/2.9.42310.01-薪资项目拓扑图
|
2023-10-20 10:27:00 +08:00 |
|
黎永顺
|
fafbfbe253
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-19 13:38:26 +08:00 |
|
黎永顺
|
8838566b05
|
hotfix/2.9.42310.01
|
2023-10-19 13:38:00 +08:00 |
|
黎永顺
|
bec2e5a5b2
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-19 11:51:41 +08:00 |
|
黎永顺
|
5031d3a032
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-19 09:42:46 +08:00 |
|
黎永顺
|
3dd6ede31c
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-18 17:19:14 +08:00 |
|
黎永顺
|
429853a6a6
|
hotfix/2.9.42310.01
公式测试结果显示修改
|
2023-10-18 17:18:44 +08:00 |
|
黎永顺
|
dadb749c4c
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-18 17:12:44 +08:00 |
|
黎永顺
|
55c6fd80be
|
hotfix/2.9.42310.01-社保福利档案非系统人员tab显示控制
|
2023-10-18 11:09:37 +08:00 |
|
黎永顺
|
50b56c76d1
|
Merge branch 'hotfix/2.9.42310.01' into develop
|
2023-10-18 10:40:51 +08:00 |
|
黎永顺
|
2256d9e0a1
|
Merge branch 'feature/2.9.42310.01-调薪记录' into develop
|
2023-10-18 10:40:20 +08:00 |
|
黎永顺
|
a61e6eb847
|
Merge branch 'feature/2.9.42310.01-调薪记录' into release/2.9.42310.01
|
2023-10-18 10:25:08 +08:00 |
|
黎永顺
|
4519401f64
|
Merge branch 'feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换' into release/2.9.42310.01
|
2023-10-18 10:24:54 +08:00 |
|
黎永顺
|
5a78344e2f
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-18 10:24:41 +08:00 |
|
黎永顺
|
db166275c4
|
hotfix/2.9.42310.01-社保福利档案非系统人员tab显示控制
|
2023-10-18 10:24:13 +08:00 |
|
黎永顺
|
0acc570a24
|
feature/2.9.42310.01-工资单发放页面重构单
|
2023-10-18 10:18:26 +08:00 |
|
黎永顺
|
7e30f73069
|
feature/2.9.42310.01-工资单发放页面重构单
|
2023-10-17 17:17:01 +08:00 |
|
黎永顺
|
2e613014fe
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-17 09:17:37 +08:00 |
|
黎永顺
|
6ea39d8255
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-16 16:09:30 +08:00 |
|
黎永顺
|
9a03c6ad8b
|
feature/2.9.42310.01-调薪记录
|
2023-10-16 15:27:29 +08:00 |
|
黎永顺
|
984192fdf2
|
Merge branch 'release/2.9.42310.01' into feature/2.9.42310.01-调薪记录
|
2023-10-16 14:13:53 +08:00 |
|
黎永顺
|
3c9cf1c730
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-16 11:13:44 +08:00 |
|
黎永顺
|
c2efaf193b
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-13 15:53:43 +08:00 |
|
黎永顺
|
53ddc607b3
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-13 14:52:59 +08:00 |
|
黎永顺
|
79a3f460e7
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-13 10:57:47 +08:00 |
|
黎永顺
|
ab3be2c1f9
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-13 10:20:14 +08:00 |
|
黎永顺
|
7b79fe5dc5
|
feature/2.9.42310.01-调薪记录
|
2023-10-13 09:51:50 +08:00 |
|
黎永顺
|
02863814ba
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-13 09:17:54 +08:00 |
|
黎永顺
|
89d6eebf77
|
Merge branch 'feature/2.9.42310.01-个税申报表页面重构' into develop
|
2023-10-12 15:52:54 +08:00 |
|
黎永顺
|
9f4e8468e7
|
Merge branch 'feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换' into develop
|
2023-10-12 15:52:44 +08:00 |
|
黎永顺
|
b260a41c7e
|
feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换
|
2023-10-12 15:52:15 +08:00 |
|
黎永顺
|
618d9f12cd
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-12 14:14:42 +08:00 |
|
黎永顺
|
f2027627f4
|
hotfix/2.9.42310.01
|
2023-10-12 14:08:48 +08:00 |
|
黎永顺
|
ca5b60f6aa
|
feature/2.9.42310.01-个税申报表页面重构
|
2023-10-12 13:57:14 +08:00 |
|
黎永顺
|
4d76443438
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-11 18:23:44 +08:00 |
|
黎永顺
|
d67b8bc6ab
|
hotfix/2.9.42310.01
|
2023-10-11 18:23:19 +08:00 |
|
黎永顺
|
afc4ad4d1d
|
Merge branch 'feature/2.9.42310.01-薪资核算页面重构' into develop
|
2023-10-11 16:43:01 +08:00 |
|
黎永顺
|
9e5e941a3f
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into develop
|
2023-10-11 16:42:33 +08:00 |
|
黎永顺
|
c8e58db7d9
|
Merge branch 'feature/2.9.42310.01-薪资核算页面重构' into release/2.9.42310.01
|
2023-10-11 16:26:10 +08:00 |
|
黎永顺
|
a02987088e
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into release/2.9.42310.01
|
2023-10-11 16:24:55 +08:00 |
|
黎永顺
|
6b868824ee
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-11 16:24:33 +08:00 |
|
黎永顺
|
dd9d429a81
|
hotfix/2.9.42310.01
工资单查看权限
|
2023-10-11 16:23:55 +08:00 |
|
黎永顺
|
5e51f78ff6
|
feature/2.9.42310.01-薪资核算页面重构
|
2023-10-11 15:05:24 +08:00 |
|
黎永顺
|
c9403cda9d
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into feature/2.9.42310.01-薪资核算页面重构
|
2023-10-11 13:55:53 +08:00 |
|
黎永顺
|
54b4ebe83a
|
薪资核算页面导入薪资项样式修改
|
2023-10-11 13:55:10 +08:00 |
|
黎永顺
|
93d996c79f
|
feature/2.9.42310.01-薪资核算页面重构
|
2023-10-10 17:49:45 +08:00 |
|
黎永顺
|
3fe4ede887
|
feature/2.9.42310.01-薪资核算页面重构
|
2023-10-09 17:48:45 +08:00 |
|
黎永顺
|
d00e46442d
|
hotfix/2.9.42310.01
|
2023-10-09 15:33:19 +08:00 |
|
黎永顺
|
3fdef5ba85
|
feature/2.9.42310.01-薪资核算页面重构
|
2023-10-09 15:15:59 +08:00 |
|
黎永顺
|
321275d406
|
feature/2.9.42310.01-薪资核算页面重构
|
2023-10-09 13:17:54 +08:00 |
|
黎永顺
|
eeb5904b4e
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into release/2.9.42310.01
|
2023-10-09 09:42:51 +08:00 |
|
黎永顺
|
7d222033ab
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into develop
|
2023-10-09 09:42:09 +08:00 |
|
黎永顺
|
19f183795c
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-09 09:41:48 +08:00 |
|
黎永顺
|
9aaef674f0
|
Merge branch 'feature/2.9.42310.01-工资单时效设置' into develop
|
2023-10-09 08:58:09 +08:00 |
|
黎永顺
|
010c535763
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into develop
|
2023-10-09 08:57:45 +08:00 |
|
黎永顺
|
b17f2ace8a
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into release/2.9.42310.01
|
2023-10-08 15:17:25 +08:00 |
|
黎永顺
|
b566213dcd
|
Merge branch 'feature/2.9.42310.01-工资单时效设置' into release/2.9.42310.01
|
2023-10-08 15:17:15 +08:00 |
|
黎永顺
|
d48fc2991d
|
Merge branch 'feature/2.9.42310.01-工资单发放导出PDF' into release/2.9.42310.01
|
2023-10-08 15:17:09 +08:00 |
|
黎永顺
|
48d1a674dc
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-08 15:12:28 +08:00 |
|
黎永顺
|
8d1c0abf2f
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-08 15:09:47 +08:00 |
|
黎永顺
|
da36ed3aa9
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-08 10:51:26 +08:00 |
|
黎永顺
|
c4b222e200
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-08 10:09:18 +08:00 |
|
黎永顺
|
00adb919a6
|
Merge branch 'hotfix/2.9.42310.01' into develop
|
2023-10-08 09:03:06 +08:00 |
|
黎永顺
|
a01f2cc686
|
Merge branch 'feature/2.9.42310.01-工资单时效设置' into develop
|
2023-10-08 09:02:43 +08:00 |
|
黎永顺
|
36dc096e2c
|
Merge branch 'feature/2.9.42310.01-工资单发放导出PDF' into develop
|
2023-10-08 09:02:29 +08:00 |
|
黎永顺
|
345288793b
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-08 09:01:21 +08:00 |
|
黎永顺
|
c365d2eb56
|
feature/2.9.42310.01-工资单时效设置
|
2023-10-07 16:37:44 +08:00 |
|
黎永顺
|
00d285e5be
|
hotfix/2.9.42310.01
|
2023-10-07 15:38:33 +08:00 |
|
黎永顺
|
953172f26a
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-28 14:25:21 +08:00 |
|
黎永顺
|
49e5a0ad73
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-27 17:42:55 +08:00 |
|
黎永顺
|
0902c3bb71
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-27 15:42:42 +08:00 |
|
黎永顺
|
486254601f
|
feature/2.9.42310.01-工资单发放导出PDF
|
2023-09-27 14:35:37 +08:00 |
|
黎永顺
|
22d8ecfcd4
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-27 14:19:48 +08:00 |
|
黎永顺
|
3d8bef9147
|
feature/2.9.42310.01-工资单发放导出PDF
20230926
|
2023-09-27 09:21:53 +08:00 |
|
黎永顺
|
06f19c74db
|
feature/2.9.42310.01-工资单发放导出PDF
20230926
|
2023-09-27 09:13:02 +08:00 |
|
黎永顺
|
4bb3bc403a
|
feature/2.9.42310.01-工资单发放导出PDF
20230926
|
2023-09-26 16:38:47 +08:00 |
|
黎永顺
|
929a5da68a
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-26 13:26:55 +08:00 |
|
黎永顺
|
b54a561ba4
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-26 11:03:19 +08:00 |
|
黎永顺
|
d9a6f3907c
|
hotfix/2.9.42310.01
表单字段隐藏的问题
|
2023-09-25 16:20:56 +08:00 |
|
黎永顺
|
ff3dd0ea60
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-25 15:35:11 +08:00 |
|
黎永顺
|
1f37bdde4b
|
Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表'
|
2023-09-25 10:58:51 +08:00 |
|
黎永顺
|
2c56e8dc06
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-25 09:43:03 +08:00 |
|
黎永顺
|
61637e6de7
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-21 18:18:47 +08:00 |
|
黎永顺
|
12d4b5c33c
|
hotfix/2.9.42309.01
|
2023-09-21 16:13:18 +08:00 |
|
黎永顺
|
e4d9a2c545
|
hotfix/2.9.42309.01
|
2023-09-21 15:45:58 +08:00 |
|
黎永顺
|
f8393fbe7d
|
Merge branch 'release/2.9.42309.01' into hotfix/2.9.42309.01
|
2023-09-21 15:21:10 +08:00 |
|
黎永顺
|
5b43e43f4a
|
hotfix/2.9.42309.01
|
2023-09-21 15:20:59 +08:00 |
|
黎永顺
|
0c1fdd7d13
|
Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01
|
2023-09-21 14:16:40 +08:00 |
|
黎永顺
|
93a23cb9a3
|
Merge branch 'feature/2.9.42309.01-调薪记录添加二次密码认证' into release/2.9.42309.01
|
2023-09-21 14:16:25 +08:00 |
|
黎永顺
|
cfce462898
|
Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表' into release/2.9.42309.01
|
2023-09-21 14:16:06 +08:00 |
|
黎永顺
|
f587aef084
|
Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表' into develop
|
2023-09-21 13:07:07 +08:00 |
|
黎永顺
|
f5638d9453
|
Merge branch 'hotfix/2.9.42309.01' into develop
|
2023-09-21 13:06:49 +08:00 |
|
黎永顺
|
9030e22449
|
hotfix/2.9.42309.01
|
2023-09-21 12:04:55 +08:00 |
|
黎永顺
|
96032b5f1c
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-21 10:17:06 +08:00 |
|
黎永顺
|
cdc61a94f2
|
Merge branch 'hotfix/2.9.42309.01' into develop
|
2023-09-20 17:42:21 +08:00 |
|
黎永顺
|
e7e4d17cfa
|
hotfix/2.9.42309.01
|
2023-09-20 17:42:06 +08:00 |
|
黎永顺
|
4b9b08b542
|
Merge branch 'hotfix/2.9.42309.01' into develop
|
2023-09-20 17:30:07 +08:00 |
|
黎永顺
|
c0220d8853
|
hotfix/2.9.42309.01
|
2023-09-20 17:29:50 +08:00 |
|
黎永顺
|
be29592bec
|
Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into develop
|
2023-09-20 17:26:53 +08:00 |
|
黎永顺
|
e192087764
|
Merge branch 'feature/2.9.42309.01-调薪记录添加二次密码认证' into develop
|
2023-09-20 17:26:30 +08:00 |
|
黎永顺
|
089bed1f53
|
Merge branch 'hotfix/2.9.42309.01' into develop
|
2023-09-20 17:26:19 +08:00 |
|
黎永顺
|
26fdf624bb
|
hotfix/2.9.42309.01
|
2023-09-20 17:25:56 +08:00 |
|
黎永顺
|
d664ad2769
|
feature/2.9.42309.01-薪酬统计报表分享报表
20230920
|
2023-09-20 17:03:24 +08:00 |
|
黎永顺
|
b22b41382f
|
hotfix/2.9.42309.01
20230920-社保福利方案添加搜索条件
|
2023-09-20 16:51:00 +08:00 |
|
黎永顺
|
d7c59f5434
|
feature/2.9.42309.01-薪酬统计报表分享报表
20230920
|
2023-09-20 15:03:05 +08:00 |
|
黎永顺
|
a58da11dc3
|
hotfix/2.9.42309.01
20230920
|
2023-09-20 14:20:51 +08:00 |
|
黎永顺
|
6ac979e9e7
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-20 09:25:10 +08:00 |
|
黎永顺
|
10c7280b43
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-19 17:24:52 +08:00 |
|
黎永顺
|
9084c20717
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 19:34:16 +08:00 |
|
黎永顺
|
cf38c91be8
|
Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 18:42:37 +08:00 |
|
黎永顺
|
1ee6650234
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 18:42:27 +08:00 |
|
黎永顺
|
c0c908f6eb
|
Merge branch 'hotfix/2.9.42309.01' into feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 17:48:35 +08:00 |
|
黎永顺
|
1c7ad4e871
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 16:59:21 +08:00 |
|
黎永顺
|
98054b3c8d
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 15:05:25 +08:00 |
|
黎永顺
|
e10e39e630
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 13:37:00 +08:00 |
|
黎永顺
|
e2be082a54
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 10:40:30 +08:00 |
|
黎永顺
|
f29d985e64
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-15 16:53:17 +08:00 |
|
黎永顺
|
707ca40f05
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-15 11:14:39 +08:00 |
|
黎永顺
|
d008654bf8
|
hotfix/2.9.42309.01
|
2023-09-14 15:50:24 +08:00 |
|
黎永顺
|
b52afbb7c8
|
Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01
|
2023-09-14 14:21:45 +08:00 |
|
黎永顺
|
85867da080
|
hotfix/2.9.42309.01
|
2023-09-14 14:19:08 +08:00 |
|
黎永顺
|
4769df4cfd
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-14 14:05:40 +08:00 |
|
黎永顺
|
f18bda74f4
|
hotfix/2.9.42309.01
|
2023-09-14 11:50:22 +08:00 |
|
黎永顺
|
ef16acd638
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-14 11:41:29 +08:00 |
|
黎永顺
|
02be280127
|
Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01
|
2023-09-14 10:38:10 +08:00 |
|
黎永顺
|
2b282b4211
|
hotfix/2.9.42309.01
|
2023-09-14 10:37:39 +08:00 |
|
黎永顺
|
8a90d58196
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-14 10:25:22 +08:00 |
|
黎永顺
|
3f18e4a0a7
|
feature/2.9.42309.01-调薪记录添加二次密码认证
|
2023-09-13 10:44:37 +08:00 |
|
黎永顺
|
5ce2f5bf31
|
hotfix/2.9.42308.02
|
2023-09-12 11:14:51 +08:00 |
|
黎永顺
|
a583087f5f
|
Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into release/2.9.42309.01
|
2023-09-11 13:43:28 +08:00 |
|
黎永顺
|
32404ec04e
|
Merge branch 'hotfix/2.9.42308.02' into release/2.9.42309.01
|
2023-09-11 13:43:04 +08:00 |
|
黎永顺
|
8da781193a
|
hotfix/2.9.42308.02
|
2023-09-08 13:53:11 +08:00 |
|
黎永顺
|
6043192bfe
|
Merge branch 'feature/2.9.42308.02-薪资项目同步到薪资账套' into release/2.9.42309.01
|
2023-09-07 10:07:19 +08:00 |
|
黎永顺
|
96f65e42b0
|
feature/2.9.42309.01-社保福利档案添加非系统人员列表
|
2023-09-06 14:54:45 +08:00 |
|
黎永顺
|
ce462fe51a
|
hotfix/2.9.42308.02
|
2023-09-06 14:27:23 +08:00 |
|
黎永顺
|
f593e97207
|
feature社保福利档案添加非系统人员列表
|
2023-09-06 10:19:35 +08:00 |
|
黎永顺
|
bb1e328c92
|
feature社保福利档案添加非系统人员列表
|
2023-09-05 16:49:26 +08:00 |
|
黎永顺
|
2a40afb7b4
|
feature社保福利档案添加非系统人员列表
|
2023-09-05 15:14:05 +08:00 |
|
黎永顺
|
bc3632e054
|
薪资档案发薪员工页面的调薪页面重构
|
2023-09-04 18:13:19 +08:00 |
|
黎永顺
|
6043159976
|
薪资档案发薪员工页面的调薪页面重构
|
2023-09-04 16:48:36 +08:00 |
|
黎永顺
|
242b96321a
|
样式优化
|
2023-09-01 14:06:32 +08:00 |
|
黎永顺
|
5b6480f076
|
hotfix/2.9.42308.02-工资单模板设置名称保存失败bug修复
|
2023-09-01 11:08:35 +08:00 |
|
黎永顺
|
cae8d86cd6
|
规则设置-加解密修改为默认开启
|
2023-09-01 09:29:49 +08:00 |
|
黎永顺
|
209392a2f8
|
Merge branch 'hotfix/2.9.42308.02' into develop
|
2023-08-31 15:03:30 +08:00 |
|
黎永顺
|
a5e0ca3084
|
薪资项目公式保存参数修改
|
2023-08-31 15:02:56 +08:00 |
|
黎永顺
|
0a37f80611
|
Merge branch 'feature/2.9.42308.02-薪资项目同步到薪资账套' into develop
|
2023-08-31 14:44:26 +08:00 |
|
黎永顺
|
036e59b91a
|
feature/2.9.42308.02-薪资项目同步到薪资账套
|
2023-08-31 14:43:57 +08:00 |
|
黎永顺
|
a058242d35
|
feature/2.9.42308.02-薪资项目同步到薪资账套
|
2023-08-31 14:23:51 +08:00 |
|
黎永顺
|
def2159e19
|
Merge branch 'hotfix/2.9.42308.02' into develop
|
2023-08-31 11:15:48 +08:00 |
|
黎永顺
|
b6ac297242
|
hotfix-社保福利档案以及薪资档案的导入下载模板功能优化
|
2023-08-31 11:15:32 +08:00 |
|
黎永顺
|
f65b7979d7
|
hotfix-薪资核算详情页面编辑刷新分页的bug
|
2023-08-31 09:40:09 +08:00 |
|
黎永顺
|
ecc2021916
|
2.9.42308.02bug修复
|
2023-08-29 14:24:43 +08:00 |
|
黎永顺
|
78e08d7c26
|
系统数字输入框保留小数位数配置
|
2023-08-25 16:12:05 +08:00 |
|
黎永顺
|
4462753f28
|
Merge branch 'release/2.8.3.2308.01' into hotfix/2.9.42308.02
|
2023-08-25 15:39:49 +08:00 |
|
黎永顺
|
25ce139a0c
|
产品-工资单产看页面dom渲染顺序优化
|
2023-08-21 10:53:19 +08:00 |
|
黎永顺
|
a22f3ade1f
|
Merge branch 'hotfix/2.9.42308.02' into release/2.9.42308.02
|
2023-08-18 10:19:06 +08:00 |
|
黎永顺
|
8871b8ed2c
|
hotfix/2.9.42308.02
|
2023-08-18 10:18:53 +08:00 |
|
黎永顺
|
49dce1c871
|
代码合并
|
2023-08-17 13:45:21 +08:00 |
|
黎永顺
|
38e2b1b61b
|
Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into release/2.8.3.2308.01
# Conflicts:
# pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
|
2023-08-17 08:43:43 +08:00 |
|
黎永顺
|
9633bcabfb
|
Merge branch 'feature/2.8.3.2308.01-社保福利方案自定义方案添加删除功能' into release/2.8.3.2308.01
|
2023-08-17 08:38:06 +08:00 |
|
黎永顺
|
290c3e51d3
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into release/2.8.3.2308.01
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
|
2023-08-17 08:37:56 +08:00 |
|
黎永顺
|
6d10c01f0c
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into release/2.8.3.2308.01
# Conflicts:
# pc4mobx/hrmSalary/stores/payroll.js
|
2023-08-17 08:36:27 +08:00 |
|
黎永顺
|
2527f75298
|
字段管理新增修改
|
2023-08-16 10:30:37 +08:00 |
|
黎永顺
|
5adfa47b5b
|
bug修改-断点
|
2023-08-11 17:34:42 +08:00 |
|
黎永顺
|
262976cc5e
|
产品-合并代码
|
2023-08-04 13:55:20 +08:00 |
|
黎永顺
|
605370e12a
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
|
2023-08-04 09:34:26 +08:00 |
|
黎永顺
|
480106d4e7
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-08-04 09:34:04 +08:00 |
|
黎永顺
|
250c7a0719
|
Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into develop
|
2023-08-04 09:29:51 +08:00 |
|
黎永顺
|
208e413560
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-08-02 11:58:06 +08:00 |
|
黎永顺
|
d04c053c07
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-08-02 11:57:46 +08:00 |
|
黎永顺
|
cbd06fa42a
|
产品-非系统人员管理导入
|
2023-08-02 11:17:17 +08:00 |
|
黎永顺
|
a6c6ff6e5e
|
Merge branch 'hotfix/2.8.3.2308.01' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
|
2023-08-02 10:21:40 +08:00 |
|
黎永顺
|
c6fe44d976
|
Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into develop
|
2023-08-01 17:57:57 +08:00 |
|
黎永顺
|
bc12a12097
|
产品-非系统人员管理导入
|
2023-08-01 17:44:59 +08:00 |
|
黎永顺
|
cb94dabd30
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
|
2023-08-01 16:10:29 +08:00 |
|
黎永顺
|
5eec7139d6
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 16:09:23 +08:00 |
|
黎永顺
|
a433de7671
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 16:03:48 +08:00 |
|
黎永顺
|
b03c193927
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 15:51:02 +08:00 |
|
黎永顺
|
dbae61623d
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 15:48:47 +08:00 |
|
黎永顺
|
4601742b9d
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-08-01 13:37:54 +08:00 |
|
黎永顺
|
ce87730349
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-08-01 13:37:35 +08:00 |
|
黎永顺
|
d7bfa245d5
|
产品-dev合并
|
2023-08-01 11:19:23 +08:00 |
|
黎永顺
|
d1594e5620
|
Merge branch 'feature/2.8.3.2308.01-社保福利方案自定义方案添加删除功能' into develop
|
2023-08-01 09:04:49 +08:00 |
|
黎永顺
|
b51e1f8dc2
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-07-31 19:08:25 +08:00 |
|
黎永顺
|
33641790e3
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-31 19:08:07 +08:00 |
|
黎永顺
|
bdb64d23fc
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
|
2023-07-31 11:51:37 +08:00 |
|
黎永顺
|
db53fc8942
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-31 11:50:30 +08:00 |
|
黎永顺
|
763c307f3d
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-07-31 11:20:37 +08:00 |
|
黎永顺
|
223effab98
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-31 11:20:14 +08:00 |
|
黎永顺
|
d9d4c2ff91
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
|
2023-07-31 10:51:30 +08:00 |
|
黎永顺
|
600d73f858
|
产品-薪资账套薪资项目编辑功能修改
|
2023-07-31 10:51:10 +08:00 |
|
黎永顺
|
2c025ebcb1
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
|
2023-07-28 17:13:26 +08:00 |
|
黎永顺
|
fb40c1a998
|
产品-薪资账套编辑
|
2023-07-28 16:28:27 +08:00 |
|
黎永顺
|
2ba7f25779
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
|
2023-07-28 09:26:42 +08:00 |
|
黎永顺
|
8071a62ec8
|
产品-社保福利方案自定义方案添加删除功能
|
2023-07-27 14:58:32 +08:00 |
|
黎永顺
|
6fd55967bd
|
产品-合并问题处理
|
2023-07-27 14:09:21 +08:00 |
|
黎永顺
|
a3fde65b39
|
产品-社保福利的自定义以及福利档案的接口调整
|
2023-07-27 11:00:57 +08:00 |
|
黎永顺
|
28471fe108
|
产品-社保福利的自定义以及福利档案的接口调整
|
2023-07-27 09:55:51 +08:00 |
|
黎永顺
|
868a546dd6
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-27 09:08:57 +08:00 |
|
黎永顺
|
3f63b26184
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-26 14:10:55 +08:00 |
|
黎永顺
|
c9c79460c7
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-26 09:31:15 +08:00 |
|
黎永顺
|
6a45f624e2
|
产品-社保档案基础信息修改
|
2023-07-25 18:22:43 +08:00 |
|
黎永顺
|
ada5aee430
|
产品-社保档案基础信息修改
|
2023-07-25 16:16:39 +08:00 |
|
黎永顺
|
e963bcfb57
|
产品-社保档案基础信息修改
|
2023-07-24 18:22:24 +08:00 |
|
黎永顺
|
d73fd7bac8
|
产品-社保档案基础信息修改
|
2023-07-24 11:15:41 +08:00 |
|
黎永顺
|
aa6a581c1a
|
产品-编辑功能
|
2023-07-24 11:14:22 +08:00 |
|
黎永顺
|
a2f81296d8
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能'
|
2023-07-24 10:57:50 +08:00 |
|
黎永顺
|
07ba7a61c2
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into release/2.8.3.2307.02
|
2023-07-24 09:46:30 +08:00 |
|
黎永顺
|
ac37e9b16d
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-21 15:37:57 +08:00 |
|
黎永顺
|
bc6d296a85
|
Merge branch 'feature/V2-非系统人员管理开发' into develop
|
2023-07-21 11:41:32 +08:00 |
|
黎永顺
|
9b80413e01
|
Merge branch 'feature/2.8.3.2307.02-规则设置系统算税开关关闭后禁用' into develop
|
2023-07-21 11:40:53 +08:00 |
|
黎永顺
|
43e3a853ff
|
Merge branch 'feature/2.8.3.2307.02-薪资项目添加默认隐藏的功能' into develop
|
2023-07-21 11:40:16 +08:00 |
|
黎永顺
|
bf7a1478c5
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-07-21 10:16:12 +08:00 |
|
黎永顺
|
3091232181
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-21 10:15:48 +08:00 |
|
黎永顺
|
bc9214edcd
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-07-20 18:27:11 +08:00 |
|
黎永顺
|
4716d3d8a6
|
Merge branch 'hotfix/2.8.3.2307.02' into develop
|
2023-07-20 18:26:57 +08:00 |
|
黎永顺
|
8e399f979a
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-20 18:26:34 +08:00 |
|
黎永顺
|
d5a625d4c8
|
产品-release/2.8.3.2307.02bug修复
|
2023-07-20 17:03:20 +08:00 |
|
黎永顺
|
f7cd085c92
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-20 16:16:43 +08:00 |
|
黎永顺
|
c062f172f6
|
Merge branch 'feature/V2-非系统人员管理开发' into release/2.8.3.2307.02
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-20 13:47:42 +08:00 |
|
黎永顺
|
01c033eacf
|
Merge branch 'feature/2.8.3.2307.02-规则设置系统算税开关关闭后禁用' into release/2.8.3.2307.02
|
2023-07-20 13:45:12 +08:00 |
|
黎永顺
|
f3712e03ef
|
Merge branch 'feature/2.8.3.2307.02-薪资项目添加默认隐藏的功能' into release/2.8.3.2307.02
|
2023-07-20 13:44:54 +08:00 |
|
黎永顺
|
88b6c23aed
|
Merge branch 'feature/2.8.3.2307.02-薪资核算按自定义列导出' into release/2.8.3.2307.02
|
2023-07-20 13:44:33 +08:00 |
|
黎永顺
|
27bb5e823d
|
Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.02
# Conflicts:
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
|
2023-07-20 13:44:02 +08:00 |
|
黎永顺
|
c48c73a755
|
产品-非系统人员更改
|
2023-07-20 13:40:42 +08:00 |
|
黎永顺
|
9d94619c1d
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-20 13:35:37 +08:00 |
|
黎永顺
|
f323bc6b7c
|
Merge branch 'hotfix/2.8.3.2307.02' into release/2.8.3.2307.02
|
2023-07-19 15:03:13 +08:00 |
|
黎永顺
|
d1b2f98387
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-19 15:02:44 +08:00 |
|
黎永顺
|
77645b717a
|
产品-薪资项目添加默认隐藏的功能
|
2023-07-18 17:31:13 +08:00 |
|
黎永顺
|
da3fd957ab
|
产品-规则设置系统算税开关关闭后禁用
|
2023-07-18 17:27:51 +08:00 |
|
黎永顺
|
1be06c98b0
|
Merge branch 'feature/2.8.3.2307.02-薪资项目添加默认隐藏的功能' into develop
|
2023-07-18 16:50:43 +08:00 |
|
黎永顺
|
4e3e090c3c
|
产品-薪资项目隐藏项
|
2023-07-18 16:50:16 +08:00 |
|
黎永顺
|
192533e847
|
bug-自定义福利关闭启用时提示错误
|
2023-07-18 16:01:45 +08:00 |
|
黎永顺
|
bc1dba0702
|
Merge branch 'feature/2.8.3.2307.02-薪资项目添加默认隐藏的功能' into develop
|
2023-07-18 15:48:49 +08:00 |
|
黎永顺
|
2cbdc89581
|
Merge branch 'feature/2.8.3.2307.02-薪资核算按自定义列导出' into develop
|
2023-07-18 15:48:42 +08:00 |
|
黎永顺
|
ee49150930
|
产品-薪资项目管理添加默认隐藏的功能
|
2023-07-18 15:47:56 +08:00 |
|
黎永顺
|
9d1b537abf
|
产品-薪资项目管理添加默认隐藏的功能
|
2023-07-18 15:25:16 +08:00 |
|
黎永顺
|
f15ace5c33
|
Merge branch 'feature/2.8.3.2307.02-工资单反馈' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-17 17:45:24 +08:00 |
|
黎永顺
|
377039ade2
|
产品-工资单反馈添加提示语
|
2023-07-17 17:40:30 +08:00 |
|
黎永顺
|
70bd93ef2f
|
Merge branch 'release/2.8.3.2307.01' into feature/2.8.3.2307.02-工资单反馈
# Conflicts:
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-17 17:09:27 +08:00 |
|
黎永顺
|
57958f9bf9
|
产品-薪资核算按自定义列导出
|
2023-07-17 16:49:02 +08:00 |
|
黎永顺
|
ff035c87f3
|
Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01
# Conflicts:
# pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
|
2023-07-17 15:22:17 +08:00 |
|
黎永顺
|
8ca7a02f82
|
产品-工资单反馈跳转验证
|
2023-07-17 15:21:05 +08:00 |
|
黎永顺
|
bcecb87dc5
|
Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01
# Conflicts:
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
|
2023-07-17 14:44:05 +08:00 |
|
黎永顺
|
2af9059775
|
产品-工资单反馈跳转验证
|
2023-07-17 14:43:01 +08:00 |
|
黎永顺
|
25f2c2efd6
|
Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01
# Conflicts:
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-17 13:50:54 +08:00 |
|
黎永顺
|
81faf155b7
|
Merge branch 'feature/2.8.3.2307.02-工资单反馈' into develop
|
2023-07-17 11:43:39 +08:00 |
|
黎永顺
|
4fa57ba637
|
产品-工资单反馈开发
|
2023-07-17 11:43:14 +08:00 |
|
黎永顺
|
778ca2655b
|
薪资核算自定义列导出
|
2023-07-17 11:26:13 +08:00 |
|
黎永顺
|
ce93eff734
|
规则名称修改
|
2023-07-17 10:58:02 +08:00 |
|
黎永顺
|
98a4de233b
|
Merge branch 'master' into hotfix/2.8.3.2307.02
|
2023-07-14 15:32:06 +08:00 |
|
黎永顺
|
90bb69f292
|
bug-社保福利台账核算页面按钮文字修改
|
2023-07-14 15:31:57 +08:00 |
|
黎永顺
|
5d5dc0b47e
|
Merge branch 'feature/V2-非系统人员管理开发' into develop
|
2023-07-14 14:12:36 +08:00 |
|
黎永顺
|
1542d8c982
|
非系统人员配置功能
|
2023-07-14 14:09:27 +08:00 |
|
黎永顺
|
91c2060265
|
Merge branch 'feature/非系统人员开关' into develop
# Conflicts:
# pc4mobx/hrmSalary/apis/ruleconfig.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-14 10:43:05 +08:00 |
|
黎永顺
|
cf33419bc3
|
非系统人员配置功能
|
2023-07-14 10:39:12 +08:00 |
|
黎永顺
|
1747e983e4
|
Merge branch 'feature/230701-工资单移动端查看二次密码验证设置' into release/2.8.3.2307.01
|
2023-07-13 15:24:37 +08:00 |
|
黎永顺
|
626f8721fb
|
二次密码设置
|
2023-07-13 15:23:38 +08:00 |
|
黎永顺
|
aa1c3a6417
|
Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01
|
2023-07-13 15:11:06 +08:00 |
|
黎永顺
|
985b9612f6
|
薪资档案个税扣缴义务人选项修改
|
2023-07-13 15:02:57 +08:00 |
|
黎永顺
|
b3e5d2ba1c
|
dev合并工资单反馈代码
|
2023-07-13 14:58:27 +08:00 |
|
黎永顺
|
92edd14872
|
Merge branch 'feature/工资单反馈' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
|
2023-07-13 14:49:42 +08:00 |
|
黎永顺
|
aff963b5c6
|
工资单反馈功能新增
|
2023-07-13 14:45:25 +08:00 |
|
黎永顺
|
44abe03216
|
Merge branch 'feature/V2-非系统人员管理开发' into develop
|
2023-07-13 10:32:05 +08:00 |
|
黎永顺
|
e83ff0dbcc
|
非系统人员管理开发合并
|
2023-07-13 10:31:45 +08:00 |
|
黎永顺
|
9e75d1aca6
|
Merge branch 'feature/V2-非系统人员管理开发' into develop
|
2023-07-13 10:05:38 +08:00 |
|
黎永顺
|
eaf8e5c51e
|
非系统人员管理开发合并
|
2023-07-13 10:05:16 +08:00 |
|
黎永顺
|
f3fdd91201
|
Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01
|
2023-07-13 09:51:20 +08:00 |
|
黎永顺
|
0650acb1fc
|
Merge branch 'feature/230701-工资单移动端查看二次密码验证设置' into release/2.8.3.2307.01
|
2023-07-13 09:43:41 +08:00 |
|
黎永顺
|
981cd54262
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-13 09:38:16 +08:00 |
|
黎永顺
|
7c908c81db
|
产品-薪資核算核算页面的列表带搜索条件翻页查询不错的bug修复
|
2023-07-13 09:37:17 +08:00 |
|
黎永顺
|
ef3b74c98f
|
Merge branch 'feature/工资单反馈' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-12 16:22:04 +08:00 |
|
黎永顺
|
a3e9a6e733
|
产品-工资单反馈改造
|
2023-07-12 16:18:54 +08:00 |
|
黎永顺
|
8356de0fa2
|
非系统人员开发合并
|
2023-07-12 14:34:07 +08:00 |
|
黎永顺
|
38c9d97f54
|
非系统人员开发合并
|
2023-07-12 13:43:15 +08:00 |
|
黎永顺
|
147749796a
|
产品-工资单反馈
|
2023-07-12 11:32:15 +08:00 |
|
黎永顺
|
ed53bb6a9e
|
Merge branch 'feature/工资单反馈' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-12 10:19:36 +08:00 |
|
黎永顺
|
b8c8297cf0
|
产品-工资单反馈
|
2023-07-12 10:14:38 +08:00 |
|
黎永顺
|
62914e0ed0
|
非系统人员管理开发合并
|
2023-07-11 18:07:40 +08:00 |
|
黎永顺
|
cb9056c50a
|
非系统人员管理开发合并
|
2023-07-11 17:49:31 +08:00 |
|
黎永顺
|
ce50c9cf91
|
Merge branch 'release/2.8.3.2307.01' into feature/V2-非系统人员管理开发
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
# pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
# pc4mobx/hrmSalary/util/index.js
|
2023-07-11 17:36:38 +08:00 |
|
黎永顺
|
eb2d77e399
|
产品-工资单反馈
|
2023-07-11 17:27:45 +08:00 |
|
黎永顺
|
facc8dd4f6
|
Merge branch 'feature/230701-工资单移动端查看二次密码验证设置' into develop
|
2023-07-11 12:08:18 +08:00 |
|
黎永顺
|
a13f31eefa
|
产品-工资单模板移动端二次密码设置
|
2023-07-11 12:08:01 +08:00 |
|
黎永顺
|
d8fdc8096b
|
产品-工资单模板移动端二次密码设置
|
2023-07-11 11:43:05 +08:00 |
|
黎永顺
|
405e2a9bc6
|
产品-工资单模板移动端二次密码设置
|
2023-07-11 10:44:49 +08:00 |
|
黎永顺
|
986e2d7f4a
|
Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-07-11 10:11:58 +08:00 |
|
黎永顺
|
4ffa11d5a1
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-11 09:08:46 +08:00 |
|
黎永顺
|
c8fe01dfda
|
产品-薪酬统计报表echarts图标组件封装
|
2023-07-10 15:52:25 +08:00 |
|
黎永顺
|
0159fe0647
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-07-10 11:40:52 +08:00 |
|
黎永顺
|
cc4cccf111
|
产品-多页面列表查询人员状态传参统一修改为数组
|
2023-07-10 11:39:36 +08:00 |
|
黎永顺
|
f30c80e2ef
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-10 11:01:12 +08:00 |
|
黎永顺
|
d984a105fd
|
产品-多页面列表查询人员状态传参统一修改为数组
|
2023-07-10 11:00:47 +08:00 |
|
黎永顺
|
54d23aeb57
|
Merge branch 'feature/230701-维护工具-删除档案' into release/2.8.3.2307.01
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-07-10 10:05:27 +08:00 |
|
黎永顺
|
448bde008f
|
Merge branch 'feature/230701-工资单定时发送任务' into release/2.8.3.2307.01
|
2023-07-10 10:04:02 +08:00 |
|
黎永顺
|
b51b408526
|
Merge branch 'feature/230701-工资单移动端查看二次密码验证设置' into develop
|
2023-07-10 09:58:49 +08:00 |
|
黎永顺
|
9226ef19b3
|
产品-移动端二次验证密码设置
|
2023-07-10 09:21:57 +08:00 |
|
黎永顺
|
424b3bbfb2
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-07 13:45:31 +08:00 |
|
黎永顺
|
aa9c4223b6
|
产品-薪资核算弹框样式修改
|
2023-07-07 13:45:11 +08:00 |
|
黎永顺
|
b14e889d57
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-07 11:03:03 +08:00 |
|
黎永顺
|
153be5b7a7
|
产品-列表按钮数统一
|
2023-07-07 10:47:45 +08:00 |
|
黎永顺
|
8b143a937f
|
Merge branch 'feature/230701-工资单定时发送任务' into develop
|
2023-07-05 14:06:08 +08:00 |
|
黎永顺
|
ae79ab24c3
|
产品-工资单模板定时发放添加薪资所属月
|
2023-07-05 14:04:26 +08:00 |
|
黎永顺
|
f8c1806d50
|
Merge branch 'feature/230701-工资单定时发送任务' into develop
|
2023-07-05 10:55:07 +08:00 |
|
黎永顺
|
e501aa293e
|
产品-工资单模板定时发放添加薪资所属月
|
2023-07-05 10:54:39 +08:00 |
|
黎永顺
|
d2fe01c759
|
产品-工资单模板定时发放bug处理以及规则设置
|
2023-07-04 17:37:04 +08:00 |
|
黎永顺
|
d4aa7305c2
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-04 16:02:27 +08:00 |
|
黎永顺
|
ff7ef86172
|
产品-薪资核算列表样式修改
|
2023-07-04 16:02:15 +08:00 |
|
黎永顺
|
600816c98f
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-04 16:00:15 +08:00 |
|
黎永顺
|
0772c85c01
|
产品-薪资核算列表样式修改
|
2023-07-04 16:00:01 +08:00 |
|
黎永顺
|
0188608722
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-04 15:56:23 +08:00 |
|
黎永顺
|
17a1262d46
|
产品-薪资核算列表样式修改
|
2023-07-04 15:56:06 +08:00 |
|
黎永顺
|
ac17ecccc0
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-04 15:42:54 +08:00 |
|
黎永顺
|
61ebfdf9f1
|
产品-薪酬统计报表图表组件优化
|
2023-07-04 15:42:39 +08:00 |
|
黎永顺
|
a204cc0729
|
Merge branch 'feature/230701-工资单定时发送任务' into develop
|
2023-07-04 09:11:33 +08:00 |
|
黎永顺
|
91b2e92c11
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-07-04 09:11:17 +08:00 |
|
黎永顺
|
2ede16eee6
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-03 17:30:08 +08:00 |
|
黎永顺
|
a623679975
|
产品-数据采集页面编辑框换成数字输入框
|
2023-07-03 17:29:53 +08:00 |
|
黎永顺
|
afd3163ff5
|
产品-统一页面列表操作按钮
|
2023-07-03 16:03:56 +08:00 |
|
黎永顺
|
3d04a79fcd
|
产品-统一页面列表操作按钮
|
2023-07-03 15:42:11 +08:00 |
|
黎永顺
|
c0aa321bf0
|
Merge branch 'master' into feature/230701-列表上面操作按钮显示两个
|
2023-07-03 14:00:23 +08:00 |
|
黎永顺
|
7b563e3d14
|
Merge branch 'feature/230701-工资单定时发送任务' into develop
|
2023-07-03 13:54:27 +08:00 |
|
黎永顺
|
fbf16f97dc
|
产品-工资单模板定时发放功能开发
|
2023-07-03 13:52:20 +08:00 |
|
黎永顺
|
0c9d4cc47e
|
产品-个税申报撤回配置
|
2023-06-30 16:51:07 +08:00 |
|
黎永顺
|
9cea2259bc
|
产品-薪资档案社保福利档案删除功能开发完成
|
2023-06-30 16:13:46 +08:00 |
|
黎永顺
|
3a8dd06e3c
|
产品-工资单水印预览和查看不一致的问题处理，账套项目预览隐藏分组未实现， 数据采集查看明细时页面显示不对齐问题处理
|
2023-06-30 10:17:23 +08:00 |
|
黎永顺
|
dc27a3e491
|
产品-工资单发放查看页面空白的问题处理
|
2023-06-29 14:59:24 +08:00 |
|
黎永顺
|
a56b2ffd70
|
Merge branch 'feature/0612-工资单水印设置' into release/2.8.3.2306.02
|
2023-06-28 15:25:24 +08:00 |
|
黎永顺
|
ecdf3c5f26
|
产品-薪资核算详情页面以及薪资核算的线下对比页面添加查看权限功能
|
2023-06-28 15:24:15 +08:00 |
|
黎永顺
|
531d71328e
|
Merge branch 'feature/0612-工资单水印设置' into release/2.8.3.2306.02
|
2023-06-27 17:12:47 +08:00 |
|
黎永顺
|
9ed8b79e64
|
产品-薪资核算详情页面以及薪资核算的线下对比页面添加查看权限功能
|
2023-06-27 17:11:52 +08:00 |
|
黎永顺
|
229884d9ed
|
Merge branch 'feature/0612-工资单水印设置' into release/2.8.3.2306.02
|
2023-06-26 11:30:35 +08:00 |
|
黎永顺
|
5ee54ef656
|
Merge branch 'feature/0612-个税申报表添加配置撤回的功能' into release/2.8.3.2306.02
|
2023-06-26 11:30:27 +08:00 |
|
黎永顺
|
ae9d7cc7c0
|
产品-列表上面操作按钮显示两个
|
2023-06-26 11:27:27 +08:00 |
|
黎永顺
|
2f4eebe6c7
|
产品-列表上面操作按钮显示两个
|
2023-06-26 10:24:05 +08:00 |
|
黎永顺
|
e06728670b
|
产品-数据采集页面列表样式修改
|
2023-06-20 14:25:30 +08:00 |
|
黎永顺
|
d3bba3eab4
|
Merge branch 'release-2023-06-08' into hotfix/V2-20230605
|
2023-06-20 11:43:25 +08:00 |
|
黎永顺
|
b77aad0e42
|
产品-工资单模板列表页面接口修改
|
2023-06-19 18:48:50 +08:00 |