odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
987 Commits 11 Branches 0 Tags
0556e5eb79111c4d32fda5ad9e457f0d43e35233
Commit Graph

987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
odjbin
509b216e4c Merge pull request 'feat : 优化指定用户时该用户的矩阵状态检查' (#458) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/458
 2024-07-03 05:30:20 +00:00
odjbin
bffa726cbf feat : 优化指定用户时该用户的矩阵状态检查 2024-07-03 13:30:01 +08:00
odjbin
0fbaa25cd6 Merge pull request 'master' (#457) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/457
 2024-07-02 17:46:35 +00:00
odjbin
a7fb633b89 feat : 优化指定用户时该用户的矩阵状态检查 2024-07-03 01:46:13 +08:00
odjbin
b1ac328d9d Revert "feat : 优化指定用户时该用户的矩阵状态检查" 
This reverts commit d2ddf378bf.
 2024-07-03 01:45:10 +08:00
odjbin
faaeb7be2b Merge remote-tracking branch 'origin/master' 2024-07-03 01:44:38 +08:00
odjbin
d2ddf378bf feat : 优化指定用户时该用户的矩阵状态检查 2024-07-03 01:44:28 +08:00
odjbin
9a1b04966d Merge pull request 'master' (#456) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/456
 2024-07-02 16:38:48 +00:00
odjbin
c97798696a Merge pull request 'fix : 修复提交校验' (#455) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/455
 2024-07-02 16:38:36 +00:00
odjbin
0d7c303397 fix : 修复提交校验 2024-07-03 00:38:21 +08:00
odjbin
759f93078b Merge pull request 'master' (#454) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/454
 2024-07-01 12:53:23 +00:00
odjbin
66be60d011 Merge pull request 'fix : 调整头部icon,删除没用的代码' (#453) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/453
 2024-07-01 12:53:12 +00:00
odjbin
928f41112c fix : 调整头部icon,删除没用的代码 2024-07-01 20:53:03 +08:00
odjbin
1e97239d18 Merge pull request 'master' (#452) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/452
 2024-07-01 11:05:15 +00:00
odjbin
9d55358d73 Merge pull request 'fix : 调整头部icon,删除没用的代码' (#451) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/451
 2024-07-01 10:56:40 +00:00
odjbin
2fd2d1d25b fix : 调整头部icon,删除没用的代码 2024-07-01 18:56:16 +08:00
odjbin
49a3bbd701 Merge pull request 'master' (#450) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/450
 2024-06-30 14:50:10 +00:00
odjbin
daa76ada6e Merge pull request 'fix : 调整部门管理演示,优化移动端详情' (#449) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/449
 2024-06-30 14:49:59 +00:00
odjbin
09e2bfc605 fix : 调整部门管理演示,优化移动端详情 2024-06-30 22:49:37 +08:00
odjbin
68dc2ff018 Merge pull request 'master' (#448) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/448
 2024-06-30 13:29:31 +00:00
odjbin
cae3746a7b Merge pull request 'fix : 新增分摊/上传费用输入框显示问题' (#447) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/447
 2024-06-30 13:28:56 +00:00
odjbin
47a5cd3338 fix : 新增分摊/上传费用输入框显示问题 2024-06-30 21:28:46 +08:00
odjbin
6f843f54a6 Merge pull request 'master' (#446) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/446
 2024-06-30 13:09:47 +00:00
odjbin
51d2e8357b Merge pull request 'fix : "科研管理平台" 标题放开' (#445) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/445
 2024-06-30 13:09:24 +00:00
odjbin
d87027423e fix : "科研管理平台" 标题放开 2024-06-30 21:08:56 +08:00
odjbin
19791498d4 Merge pull request 'master' (#444) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/444
 2024-06-30 12:50:56 +00:00
odjbin
592bba132e Merge pull request 'fix : 调整费用分摊,表格更新人员回显' (#443) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/443
 2024-06-30 12:50:39 +00:00
odjbin
a7b898fe48 fix : 调整费用分摊,表格更新人员回显 2024-06-30 20:43:08 +08:00