odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,129 Commits 11 Branches 0 Tags
zhangkaihuai-patch-1
Commit Graph

2129 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dj
fda0f4fcde fix: 编辑上报时主项目选项过滤当前项目 2025-04-15 23:56:05 +08:00
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
375a678fc3 Merge pull request 'master' (#978) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/978
 2025-04-09 01:42:30 +00:00
odjbin
a3cbf4d24b Merge pull request 'fix : 修复项目实施附件上传功能' (#977) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/977
 2025-04-09 01:42:17 +00:00
dj
d3b12bd64c fix : 修复项目实施附件上传功能 2025-04-09 09:37:53 +08:00
odjbin
c213b3b41c Merge pull request 'master' (#976) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/976
 2025-04-08 16:24:02 +00:00
odjbin
d0c677cfb4 Merge pull request 'dj' (#975) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/975
 2025-04-08 16:23:33 +00:00
dj
e9469439e8 Merge remote-tracking branch 'origin/dj' 2025-04-09 00:16:51 +08:00
odjbin
62035606c9 Merge pull request 'master' (#974) from master into dj 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/974
 2025-04-08 16:16:26 +00:00
dj
b101d70c75 fix: 修复附件上传和展示问题 2025-04-09 00:15:01 +08:00
odjbin
382bad4cb3 Merge pull request 'master' (#973) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/973
 2025-04-08 16:14:37 +00:00
dj
8c5d08874f fix: 修复附件上传和展示问题 2025-04-09 00:14:10 +08:00
dj
25d5b20b65 fix: 修复附件上传和展示问题 2025-04-09 00:13:51 +08:00
dj
2f43919132 fix: 分摊明细导出调整参数 2025-04-08 23:05:42 +08:00
odjbin
8f5b9fc637 Merge pull request 'fix: 分摊明细导出调整参数' (#972) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/972
 2025-04-07 16:30:53 +00:00
dj
7b619a9bef fix: 分摊明细导出调整参数 2025-04-08 00:30:32 +08:00
odjbin
f33543c540 Merge pull request 'fix: 优化首页通知公告样式' (#971) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/971
 2025-04-07 13:57:40 +00:00
dj
a9a2be2c74 fix: 优化首页通知公告样式 2025-04-07 21:57:13 +08:00
odjbin
3160e86710 Merge pull request 'fix: 优化移动端项目管理功能' (#970) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/970
 2025-04-06 14:38:30 +00:00
dj
a307697028 fix: 优化移动端项目管理功能 2025-04-06 22:38:14 +08:00
odjbin
062f9c7bee Merge pull request 'feat(article-management): 首页通知公告加时间, 将"备注"字段改为"发文单位"' (#969) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/969
 2025-04-06 13:26:05 +00:00
dj
e8a5b4e788 feat(article-management): 首页通知公告加时间, 将"备注"字段改为"发文单位" 2025-04-06 21:25:30 +08:00