Commit Graph

96 Commits

Author SHA1 Message Date
黎永顺 055e10296e feature/2.9.42310.01-薪资项目拓扑图 2024-04-09 11:00:59 +08:00
黎永顺 da70788569 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 2024-04-09 11:00:12 +08:00
黎永顺 2d046da062 master 2024-04-09 10:58:56 +08:00
黎永顺 1e028bb2ad feature/2.9.42310.01-薪资项目拓扑图 2024-04-02 15:58:21 +08:00
黎永顺 2708ff3dc5 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 2024-03-27 15:48:08 +08:00
黎永顺 64d3b211da master
薪酬报表表格底色设置
2024-03-27 15:46:25 +08:00
黎永顺 db6bbd8bfa Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 2024-03-25 18:33:16 +08:00
黎永顺 b94e93a6aa master
薪酬报表表格底色设置
2024-03-25 18:30:56 +08:00
黎永顺 f6557f1b63 master-bug 2024-03-18 13:49:08 +08:00
黎永顺 7508a3a4b1 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 2024-03-06 11:15:03 +08:00
黎永顺 8666e97ded master-新增年终奖计税 2024-02-29 17:05:59 +08:00
黎永顺 84156ede1d master-新增年终奖计税 2024-02-29 10:12:40 +08:00
黎永顺 174d36ffa2 master-新增年终奖计税 2024-02-28 15:19:37 +08:00
黎永顺 df75a3cdfa Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 2024-02-22 15:16:55 +08:00
黎永顺 e56123201f master 2024-02-22 15:16:09 +08:00
黎永顺 14e25e6d2b Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 2024-02-22 15:07:25 +08:00
黎永顺 d171afcafe master 2024-02-22 15:06:29 +08:00
黎永顺 de2c10c400 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 2024-02-21 15:51:05 +08:00
黎永顺 7152e7e889 master 2024-02-21 15:49:16 +08:00
黎永顺 fc48c2c20d master 2024-02-02 14:33:48 +08:00
黎永顺 b333b32f01 master 2024-01-30 13:52:01 +08:00
黎永顺 e02c97c41a 统一表格组件封装 2024-01-24 15:35:50 +08:00
黎永顺 0c43d47895 master 2024-01-17 17:24:12 +08:00
黎永顺 30d225b4ed feature/2.9.42310.01-薪资项目拓扑图 2024-01-17 17:21:47 +08:00
黎永顺 992c85acf5 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 2024-01-17 14:33:24 +08:00
黎永顺 4380ebb8e8 master 2024-01-17 14:32:26 +08:00
黎永顺 81a30417a9 feature/2.9.42310.01-薪资项目拓扑图
去掉固定根节点
2024-01-11 15:49:55 +08:00
黎永顺 58152f0528 master 2024-01-11 14:52:52 +08:00
黎永顺 b9846d5abd master 2024-01-08 18:04:32 +08:00
黎永顺 f7cd8f8cbc feature/2.9.42310.01-薪资项目拓扑图 2024-01-05 14:01:19 +08:00
黎永顺 156b3288b0 master 2024-01-05 10:32:13 +08:00
黎永顺 0229e27df5 feature/2.9.42310.01-薪资项目拓扑图 2024-01-03 14:42:47 +08:00
黎永顺 03d0e23191 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
# Conflicts:
#	public/css/iconfont/demo_index.html
#	public/css/iconfont/iconfont.css
#	public/css/iconfont/iconfont.js
#	public/css/iconfont/iconfont.json
#	public/css/iconfont/iconfont.ttf
#	public/css/iconfont/iconfont.woff
#	public/css/iconfont/iconfont.woff2
#	src/pages/atdTable/components/index.less
#	src/pages/calcTable/calcExplainFooter.tsx
#	src/pages/calcTable/customTableTitle.tsx
2024-01-03 14:35:33 +08:00
黎永顺 2f50be171a master 2024-01-03 14:31:31 +08:00
黎永顺 b992c06a21 master 2023-12-29 10:17:56 +08:00
黎永顺 7fc3c7538c feature/2.9.42310.01-薪资项目拓扑图
中江薪资核算列表表头修改
2023-12-28 11:37:11 +08:00
黎永顺 335baa2c78 master-个税申报表 2023-12-28 11:12:30 +08:00
黎永顺 722e0b39db feature/2.9.42310.01-薪资项目拓扑图 2023-12-22 14:11:23 +08:00
黎永顺 104b36786c master 2023-12-11 14:45:15 +08:00
黎永顺 6c79742e75 master-薪资核算表格适配详情页查看 2023-12-07 18:50:47 +08:00
黎永顺 2ea548bd7f master-薪资核算添加批量更新功能 2023-12-07 09:22:54 +08:00
黎永顺 0c00895f18 custom/鲁控数字-薪资核算列表页面批量编辑 2023-12-06 11:42:12 +08:00
黎永顺 be82684622 master 2023-12-06 11:16:44 +08:00
黎永顺 042a962a2f feature/2.9.42310.01-薪资项目拓扑图 2023-12-04 14:17:11 +08:00
黎永顺 607f62b89e feature/2.9.42310.01-薪资项目拓扑图 2023-11-30 13:47:44 +08:00
黎永顺 e794d1021f 添加线下对比表格 2023-11-29 17:20:44 +08:00
黎永顺 33c7f9d270 添加线下对比表格 2023-11-29 17:19:40 +08:00
黎永顺 dba9cf3206 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 2023-11-28 11:57:23 +08:00
黎永顺 e4a7b9d7d5 添加线下对比表格 2023-11-28 11:56:51 +08:00
黎永顺 df5cee8255 feature/2.9.42310.01-薪资项目拓扑图以及中江的薪资账套下的图形展示 2023-11-21 09:28:27 +08:00