odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,015 Commits 11 Branches 0 Tags
80d8d3c68796f40b54ea0780ee221cde1805cfbb
Commit Graph

1015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
80d8d3c687 Merge pull request 'master' (#488) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/488
 2024-07-06 09:37:03 +00:00
odjbin
2a5443dc4e Merge pull request 'fix : 流程管理中人员回显,表格更新负责人按钮更换位置,需求汇总选择框过滤' (#487) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/487
 2024-07-06 09:36:54 +00:00
odjbin
12f6f27b1a fix : 流程管理中人员回显,表格更新负责人按钮更换位置,需求汇总选择框过滤 2024-07-06 17:36:39 +08:00
odjbin
c75bd8a197 Merge pull request 'master' (#486) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/486
 2024-07-06 07:46:48 +00:00
odjbin
9eebacc47a Merge pull request 'fix : 修复审批记录主次账号显示, 年度计划详情显示' (#485) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/485
 2024-07-06 07:46:35 +00:00
odjbin
ddc3b70ddf fix : 修复审批记录主次账号显示, 年度计划详情显示 2024-07-06 15:46:22 +08:00
clay
bd57a54931 fix : 矩阵审批选择自己时可以跳过自己审批 2024-07-06 15:05:19 +08:00
odjbin
12eeeced0e Merge pull request 'master' (#484) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/484
 2024-07-05 18:21:54 +00:00
odjbin
8f3d97ec1c Merge pull request 'feat : 年度计划生成功能及分摊汇总导出功能' (#483) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/483
 2024-07-05 18:21:44 +00:00
odjbin
8180c248ac feat : 年度计划生成功能及分摊汇总导出功能 2024-07-06 02:21:26 +08:00
wenhua
de69dc9b47 Merge pull request 'master' (#482) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/482
 2024-07-04 09:20:24 +00:00
lilinyuan
fce1708f5c Merge branch 'master' of http://git.feashow.cn/clay/mosr-web 2024-07-04 17:18:41 +08:00
lilinyuan
dd80659044 fix: 样式调整 2024-07-04 17:18:38 +08:00
odjbin
2edef9fcf0 Merge pull request 'master' (#481) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/481
 2024-07-04 06:14:10 +00:00
odjbin
d7de238c38 Merge pull request 'fix : 分摊研发人员回显' (#480) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/480
 2024-07-04 06:13:40 +00:00
odjbin
08bc318875 fix : 分摊研发人员回显 2024-07-04 14:13:26 +08:00
odjbin
dfcf635f05 Merge pull request 'master' (#479) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/479
 2024-07-04 05:58:55 +00:00
odjbin
888f97125b Merge pull request 'fix : 统一按钮颜色' (#478) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/478
 2024-07-04 05:58:46 +00:00
odjbin
c065008da0 fix : 统一按钮颜色 2024-07-04 13:58:26 +08:00
odjbin
9beb9ed9de Merge pull request 'master' (#477) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/477
 2024-07-04 05:08:47 +00:00
odjbin
b2fdfc6227 Merge pull request 'fix : 流程图/人员与按钮间距' (#476) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/476
 2024-07-04 05:08:33 +00:00
odjbin
05585bb980 fix : 流程图/人员与按钮间距 2024-07-04 13:08:00 +08:00
odjbin
89dd56959a Merge pull request 'master' (#475) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/475
 2024-07-04 04:31:02 +00:00
odjbin
f2863557f9 Merge pull request 'fix : 修复分摊编辑传参' (#474) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/474
 2024-07-04 04:30:52 +00:00
odjbin
70ffe5c1eb fix : 修复分摊编辑传参 2024-07-04 12:30:38 +08:00
odjbin
d2f7f6080a Merge pull request 'master' (#473) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/473
 2024-07-04 03:31:16 +00:00
odjbin
a17ab96395 Merge pull request 'fix : 修改所属公司->征集公司' (#472) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/472
 2024-07-04 03:31:06 +00:00
odjbin
2466e15659 fix : 修改所属公司->征集公司 2024-07-04 11:30:03 +08:00
wenhua
0556e5eb79 Merge pull request 'master' (#471) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/471
 2024-07-04 02:05:44 +00:00
lilinyuan
5c889e41c2 Merge branch 'master' of http://git.feashow.cn/clay/mosr-web 2024-07-04 10:04:31 +08:00
lilinyuan
8ae817ffb3 fix: 分页 2024-07-04 10:04:28 +08:00
odjbin
6fc5a3f6f3 Merge pull request 'master' (#470) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/470
 2024-07-03 14:58:32 +00:00
odjbin
df09fbbd38 Merge pull request 'fix : 人员选择框,主次账号回显' (#469) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/469
 2024-07-03 14:58:20 +00:00
odjbin
842fa7b782 fix : 人员选择框,主次账号回显 2024-07-03 22:58:01 +08:00
odjbin
706bf36aa8 Merge pull request 'master' (#468) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/468
 2024-07-03 13:53:07 +00:00
odjbin
a8afb48cf7 Merge pull request 'fix : 修复更新表格' (#467) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/467
 2024-07-03 13:52:55 +00:00
odjbin
bbc883a116 fix : 修复更新表格 2024-07-03 21:52:33 +08:00
odjbin
634931a624 Merge pull request 'master' (#466) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/466
 2024-07-03 13:46:14 +00:00
odjbin
216b0d273e Merge pull request 'fix : 修复台账表格最小高度' (#465) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/465
 2024-07-03 13:40:13 +00:00
odjbin
361510242c fix : 修复台账表格最小高度 2024-07-03 21:38:51 +08:00
odjbin
94913d558d Merge pull request 'dd' (#464) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/464
 2024-07-03 13:31:21 +00:00
odjbin
9a789db8a7 fix : 修复分摊编辑传参问题 2024-07-03 21:31:05 +08:00
odjbin
0f0fa0f4e0 fix : 修复研究人员每行的回显 2024-07-03 20:47:47 +08:00
odjbin
afc079b670 Merge pull request 'master' (#463) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/463
 2024-07-03 11:40:24 +00:00
odjbin
212cbbcb78 Merge pull request 'fix : 修复征集公司回显,所属公司改为征集公司' (#462) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/462
 2024-07-03 11:40:08 +00:00
odjbin
9edf5d484f fix : 修复征集公司回显,所属公司改为征集公司 2024-07-03 19:39:53 +08:00
odjbin
c1a1b30c99 Merge pull request 'master' (#461) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/461
 2024-07-03 06:10:35 +00:00
odjbin
3bae1d1cc0 Merge pull request 'feat : 优化指定用户时该用户的矩阵状态检查' (#460) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/460
 2024-07-03 06:10:26 +00:00
odjbin
f26a29338a feat : 优化指定用户时该用户的矩阵状态检查 2024-07-03 14:10:10 +08:00
odjbin
d17bca9994 Merge pull request 'master' (#459) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/459
 2024-07-03 05:30:30 +00:00