 黎永顺
|
783ab813cb
|
Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
# Conflicts:
# src/pages/calcTable/customTableTitle.tsx
|
2024-05-06 18:05:33 +08:00 |
|
黎永顺
|
dbe3ba0e9d
|
master
|
2024-05-06 18:04:04 +08:00 |
|
黎永顺
|
9c2dce83f7
|
master
|
2024-04-28 14:55:59 +08:00 |
|
黎永顺
|
cebb23b02e
|
feature/2.9.42310.01-薪资项目拓扑图
|
2024-04-22 18:57:13 +08:00 |
|
黎永顺
|
70f452c19f
|
Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
|
2024-04-16 18:18:28 +08:00 |
|
黎永顺
|
9a63ffe0d2
|
master
|
2024-04-16 18:17:31 +08:00 |
|
黎永顺
|
ca881157d6
|
feature/2.9.42310.01-薪资项目拓扑图
|
2024-04-10 14:41:04 +08:00 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
0ae7c8365c
|
feature/2.9.42310.01-薪资项目拓扑图以及中江的薪资账套下的图形展示
|
2023-11-21 09:26:08 +08:00 |
|
黎永顺
|
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
|
2023-11-17 11:46:23 +08:00 |
|
黎永顺
|
ff6f036a38
|
feature/2.9.42310.01-薪资项目拓扑图以及中江的薪资账套下的图形展示
|
2023-11-16 17:20:03 +08:00 |
|
黎永顺
|
e6e93f8fc4
|
泛微薪资核算iframe表格-
|
2023-11-07 11:06:15 +08:00 |
|
黎永顺
|
726e6c6715
|
Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
|
2023-10-30 09:01:26 +08:00 |
|
黎永顺
|
670d3da752
|
泛微薪资核算iframe表格-
|
2023-10-27 17:53:57 +08:00 |
|
黎永顺
|
7b59ba7cf0
|
泛微薪资核算iframe表格-薪资项目拓扑图
|
2023-10-27 16:55:54 +08:00 |
|
黎永顺
|
5dfcbe1af9
|
泛微薪资核算iframe表格
|
2023-10-19 13:50:38 +08:00 |
|
黎永顺
|
f7237c2db6
|
泛微薪资核算iframe表格
|
2023-10-10 09:24:36 +08:00 |
|
黎永顺
|
c219b1a5fb
|
泛微薪资核算iframe表格
|
2023-09-01 17:33:37 +08:00 |
|
黎永顺
|
8ef9090635
|
泛微薪资核算iframe表格
|
2023-08-25 16:11:06 +08:00 |
|
黎永顺
|
3fef9c4857
|
泛微薪资核算iframe表格
|
2023-08-24 17:49:45 +08:00 |
|
黎永顺
|
d9ff45a687
|
泛微薪资核算iframe表格
|
2023-08-16 10:21:04 +08:00 |
|
黎永顺
|
64dfc7da07
|
泛微薪资核算iframe表格
|
2023-07-12 13:38:18 +08:00 |
|
黎永顺
|
9b0abc08ae
|
泛微薪资核算iframe表格
|
2023-07-10 15:30:57 +08:00 |
|
黎永顺
|
ce1dd73640
|
泛微薪资核算iframe表格
|
2023-07-10 10:46:02 +08:00 |
|
黎永顺
|
267ac3b8bc
|
泛微薪资核算iframe表格
|
2023-06-30 14:21:47 +08:00 |
|
黎永顺
|
81c648f5ab
|
泛微薪资核算iframe表格
|
2023-06-20 16:47:34 +08:00 |
|
黎永顺
|
f9723da384
|
泛微薪资核算iframe表格
|
2023-06-08 14:55:22 +08:00 |
|
黎永顺
|
cc3a671f7c
|
泛微薪资核算iframe表格
|
2023-06-01 13:36:29 +08:00 |
|
黎永顺
|
bbf2a4ebdb
|
泛微薪资核算iframe表格
|
2023-05-30 17:06:33 +08:00 |
|
黎永顺
|
d8aa039741
|
泛微薪资核算iframe表格
|
2023-05-30 09:51:04 +08:00 |
|
黎永顺
|
c289b0eb11
|
泛微薪资核算iframe表格
|
2023-05-26 16:38:12 +08:00 |
|
黎永顺
|
5fddf15870
|
泛微薪资核算iframe表格
|
2023-05-26 15:36:17 +08:00 |
|
黎永顺
|
b65038b77f
|
泛微薪资核算iframe表格
|
2023-05-26 15:36:08 +08:00 |
|
黎永顺
|
1f0f016a56
|
泛微薪资核算iframe表格
|
2023-04-26 17:26:33 +08:00 |
|
黎永顺
|
ba6bb91015
|
泛微薪资核算iframe表格
|
2023-04-25 09:59:07 +08:00 |
|
黎永顺
|
59497e306b
|
泛微薪资核算iframe表格
|
2023-04-24 09:37:05 +08:00 |
|
黎永顺
|
7c57f726a1
|
泛微薪资核算iframe表格
|
2023-04-21 11:05:24 +08:00 |
|
黎永顺
|
978a248cf3
|
泛微薪资核算iframe表格
|
2023-04-18 16:21:28 +08:00 |
|
黎永顺
|
22964c13ba
|
泛微薪资核算iframe表格
|
2023-04-07 11:45:53 +08:00 |
|
黎永顺
|
52686f838f
|
泛微薪资核算iframe表格
|
2023-03-31 09:50:41 +08:00 |
|
黎永顺
|
641ce206f7
|
泛微薪资核算iframe表格
|
2023-03-16 17:38:41 +08:00 |
|
黎永顺
|
5c1dc110aa
|
泛微薪资核算iframe表格
|
2023-03-16 10:31:24 +08:00 |
|
黎永顺
|
1aa1930cf1
|
泛微薪资核算iframe表格
|
2023-02-27 10:12:17 +08:00 |
|
黎永顺
|
59264571e6
|
泛微薪资核算iframe表格
|
2023-02-09 16:11:33 +08:00 |
|
黎永顺
|
561a8a28f8
|
泛微薪资核算iframe表格
|
2023-01-17 11:04:26 +08:00 |
|
黎永顺
|
d02b30d6e4
|
泛微薪资核算iframe表格
|
2022-12-05 10:53:05 +08:00 |
|
黎永顺
|
0223e54156
|
泛微薪资核算iframe表格
|
2022-11-25 10:04:08 +08:00 |
|
黎永顺
|
0f21ec8e1c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/layouts/BlankLayout/index.tsx
|
2022-11-18 08:39:36 +08:00 |
|
黎永顺
|
aa64deb95a
|
泛微薪资核算iframe表格
|
2022-11-18 08:38:28 +08:00 |
|
liyongshun
|
4a516afdf2
|
init
|
2022-08-12 16:32:47 +08:00 |
|
liyongshun
|
8394cf8872
|
init
|
2022-08-04 15:20:59 +08:00 |