 lys
|
fae2b93749
|
Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
|
2024-10-30 18:15:15 +08:00 |
|
lys
|
597c00af41
|
Merge branch 'master' into feature/业务线管理
# Conflicts:
# src/pages/unitTable/renderColsOpts.tsx
|
2024-10-30 18:14:28 +08:00 |
|
lys
|
719fd33812
|
master
|
2024-10-30 18:07:56 +08:00 |
|
lys
|
4580128814
|
Merge branch 'master' into feature/业务线管理
|
2024-10-23 09:56:59 +08:00 |
|
lys
|
5bab142e05
|
Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
|
2024-10-23 09:53:58 +08:00 |
|
lys
|
f90fda8bfb
|
bug处理
|
2024-10-23 09:50:34 +08:00 |
|
lys
|
5b17d10230
|
Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
# Conflicts:
# src/pages/calcTable/index.tsx
|
2024-10-22 15:34:15 +08:00 |
|
lys
|
c86656f970
|
Merge branch 'master' into feature/业务线管理
|
2024-10-22 15:32:47 +08:00 |
|
lys
|
632f42bf07
|
bug处理
|
2024-10-22 15:32:26 +08:00 |
|
lys
|
d375704faf
|
Merge branch 'master' into feature/业务线管理
|
2024-10-21 18:13:36 +08:00 |
|
lys
|
caa31ad1ba
|
feature/2.9.42310.01-薪资项目拓扑图
|
2024-10-18 17:01:06 +08:00 |
|
lys
|
1dbe38a87e
|
Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
# Conflicts:
# src/pages/calcTable/customTableTitle.tsx
# src/pages/calcTable/index.tsx
|
2024-10-18 16:57:38 +08:00 |
|
lys
|
0688be7bff
|
master
|
2024-10-18 16:49:59 +08:00 |
|
lys
|
6d2b0d8b1e
|
master
|
2024-10-18 16:30:50 +08:00 |
|
lys
|
562aad32f0
|
master
|
2024-10-18 15:11:20 +08:00 |
|
lys
|
dd842a0e67
|
master
|
2024-10-16 11:27:37 +08:00 |
|
lys
|
ad5c781bcb
|
feature/2.9.42310.01-薪资项目拓扑图
|
2024-10-16 11:24:30 +08:00 |
|
lys
|
78faf02e22
|
样式修改
|
2024-10-16 11:21:12 +08:00 |
|
lys
|
ee0eaf67ad
|
Merge branch 'master' into feature/业务线管理
|
2024-10-16 10:14:09 +08:00 |
|
lys
|
7d8441749a
|
Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
|
2024-10-15 15:13:22 +08:00 |
|
黎永顺
|
60b325a199
|
master
|
2024-10-14 14:16:49 +08:00 |
|
黎永顺
|
8c95f9b37d
|
master
|
2024-10-14 13:32:16 +08:00 |
|
黎永顺
|
d82ca76290
|
Merge branch 'master' into feature/业务线管理
# Conflicts:
# src/pages/salaryFileTable/index.tsx
# src/pages/welfareArchiveTable/index.tsx
|
2024-10-12 16:12:19 +08:00 |
|
黎永顺
|
61edeb5cfb
|
master
|
2024-10-10 10:13:51 +08:00 |
|
黎永顺
|
004bba38a8
|
Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
|
2024-10-09 11:31:02 +08:00 |
|
黎永顺
|
5bf5a45a49
|
master
|
2024-10-09 11:28:54 +08:00 |
|
黎永顺
|
38512656c3
|
master
|
2024-10-09 11:07:45 +08:00 |
|
黎永顺
|
3a5e06a6e7
|
Merge branch 'master' into feature/业务线管理
# Conflicts:
# src/pages/salaryFileTable/index.tsx
# src/pages/welfareArchiveTable/index.tsx
|
2024-09-30 10:25:43 +08:00 |
|
黎永顺
|
236f99b8b5
|
master
|
2024-09-30 10:21:03 +08:00 |
|
黎永顺
|
b72ccf78d7
|
Merge branch 'master' into feature/业务线管理
|
2024-09-27 09:20:31 +08:00 |
|
黎永顺
|
6e9bb76ff2
|
master
|
2024-09-27 09:19:55 +08:00 |
|
黎永顺
|
bba707b041
|
业务线管理
|
2024-09-26 16:16:01 +08:00 |
|
黎永顺
|
793d7acefb
|
业务线管理
|
2024-09-11 10:10:11 +08:00 |
|
黎永顺
|
9f21c7dc2e
|
Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
|
2024-09-06 17:36:32 +08:00 |
|
黎永顺
|
854931db30
|
master
|
2024-09-06 17:35:55 +08:00 |
|
黎永顺
|
e075344bca
|
feature/2.9.42310.01-薪资项目拓扑图
|
2024-08-16 10:09:31 +08:00 |
|
黎永顺
|
52a45f38b3
|
Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
# Conflicts:
# src/api/calculate.service.ts
# src/pages/calcTable/index.tsx
|
2024-08-16 09:48:40 +08:00 |
|
黎永顺
|
f9f95f25df
|
master
|
2024-08-13 17:59:55 +08:00 |
|
黎永顺
|
fe86dd2cd6
|
master
|
2024-07-22 09:42:20 +08:00 |
|
黎永顺
|
699d3323c4
|
master
|
2024-07-19 11:06:46 +08:00 |
|
黎永顺
|
da25fe8384
|
master
|
2024-07-01 11:17:33 +08:00 |
|
黎永顺
|
22398469e5
|
Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
|
2024-06-21 14:09:48 +08:00 |
|
黎永顺
|
2eddab4e5c
|
master
|
2024-06-21 11:03:07 +08:00 |
|
黎永顺
|
1a9fbbe533
|
feature/2.9.42310.01-薪资项目拓扑图
|
2024-06-20 08:56:50 +08:00 |
|
黎永顺
|
5a37144950
|
feature/2.9.42310.01-薪资项目拓扑图
|
2024-06-14 14:23:34 +08:00 |
|
黎永顺
|
20c9897d06
|
Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图
|
2024-06-14 10:16:24 +08:00 |
|
黎永顺
|
26117e7254
|
master
|
2024-05-29 10:36:46 +08:00 |
|
黎永顺
|
2a538033b2
|
master
|
2024-05-28 11:40:53 +08:00 |
|
黎永顺
|
ed0ff1d819
|
feature/2.9.42310.01-薪资项目拓扑图
图标显示优化
|
2024-05-16 11:30:28 +08:00 |
|
黎永顺
|
c406931400
|
master
|
2024-05-15 11:16:42 +08:00 |
|
黎永顺
|
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 |