Commit Graph

172 Commits (1346d8571c109b1ae9c461a35010077d50d3451e)

Author SHA1 Message Date
黎永顺 61edeb5cfb master 9 months ago
黎永顺 004bba38a8 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 9 months ago
黎永顺 5bf5a45a49 master 9 months ago
黎永顺 38512656c3 master 9 months ago
黎永顺 236f99b8b5 master 9 months ago
黎永顺 6e9bb76ff2 master 9 months ago
黎永顺 9f21c7dc2e Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 10 months ago
黎永顺 854931db30 master 10 months ago
黎永顺 e075344bca feature/2.9.42310.01-薪资项目拓扑图 11 months ago
黎永顺 52a45f38b3 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
# Conflicts:
#	src/api/calculate.service.ts
#	src/pages/calcTable/index.tsx
11 months ago
黎永顺 f9f95f25df master 11 months ago
黎永顺 fe86dd2cd6 master 12 months ago
黎永顺 699d3323c4 master 12 months ago
黎永顺 da25fe8384 master 1 year ago
黎永顺 22398469e5 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 2eddab4e5c master 1 year ago
黎永顺 1a9fbbe533 feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 5a37144950 feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 20c9897d06 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 26117e7254 master 1 year ago
黎永顺 2a538033b2 master 1 year ago
黎永顺 ed0ff1d819 feature/2.9.42310.01-薪资项目拓扑图
图标显示优化
1 year ago
黎永顺 c406931400 master 1 year ago
黎永顺 783ab813cb Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
# Conflicts:
#	src/pages/calcTable/customTableTitle.tsx
1 year ago
黎永顺 dbe3ba0e9d master 1 year ago
黎永顺 9c2dce83f7 master 1 year ago
黎永顺 cebb23b02e feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 70f452c19f Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 9a63ffe0d2 master 1 year ago
黎永顺 ca881157d6 feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 055e10296e feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 da70788569 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 2d046da062 master 1 year ago
黎永顺 1e028bb2ad feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 2708ff3dc5 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 64d3b211da master
薪酬报表表格底色设置
1 year ago
黎永顺 db6bbd8bfa Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 b94e93a6aa master
薪酬报表表格底色设置
1 year ago
黎永顺 f6557f1b63 master-bug 1 year ago
黎永顺 7508a3a4b1 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 8666e97ded master-新增年终奖计税 1 year ago
黎永顺 84156ede1d master-新增年终奖计税 1 year ago
黎永顺 174d36ffa2 master-新增年终奖计税 1 year ago
黎永顺 df75a3cdfa Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 e56123201f master 1 year ago
黎永顺 14e25e6d2b Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 d171afcafe master 1 year ago
黎永顺 de2c10c400 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 7152e7e889 master 1 year ago
黎永顺 fc48c2c20d master 1 year ago
黎永顺 b333b32f01 master 1 year ago
黎永顺 e02c97c41a 统一表格组件封装 1 year ago
黎永顺 0c43d47895 master 1 year ago
黎永顺 30d225b4ed feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 992c85acf5 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 1 year ago
黎永顺 4380ebb8e8 master 1 year ago
黎永顺 81a30417a9 feature/2.9.42310.01-薪资项目拓扑图
去掉固定根节点
2 years ago
黎永顺 58152f0528 master 2 years ago
黎永顺 b9846d5abd master 2 years ago
黎永顺 f7cd8f8cbc feature/2.9.42310.01-薪资项目拓扑图 2 years ago
黎永顺 156b3288b0 master 2 years ago
黎永顺 0229e27df5 feature/2.9.42310.01-薪资项目拓扑图 2 years ago
黎永顺 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
2 years ago
黎永顺 2f50be171a master 2 years ago
黎永顺 b992c06a21 master 2 years ago
黎永顺 7fc3c7538c feature/2.9.42310.01-薪资项目拓扑图
中江薪资核算列表表头修改
2 years ago
黎永顺 335baa2c78 master-个税申报表 2 years ago
黎永顺 722e0b39db feature/2.9.42310.01-薪资项目拓扑图 2 years ago
黎永顺 104b36786c master 2 years ago
黎永顺 6c79742e75 master-薪资核算表格适配详情页查看 2 years ago
黎永顺 2ea548bd7f master-薪资核算添加批量更新功能 2 years ago
黎永顺 be82684622 master 2 years ago
黎永顺 042a962a2f feature/2.9.42310.01-薪资项目拓扑图 2 years ago
黎永顺 607f62b89e feature/2.9.42310.01-薪资项目拓扑图 2 years ago
黎永顺 e794d1021f 添加线下对比表格 2 years ago
黎永顺 33c7f9d270 添加线下对比表格 2 years ago
黎永顺 dba9cf3206 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 2 years ago
黎永顺 e4a7b9d7d5 添加线下对比表格 2 years ago
黎永顺 df5cee8255 feature/2.9.42310.01-薪资项目拓扑图以及中江的薪资账套下的图形展示 2 years ago
黎永顺 0ae7c8365c feature/2.9.42310.01-薪资项目拓扑图以及中江的薪资账套下的图形展示 2 years ago
黎永顺 4c3c2999be 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
2 years ago
黎永顺 ff6f036a38 feature/2.9.42310.01-薪资项目拓扑图以及中江的薪资账套下的图形展示 2 years ago
黎永顺 e6e93f8fc4 泛微薪资核算iframe表格- 2 years ago
黎永顺 726e6c6715 Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图 2 years ago
黎永顺 670d3da752 泛微薪资核算iframe表格- 2 years ago
黎永顺 7b59ba7cf0 泛微薪资核算iframe表格-薪资项目拓扑图 2 years ago
黎永顺 5dfcbe1af9 泛微薪资核算iframe表格 2 years ago
黎永顺 f7237c2db6 泛微薪资核算iframe表格 2 years ago
黎永顺 c219b1a5fb 泛微薪资核算iframe表格 2 years ago
黎永顺 8ef9090635 泛微薪资核算iframe表格 2 years ago
黎永顺 3fef9c4857 泛微薪资核算iframe表格 2 years ago
黎永顺 d9ff45a687 泛微薪资核算iframe表格 2 years ago
黎永顺 64dfc7da07 泛微薪资核算iframe表格 2 years ago
黎永顺 9b0abc08ae 泛微薪资核算iframe表格 2 years ago
黎永顺 ce1dd73640 泛微薪资核算iframe表格 2 years ago
黎永顺 267ac3b8bc 泛微薪资核算iframe表格 2 years ago
黎永顺 81c648f5ab 泛微薪资核算iframe表格 2 years ago
黎永顺 f9723da384 泛微薪资核算iframe表格 2 years ago
黎永顺 cc3a671f7c 泛微薪资核算iframe表格 2 years ago
黎永顺 bbf2a4ebdb 泛微薪资核算iframe表格 2 years ago