Commit Graph

952 Commits

Author SHA1 Message Date
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
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
2fd2d1d25b fix : 调整头部icon,删除没用的代码 2024-07-01 18:56:16 +08:00
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
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
09e2bfc605 fix : 调整部门管理演示,优化移动端详情 2024-06-30 22:49:37 +08:00
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
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
47a5cd3338 fix : 新增分摊/上传费用输入框显示问题 2024-06-30 21:28:46 +08:00
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
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
d87027423e fix : "科研管理平台" 标题放开 2024-06-30 21:08:56 +08:00
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
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
a7b898fe48 fix : 调整费用分摊,表格更新人员回显 2024-06-30 20:43:08 +08:00
4242b22c1a Merge pull request 'master' (#442) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/442
2024-06-30 12:10:14 +00:00
3c494d038e Merge pull request 'fix : 调整台账显示信息' (#441) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/441
2024-06-30 12:10:05 +00:00
c226715097 fix : 调整台账显示信息 2024-06-30 20:09:53 +08:00
6e3b1e8b54 Merge pull request 'master' (#440) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/440
2024-06-30 12:04:14 +00:00
3ba97bca2d Merge pull request 'fix : 调整台账显示信息' (#439) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/439
2024-06-30 12:04:04 +00:00
7daa4b676d fix : 调整台账显示信息 2024-06-30 20:03:31 +08:00
a07bc1cc1c Merge remote-tracking branch 'origin/master' 2024-06-30 19:18:04 +08:00
fd3231db4d fix : 添加征集详情 2024-06-30 19:17:56 +08:00
43703f3366 Merge pull request 'master' (#438) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/438
2024-06-30 09:21:22 +00:00
d011dc4008 Merge pull request 'fix : 优化分摊汇总项目阶段显示' (#437) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/437
2024-06-30 09:21:10 +00:00
e43213d9a7 fix : 优化分摊汇总项目阶段显示 2024-06-30 17:21:00 +08:00
bb052b85ac Merge pull request 'master' (#436) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/436
2024-06-30 08:43:52 +00:00
04fa4bc334 Merge pull request 'fix : 优化阶段变更详情/项目编辑界面' (#435) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/435
2024-06-30 08:43:36 +00:00
c89f4db529 fix : 优化阶段变更详情/项目编辑界面 2024-06-30 16:43:21 +08:00
4049becfb8 Merge pull request 'master' (#434) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/434
2024-06-29 17:23:10 +00:00
7b18a92a26 Merge pull request 'fix : 优化移动端详情界面' (#433) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/433
2024-06-29 17:22:58 +00:00
6434605c7a fix : 优化移动端详情界面 2024-06-30 01:22:29 +08:00
2a8dabd648 Merge pull request 'master' (#432) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/432
2024-06-29 16:11:11 +00:00
c8eea20196 Merge pull request 'dd' (#431) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/431
2024-06-29 16:10:56 +00:00
87613e8113 fix : 优化移动端详情界面 2024-06-30 00:10:42 +08:00
80aef38e7a fix : 优化移动端详情界面 2024-06-30 00:00:16 +08:00
14ce31262d Merge pull request 'fix : 优化页面细节' (#430) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/430
2024-06-29 15:18:01 +00:00
2e9adb3248 fix : 优化页面细节 2024-06-29 23:17:47 +08:00
a6bd56c29c Merge pull request 'master' (#429) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/429
2024-06-29 14:47:08 +00:00
68b954a21e Merge pull request 'fix : 修复项目详情单个文件回显' (#428) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/428
2024-06-29 14:46:50 +00:00
1e4397b5ea fix : 修复项目详情单个文件回显 2024-06-29 22:46:37 +08:00
215b17f066 Merge pull request 'fix : 修复需求汇总文件回显' (#427) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/427
2024-06-29 14:31:46 +00:00
40d3d423c7 fix : 修复需求汇总文件回显 2024-06-29 22:30:21 +08:00
02ac44f389 Merge pull request 'fix : 修复需求上报成果展示,需求新增专项资金校验' (#426) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/426
2024-06-29 14:27:35 +00:00
3b884c0b78 fix : 修复需求上报成果展示,需求新增专项资金校验 2024-06-29 22:27:22 +08:00
870ee5a6d0 Merge pull request 'fix : 修复项目详情前置流程更改回显' (#425) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/425
2024-06-29 13:44:08 +00:00
a446dfcaa6 fix : 修复项目详情前置流程更改回显 2024-06-29 21:43:57 +08:00
630e35b078 Merge pull request 'fix : 修复需求上报成果多选' (#424) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/424
2024-06-29 10:57:13 +00:00
bd6fef9f7e fix : 修复需求上报成果多选 2024-06-29 18:56:05 +08:00
662e11c154 Merge pull request 'master' (#423) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/423
2024-06-29 09:14:09 +00:00