Commit Graph

1942 Commits

Author SHA1 Message Date
7e7aac5139 Merge pull request 'master' (#926) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/926
2024-12-13 04:42:16 +00:00
54e7a8f662 Merge pull request 'feat: 优化文章详情页面pdf预览功能' (#925) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/925
2024-12-13 04:42:04 +00:00
dj
43785b7460 feat: 优化文章详情页面pdf预览功能 2024-12-13 12:38:08 +08:00
eed18d0c17 Merge pull request 'master' (#924) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/924
2024-12-13 03:52:19 +00:00
ad969d33bb Merge pull request 'feat : 需求上报加上保存按钮' (#923) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/923
2024-12-13 03:52:03 +00:00
dj
b41e39abbf feat : 需求上报加上保存按钮 2024-12-13 11:51:18 +08:00
981d65c759 Merge pull request 'master' (#922) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/922
2024-12-11 05:13:47 +00:00
d7e36ee464 Merge pull request 'feat: 在文章管理中集成多图片上传插件' (#921) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/921
2024-12-11 05:13:33 +00:00
dj
54eeefd5dd feat: 在文章管理中集成多图片上传插件 2024-12-11 13:12:43 +08:00
049091719a Merge pull request 'master' (#920) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/920
2024-11-10 14:52:43 +00:00
df6f0083ea Merge pull request 'feat : 需求汇总加上"主项目"字段' (#919) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/919
2024-11-10 14:52:34 +00:00
a5486c1948 feat : 需求汇总加上"主项目"字段 2024-11-10 22:52:15 +08:00
5f120bff1e Merge pull request 'master' (#918) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/918
2024-11-10 05:50:47 +00:00
f6d5a97dfb Merge pull request 'feat : 需求汇总加上 " 是否在预算内"筛选' (#917) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/917
2024-11-10 05:50:37 +00:00
a6ace0a27d feat : 需求汇总加上 " 是否在预算内"筛选 2024-11-10 13:50:22 +08:00
70a4899337 Merge pull request 'master' (#916) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/916
2024-11-07 03:09:06 +00:00
b2eec2e1f3 Merge pull request 'fix : 修改系统名称' (#915) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/915
2024-11-07 03:08:56 +00:00
5506ebee7a fix : 修改系统名称 2024-11-07 11:08:38 +08:00
a6fd326774 Merge pull request 'master' (#914) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/914
2024-11-07 03:08:17 +00:00
348edd66bd Merge pull request 'fix : 修改系统名称' (#913) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/913
2024-11-07 03:08:00 +00:00
d58579579d fix : 修改系统名称 2024-11-07 11:07:47 +08:00
3139c78179 Merge pull request 'fix : 修改系统名称' (#911) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/911
2024-11-07 03:05:59 +00:00
252a077dcd fix : 修改系统名称 2024-11-07 11:04:16 +08:00
45aaaf5360 Merge pull request 'master' (#910) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/910
2024-11-03 11:50:33 +00:00
87d5677352 Merge pull request 'feat : 项目立项, 阶段变更zip下载' (#909) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/909
2024-11-03 11:32:31 +00:00
39c9408f34 feat : 项目立项, 阶段变更zip下载 2024-11-03 19:31:59 +08:00
193862f58b Merge pull request 'master' (#908) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/908
2024-11-02 14:05:27 +00:00
36624c5621 Merge pull request 'feat : "需求上报, 项目立项, 项目验收, 阶段变更, 专项资金" 上传文件旁边加上模板下载功能' (#907) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/907
2024-11-02 14:05:13 +00:00
08da2601d8 feat : "需求上报, 项目立项, 项目验收, 阶段变更, 专项资金" 上传文件旁边加上模板下载功能 2024-11-02 22:00:08 +08:00
24563fd7df Merge pull request 'master' (#906) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/906
2024-11-02 12:01:42 +00:00
4b4aed5600 Merge pull request 'feat : 需求征集和项目管理的名称匹配搜索' (#905) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/905
2024-11-02 12:01:11 +00:00
a175a6456a feat : 需求征集和项目管理的名称匹配搜索 2024-11-02 20:00:29 +08:00
6de9896ead Merge pull request 'master' (#904) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/904
2024-10-30 13:14:01 +00:00
0bbe97c582 Merge pull request 'dj' (#903) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/903
2024-10-30 13:13:52 +00:00
960d294870 feat : 修复项目归档的附件的全部附件加个类型筛选 2024-10-30 21:13:16 +08:00
f3fbb8d76b fix : 修复选择前置流程时的提示为红色 2024-10-29 21:53:07 +08:00
60df95cc20 Merge pull request 'master' (#902) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/902
2024-10-29 13:45:26 +00:00
8a0f6c6f37 Merge pull request 'feat : 需求汇总列表新增当前审批节点字段,阶段变更新增项目终止字段' (#901) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/901
2024-10-29 13:45:17 +00:00
99be2b0501 feat : 需求汇总列表新增当前审批节点字段,阶段变更新增项目终止字段 2024-10-29 21:44:50 +08:00
d8a1a661df Merge pull request 'master' (#900) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/900
2024-10-27 11:01:00 +00:00
942603c344 Merge pull request 'fix : 修复项目实施文件预览' (#899) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/899
2024-10-27 11:00:53 +00:00
54772cbbb1 fix : 修复项目实施文件预览 2024-10-27 19:00:37 +08:00
f720c3cddb Merge pull request 'master' (#898) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/898
2024-10-27 10:08:59 +00:00
a4e95e21b3 Merge pull request 'fix : 修复新增征集/需求上报时缓存和注释log' (#897) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/897
2024-10-27 10:08:50 +00:00
53b581e71c fix : 修复新增征集/需求上报时缓存和注释log 2024-10-27 18:08:16 +08:00
0a6803371b Merge pull request 'master' (#896) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/896
2024-10-26 17:54:18 +00:00
604a0fedb8 Merge pull request 'fix : 修复tinymce的多图片上传插件/文章详情附件下载' (#895) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/895
2024-10-26 17:54:09 +00:00
8f226e6fa3 fix : 修复tinymce的多图片上传插件/文章详情附件下载 2024-10-27 01:53:42 +08:00
fb48952924 Merge pull request 'master' (#894) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/894
2024-10-26 17:10:15 +00:00
44eb378423 Merge pull request 'fix : 修复tinymce的多图片上传插件' (#893) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/893
2024-10-26 17:10:08 +00:00