Commit Graph

2149 Commits

Author SHA1 Message Date
e518791ddd Merge pull request 'master' (#996) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/996
2025-04-20 06:44:18 +00:00
dj
afda146103 feat : 项目归档-附件新增项目阶段字段 2025-04-20 14:43:57 +08:00
dj
11f7fa37aa feat : 年度计划新字段 2025-04-20 13:01:43 +08:00
dj
35c2e1d9b4 feat : 需求上报新增字段 2025-04-20 12:46:14 +08:00
dj
fe3a15fcbd fix: 调整详情页面知识产权输出项 2025-04-19 21:03:54 +08:00
dj
9fd97f6ea2 feat :需求上报新增字段 2025-04-19 20:13:11 +08:00
dj
cccd14ec79 fix: 移除预期成果形式相关代码 2025-04-19 19:03:10 +08:00
2ed2cae599 Merge pull request 'fix : 注释立项提交的前置流程' (#995) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/995
2025-04-19 05:43:49 +00:00
dj
958399a32a fix : 注释立项提交的前置流程 2025-04-19 13:43:36 +08:00
745971087c Merge pull request 'fix : 完善需求上报字段页面' (#994) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/994
2025-04-19 02:58:46 +00:00
dj
8ea916c206 fix : 完善需求上报字段页面 2025-04-19 10:58:28 +08:00
e0aefecf50 Merge pull request 'fix: 修复审批白名单中取消事件' (#993) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/993
2025-04-18 14:52:27 +00:00
dj
10e9c9de19 fix: 修复审批白名单中取消事件 2025-04-18 22:51:49 +08:00
950b32270b Merge pull request 'master' (#992) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/992
2025-04-18 14:40:16 +00:00
dj
b032903ed4 fix(project): 调整知识产权相关表述和附件表格样式
- 将"知识产权状况"修改为"知识产权归属"
- 优化附件上传和展示组件的样式- 统一知识产权归属相关的标签和提示信息
- 调整部分组件的显示逻辑和样式
2025-04-18 22:37:22 +08:00
dj
696921243e fix : 首页字体颜色统一 2025-04-18 18:13:03 +08:00
dj
7200592f05 fix : 首页字体颜色统一 2025-04-18 14:04:44 +08:00
dj
963b7b93e3 Merge remote-tracking branch 'origin/master' 2025-04-18 11:22:24 +08:00
dj
86751acbd6 fix : 首页字体颜色统一 2025-04-18 11:22:00 +08:00
c17149235f Merge pull request 'fix: 编辑上报时主项目选项过滤当前项目' (#991) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/991
2025-04-15 16:00:21 +00:00
dj
fda0f4fcde fix: 编辑上报时主项目选项过滤当前项目 2025-04-15 23:56:05 +08:00
560485f255 Merge pull request 'style(article-management): 优化附件列表样式' (#990) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/990
2025-04-15 15:31:31 +00:00
dj
2847c88c61 style(article-management): 优化附件列表样式
- 在 add.vue 和 detail.vue 中为附件列表项添加底部间距,提升可读性
- 保持附件列表样式在不同页面中的一致性
2025-04-15 23:29:30 +08:00
5611fd9f02 Merge pull request 'feat: 费用导入功能' (#989) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/989
2025-04-15 15:14:57 +00:00
dj
2827c5ace6 feat: 费用导入功能 2025-04-15 23:14:46 +08:00
750a4c8178 Merge pull request 'fix: 注释公告附件列表相关代码' (#988) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/988
2025-04-15 14:34:01 +00:00
dj
9941fc14f6 fix: 注释公告附件列表相关代码 2025-04-15 22:33:38 +08:00
8b94f044db Merge pull request 'feat: 抄送成功后刷新功能' (#987) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/987
2025-04-15 03:15:54 +00:00
dj
c71208c3e4 feat: 抄送成功后刷新功能 2025-04-15 11:15:15 +08:00
b2fb3fbb67 Merge pull request 'feat: 项目详情审批流程加立即抄送按钮' (#986) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/986
2025-04-15 02:41:27 +00:00
dj
7e6b48b62a feat: 项目详情审批流程加立即抄送按钮 2025-04-15 10:40:52 +08:00
4aa0b093bb Merge pull request 'fix: 修复附件上传和展示问题' (#985) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/985
2025-04-14 13:20:20 +00:00
dj
e77820e145 fix: 修复附件上传和展示问题 2025-04-14 21:19:55 +08:00
66d2c3c7cf Merge pull request 'master' (#984) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/984
2025-04-14 13:19:48 +00:00
dj
a1422067d0 feat: 审批流程加立即抄送按钮 2025-04-14 16:44:42 +08:00
dj
7579b77b2d feat: 添加导入研发费用明细表和模板下载功能 2025-04-14 15:43:48 +08:00
dj
c6390a8117 feat: 文章管理增加附件上传/删除/下载功能 2025-04-14 15:07:58 +08:00
dj
e20f8cad7f fix: 修复附件上传和展示问题 2025-04-13 21:22:22 +08:00
dj
5cf2e4d208 feat(article-management): 增加文章附件上传功能
- 在文章管理页面添加公告附件列表
- 实现附件上传和展示功能- 优化 Tinymce 组件,支持附件上传事件
2025-04-11 18:21:43 +08:00
4f3a8550eb Merge pull request 'master' (#983) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/983
2025-04-11 06:09:41 +00:00
dj
ad6d7af1a3 Merge remote-tracking branch 'origin/master' 2025-04-11 14:08:25 +08:00
dj
65a4c72fd0 style(mobile): 优化附件文件列表的展示效果 2025-04-11 14:08:02 +08:00
5ea25ae8ae Merge pull request 'fix: 修复附件上传和展示问题' (#982) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/982
2025-04-09 15:11:29 +00:00
dj
810757e828 fix: 修复附件上传和展示问题 2025-04-09 23:11:06 +08:00
e82c6e2316 Merge pull request 'master' (#981) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/981
2025-04-09 04:59:16 +00:00
dj
af593b08da Merge remote-tracking branch 'origin/master' 2025-04-09 12:58:56 +08:00
dj
2b14bd19a4 fix : 修复项目归档附件项目基本信息展示 2025-04-09 12:58:34 +08:00
da69cb4dba Merge pull request 'master' (#980) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/980
2025-04-09 02:59:02 +00:00
cc1d0c8cf2 Merge pull request 'fix : 修复项目实施附件上传功能' (#979) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/979
2025-04-09 02:58:50 +00:00
dj
f3d9ff44a3 fix : 修复项目实施附件上传功能 2025-04-09 10:58:26 +08:00