Commit Graph

2022 Commits

Author SHA1 Message Date
dj
ed22942ab2 fix(project-management): 优化附件启用禁用操作反馈 2025-04-03 00:11:21 +08:00
dj
119e3d8333 feat(ProjectAttachment): 优化文件上传标签逻辑 2025-04-03 00:09:41 +08:00
011566cb22 Merge pull request 'feat(ProjectAttachment): 添加文件下载功能' (#964) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/964
2025-04-02 15:37:56 +00:00
dj
bf34d8aa0c feat(ProjectAttachment): 添加文件下载功能 2025-04-02 23:34:45 +08:00
7f3fedc2f2 Merge pull request 'master' (#963) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/963
2025-04-02 15:28:05 +00:00
dj
69aa6aa0fb refactor(project-demand): 优化需求变更时特殊基金逻辑 2025-04-02 23:26:01 +08:00
dj
e54db551a6 feat(project-demand): 添加需求征集变更逻辑 2025-04-02 23:01:17 +08:00
6c91a0740a Merge pull request 'fix: 修改分摊明细页面路由跳转逻辑' (#962) from master into dj
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/962
2025-04-01 16:06:24 +00:00
f0fe6c8269 Merge pull request 'master' (#961) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/961
2025-04-01 16:06:06 +00:00
dj
9174c09a6b fix: 修改分摊明细页面路由跳转逻辑 2025-04-02 00:05:48 +08:00
dj
4dc5ca40ee feat(share-detail): 添加分摊导出按钮 2025-04-02 00:02:49 +08:00
09705e634a Merge pull request 'feat(expense-management): 新增费用分摊功能并优化项目管理相关页面' (#960) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/960
2025-04-01 15:58:33 +00:00
dj
1e29e6bdc4 feat(expense-management): 新增费用分摊功能并优化项目管理相关页面 2025-04-01 23:57:46 +08:00
e49d8cfb5e Merge pull request 'master' (#959) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/959
2025-04-01 10:19:27 +00:00
a3bb1a9156 Merge pull request 'feat: 支出明细筛选和导出功能' (#958) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/958
2025-04-01 10:19:16 +00:00
dj
e9ced267ed feat: 支出明细筛选和导出功能 2025-04-01 13:04:34 +08:00
ef9a536b5c Merge pull request 'master' (#957) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/957
2025-03-31 15:16:40 +00:00
a87be0e6e2 Merge pull request 'dj' (#956) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/956
2025-03-31 15:16:28 +00:00
dj
98d8ea4805 feat(expense-management): 新增费用分摊功能并优化项目管理相关页面 2025-03-31 23:14:54 +08:00
dj
244f2e72b4 feat: 项目基本信息新增实际经费预算和专项资金相关字段 2025-03-31 14:12:28 +08:00
dj
f9aa6191ce feat(project-manage): 新增项目附件标签功能 2025-03-30 15:06:56 +08:00
dj
ebd7fa3851 feat(project-manage): 新增项目附件标签功能 2025-03-30 15:06:39 +08:00
2941847f54 Merge pull request 'dj' (#955) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/955
2025-03-29 12:25:32 +00:00
dj
ca9e281119 feat(project-manage): 新增项目附件标签功能 2025-03-29 20:24:53 +08:00
dj
a1ed160445 Merge remote-tracking branch 'origin/master' 2025-03-28 19:41:10 +08:00
dj
9db0e8e9ec feat(expense-management): 新增费用分摊功能 2025-03-25 15:17:08 +08:00
fe09ced0bc Merge pull request 'master' (#954) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/954
2025-03-25 06:37:02 +00:00
d73eb49461 Merge pull request 'dj' (#953) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/953
2025-03-25 06:28:09 +00:00
dj
b890372fc5 feat(ProjectAttachment): 优化项目附件组件功能和布局
- 移除了不必要的搜索和上传按钮
- 添加了文件上传功能和单个文件删除功能
- 优化了标签页切换逻辑
-调整了样式和布局
2025-03-25 14:27:48 +08:00
dj
53bab74ea9 feat(project-management): 更新项目管理相关页面文案并优化附件功能 2025-03-22 23:11:09 +08:00
zhangkaihuai
023256630e 更新 Dockerfile 2025-03-19 12:24:06 +00:00
zhangkaihuai
f65663071a 更新 nginx.conf 2025-03-19 12:13:31 +00:00
zhangkaihuai
9a55494da7 更新 nginx.conf 2025-03-19 08:07:37 +00:00
zhangkaihuai
d5a07e772f 更新 nginx.conf 2025-03-19 07:55:07 +00:00
zhangkaihuai
42499bcb22 更新 nginx.conf 2025-03-19 07:40:27 +00:00
zhangkaihuai
0243d6fc56 Merge pull request '更新 nginx.conf' (#952) from gary into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/952
2025-03-19 07:34:21 +00:00
zhangkaihuai
6bdbde262f 更新 nginx.conf 2025-03-19 07:34:04 +00:00
zhangkaihuai
78435bbcac Merge pull request 'gary' (#951) from gary into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/951
2025-03-19 07:32:49 +00:00
zhangkaihuai
c3358acf73 Merge remote-tracking branch 'origin/gary' 2025-03-19 15:32:05 +08:00
zhangkaihuai
3b1b822882 nginx ssl 证书配置 2025-03-19 15:29:56 +08:00
f874cd75b7 Merge pull request 'master' (#950) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/950
2025-03-13 13:35:25 +00:00
d9a5099436 Merge pull request 'dj' (#949) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/949
2025-03-13 13:35:11 +00:00
dj
dd75bc6513 fix: 修复汇总列表征集名称筛选判重 2025-03-13 21:34:48 +08:00
dj
d3506d841e fix: 注释掉需求添加和附件上传中的标签编辑功能 2025-03-10 21:25:12 +08:00
dj
263df9e489 feat: 列表新增征集, 筛选新增公司,征集名称 2025-03-10 17:42:21 +08:00
65b76da880 Merge pull request 'master' (#948) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/948
2025-03-08 11:23:50 +00:00
50973efb0a Merge pull request 'feat(system): 新增审批白名单功能并优化用户列表' (#947) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/947
2025-03-08 11:23:40 +00:00
dj
8256c80648 feat(system): 新增审批白名单功能并优化用户列表 2025-03-08 19:23:17 +08:00
d0dc8ba9f8 Merge pull request 'master' (#946) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/946
2025-03-08 09:48:33 +00:00
97e9799b1a Merge pull request 'dj' (#945) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/945
2025-03-08 09:48:20 +00:00