Commit Graph

571 Commits

Author SHA1 Message Date
d8b8c65dfb Merge pull request 'fix : 修复提交按钮旁边的返回页面细节' (#308) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/308
2024-06-09 16:25:25 +00:00
d3fe46f0bc fix : 修复提交按钮旁边的返回页面细节 2024-06-10 00:25:00 +08:00
bf0cb73946 Merge remote-tracking branch 'origin/master' 2024-06-09 23:48:50 +08:00
992eb2b890 fix : 修复分摊金额显示bug 2024-06-09 23:48:42 +08:00
fb52f8b04e Merge pull request 'fix : 修复需求上报接口' (#307) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/307
2024-06-09 14:11:06 +00:00
53e461bc4d fix : 修复需求上报接口 2024-06-09 22:10:52 +08:00
f251c08982 Merge pull request 'fix : 修复项目实施上传费用,查看分摊功能细节' (#306) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/306
2024-06-09 14:03:31 +00:00
83ba497d73 fix : 修复项目实施上传费用,查看分摊功能细节 2024-06-09 22:02:37 +08:00
bb771b2f6d Merge pull request 'dj' (#305) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/305
2024-06-09 13:29:06 +00:00
a88ae09628 fix : 修复项目实施阶段变更功能 2024-06-09 20:03:26 +08:00
b0eabd9c39 fix : 修复项目立项切换bug 2024-06-09 19:33:03 +08:00
adbd98f035 fix : 修复项目立项切换bug 2024-06-09 19:30:45 +08:00
f61adaf18b Merge remote-tracking branch 'origin/master' 2024-06-09 19:19:15 +08:00
clay
d1c6b23aa4 feat : 需求变更详情修改 2024-06-09 19:19:02 +08:00
c3e006bba8 fix : 修复项目立项重新提交等操作替换到详情页面 2024-06-09 19:12:37 +08:00
812298acce fix : 修复需求上报是否专项资金流程图显示 2024-06-09 19:00:43 +08:00
fd61fcc485 Merge pull request 'fix : 修复费用分摊详情研究人员显示' (#304) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/304
2024-06-09 10:09:41 +00:00
60b7133939 fix : 修复费用分摊详情研究人员显示 2024-06-09 18:09:13 +08:00
8e46c27af8 Merge pull request 'dj' (#303) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/303
2024-06-09 09:51:15 +00:00
4ed64339fa fix : 金额格式化 2024-06-09 17:50:49 +08:00
cafb0ef5bf Merge remote-tracking branch 'origin/master' 2024-06-09 15:06:29 +08:00
29b8bad394 fix : 格式化金额显示 2024-06-08 23:20:44 +08:00
9a862f8cce feat : 修复需求汇总页面细节 2024-06-08 11:43:39 +08:00
91b2ead3d4 Merge pull request 'dj' (#302) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/302
2024-06-07 16:05:41 +00:00
521e40cf3d feat : 项目详情中立项/编辑页面demo 2024-06-08 00:05:28 +08:00
86ff3c2e94 fix : 修复附件校验问题 2024-06-08 00:04:33 +08:00
617a867965 fix : 修复查看分摊功能 2024-06-07 21:34:18 +08:00
b2e0983cf0 Merge pull request 'fix : 修改提交/重新提交功能文件传参问题' (#301) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/301
2024-06-07 12:37:11 +00:00
27bc6ea89f fix : 修改提交/重新提交功能文件传参问题 2024-06-07 20:36:54 +08:00
c2413fe8b2 Merge pull request 'fix : 修改专项资金新增的介绍输入框' (#300) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/300
2024-06-07 11:47:55 +00:00
ee81e1bb23 fix : 修改专项资金新增的介绍输入框 2024-06-07 18:40:54 +08:00
a6a124d61a Merge pull request 'fix : 修复需求上报bug' (#299) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/299
2024-06-07 10:28:22 +00:00
1bc8f26724 fix : 修复需求上报bug 2024-06-07 18:28:10 +08:00
1c56ccae40 Merge pull request 'fix : 修复需求上报文件上传/删除问题' (#298) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/298
2024-06-07 08:46:59 +00:00
42fea1853d fix : 修复需求上报文件上传/删除问题 2024-06-07 16:46:44 +08:00
0eb0bcb0ef Merge pull request 'fix : 修复专项资金显示情况' (#297) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/297
2024-06-07 05:26:04 +00:00
9655c41492 fix : 修复专项资金显示情况 2024-06-07 13:24:17 +08:00
ec7cf224d3 Merge pull request 'fix : 修改需求上报页面细节' (#296) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/296
2024-06-06 15:14:04 +00:00
35ecec13ad fix : 修改需求上报页面细节 2024-06-06 23:13:10 +08:00
0adb104c46 Merge pull request 'fix : 修改专项资金' (#295) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/295
2024-06-06 14:59:03 +00:00
54e7b81f1e fix : 修改专项资金 2024-06-06 22:58:50 +08:00
d9d3a7f02a Merge pull request 'dj' (#293) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/293
2024-06-06 14:21:30 +00:00
e1a7b46b35 fix : 修改分摊汇总bug 2024-06-06 22:13:14 +08:00
4ddd53cec7 fix : 修改需求征集征集说明输入框 2024-06-06 21:52:33 +08:00
a8921a0683 fix : 修复需求上报数字输入框和人员选择器优化 2024-06-06 21:44:43 +08:00
6a0c3570f6 fix : 修复需求上报的专项资金显示问题 2024-06-06 19:50:46 +08:00
781b4cfb96 Merge pull request 'fix : 修复分摊汇总及编辑功能' (#291) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/291
2024-06-06 05:36:20 +00:00
53ecadf315 fix : 修复分摊汇总及编辑功能 2024-06-06 13:36:07 +08:00
18806f13e4 Merge pull request 'dj' (#289) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/289
2024-06-05 18:01:52 +00:00
031a08e65c fix : 修复分摊汇总及编辑功能 2024-06-06 02:01:36 +08:00