odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,951 Commits 11 Branches 0 Tags
6aa074bfa30d62dd14739bad59039fc693a72d34
Commit Graph

1951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dj
ebd7fa3851 feat(project-manage): 新增项目附件标签功能 2025-03-30 15:06:39 +08:00
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
dj
e81b2bc42f feat(system): 新增审批白名单功能并优化用户列表 2025-03-08 17:47:54 +08:00
dj
9c297d92c9 feat : 需求征集新增公司筛选 2025-03-02 22:16:12 +08:00
odjbin
e2de62e54a Merge pull request 'master' (#944) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/944
 2024-12-21 07:08:22 +00:00
odjbin
a3b1f96ab6 Merge pull request 'fix:移除未使用的文件下载和删除功能' (#943) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/943
 2024-12-21 07:07:45 +00:00
dj
d2c77b9cc2 fix:移除未使用的文件下载和删除功能 2024-12-21 15:07:10 +08:00
odjbin
61feb031aa Merge pull request 'master' (#942) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/942
 2024-12-21 06:50:05 +00:00
odjbin
b06b4b88bb Merge pull request 'fix: 优化文件删除逻辑(采用前端删除文件)' (#941) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/941
 2024-12-21 06:49:55 +00:00
dj
560fd3af3b fix: 优化文件删除逻辑(采用前端删除文件) 2024-12-21 14:49:32 +08:00
odjbin
e5b5b26e24 Merge pull request 'master' (#940) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/940
 2024-12-20 15:32:31 +00:00
odjbin
19aa70a8ca Merge pull request 'fix: 优化文件删除逻辑(采用前端删除文件)' (#939) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/939
 2024-12-20 15:32:21 +00:00
dj
06af12ca88 fix: 优化文件删除逻辑(采用前端删除文件) 2024-12-20 22:27:22 +08:00
odjbin
41b04e6fac Merge pull request 'master' (#938) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/938
 2024-12-19 15:07:32 +00:00
odjbin
96d912ff44 Merge pull request 'fix: 修改流程审批字样' (#937) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/937
 2024-12-19 15:07:23 +00:00
dj
10f1afe23c fix: 修改流程审批字样 2024-12-19 23:07:06 +08:00
odjbin
0f2cb87f66 Merge pull request 'master' (#936) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/936
 2024-12-19 14:26:49 +00:00
odjbin
e10978cadd Merge pull request 'dj' (#935) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/935
 2024-12-19 14:26:36 +00:00
dj
7ce2d6edb7 fix: 修改多图片上传页面 2024-12-19 22:26:17 +08:00
dj
5f8a29f2d6 fix: 修改用户选择器标题文案 2024-12-15 00:20:28 +08:00
odjbin
ccba937158 Merge pull request 'master' (#934) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/934
 2024-12-14 14:54:58 +00:00
odjbin
efe27b8580 Merge pull request 'fix : 优化需求上报时需求征集显示' (#933) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/933
 2024-12-14 14:54:46 +00:00
dj
7a535c41e7 fix : 优化需求上报时需求征集显示 2024-12-14 22:54:33 +08:00