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
579cadd687 refactor(components): 优化文件上传成功提示 2025-06-12 11:42:09 +08:00
odjbin
78f4135efb Merge pull request 'build: 调整 package.json' (#1032) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1032
 2025-06-12 03:29:12 +00:00
dj
1a120418f0 build: 调整 package.json 2025-06-12 11:28:25 +08:00
odjbin
d3ae1c1205 Merge pull request 'build: 更新 Node.js 版本并调整 package.json 格式' (#1031) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1031
 2025-06-12 03:16:06 +00:00
dj
e49b6ef1a3 build: 更新 Node.js 版本并调整 package.json 格式 2025-06-12 11:15:52 +08:00
odjbin
6fbf37ab78 Merge pull request 'fix(ProjectAttachment): 修改drone' (#1030) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1030
 2025-06-12 03:13:47 +00:00
dj
a0d9c58c77 fix(ProjectAttachment): 修改drone 2025-06-12 11:12:52 +08:00
odjbin
b3900a2a1c Merge pull request 'fix(ProjectAttachment): 修改drone' (#1029) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1029
 2025-06-12 03:08:20 +00:00
dj
4bb0c49dc8 fix(ProjectAttachment): 修改drone 2025-06-12 11:08:03 +08:00
odjbin
4f6c36a20a Merge pull request 'fix(ProjectAttachment): 修改drone' (#1028) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1028
 2025-06-12 02:17:12 +00:00
dj
aada3d785b fix(ProjectAttachment): 修改drone 2025-06-12 10:16:35 +08:00
odjbin
fef4c57bd5 Merge pull request 'fix(ProjectAttachment): 添加依赖' (#1027) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1027
 2025-06-12 02:04:22 +00:00
dj
35b332f640 fix(ProjectAttachment): 添加依赖 2025-06-12 10:03:57 +08:00
odjbin
31da00d7e3 Merge pull request 'fix(ProjectAttachment): 添加依赖' (#1026) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1026
 2025-06-12 01:36:07 +00:00
dj
6afac9be28 fix(ProjectAttachment): 添加依赖 2025-06-12 09:35:00 +08:00
odjbin
b54289a0a5 Merge pull request 'fix(ProjectAttachment): 修改drone.yml' (#1025) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1025
 2025-06-12 01:28:38 +00:00
dj
dc064de364 fix(ProjectAttachment): 修改drone.yml 2025-06-12 09:28:02 +08:00
odjbin
7f656447b2 Merge pull request 'fix(ProjectAttachment): 修改drone.yml' (#1024) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1024
 2025-06-12 01:25:35 +00:00
dj
78bafe0a7e fix(ProjectAttachment): 修改drone.yml 2025-06-12 09:24:29 +08:00
odjbin
ddf5159fbc Merge pull request 'master' (#1023) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1023
 2025-06-11 14:49:29 +00:00
dj
d0960f6ad6 feat(FileUpload): 实现多文件批量上传功能 
- 添加自定义上传逻辑，支持多文件上传- 优化文件选择和上传流程，实现自动上传
-增加上传进度提示和完成通知
- 修复了一些与上传相关的小问题
 2025-06-11 22:48:27 +08:00
dj
e7b982ef6c fix(ProjectAttachment): 移除未使用的上传附件相关代码 2025-06-11 16:34:59 +08:00
dj
b5ada3a1ac feat(FileUpload): 添加文件上传中的 loading 效果 2025-06-11 14:19:55 +08:00
odjbin
418effdb04 Merge pull request 'feat(expense-management): 添加研发工时超过21.75天的提示功能' (#1022) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1022
 2025-06-09 14:28:50 +00:00
dj
215f7c6bbf feat(expense-management): 添加研发工时超过21.75天的提示功能 
- 在保存分配明细时，增加对研发人员总工时的计算
- 如果总工时超过21.75天，系统将发出警告通知- 优化了控制台日志输出，便于调试和监控
 2025-06-09 22:28:24 +08:00
odjbin
57a1d2700f Merge pull request 'refactor(expense-management): 注释掉研发人员重复性检查代码' (#1021) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1021
 2025-06-08 15:11:01 +00:00
dj
e4025b90e9 refactor(expense-management): 注释掉研发人员重复性检查代码 
- 在 add.vue 文件中，注释掉了两段用于检查研发人员重复性的代码
- 此修改可能是为了暂时禁用重复性检查功能，或者准备替换为新的检查逻辑
 2025-06-08 23:08:02 +08:00
odjbin
e44380c000 Merge pull request 'refactor(expense-management): 优化数字输入和附件处理' (#1020) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1020
 2025-06-07 01:30:52 +00:00
dj
70d94f3c1d refactor(expense-management): 优化数字输入和附件处理 
- 在 ProjectApply 组件中，将多个 el-input 组件替换为 el-input-number 组件，用于限制输入格式
- 在 ProjectAttachment 组件中，优化附件列表获取逻辑，实现附件去重功能
- 在 add.vue 文件中，启用 console.log 输出，用于调试项目 ID 和研发人员 ID 数组
 2025-06-06 22:58:48 +08:00
odjbin
14c6ed1168 Merge pull request 'fix : 修复归档附件bug' (#1019) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1019
 2025-05-28 15:53:32 +00:00
dj
05275aed15 fix : 修复归档附件bug 2025-05-28 23:53:10 +08:00
odjbin
47d5863361 Merge pull request 'fix : 修复归档附件bug' (#1018) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1018
 2025-05-28 15:51:11 +00:00
dj
9758981d3f fix : 修复归档附件bug 2025-05-28 23:50:59 +08:00
odjbin
a946247849 Merge pull request 'master' (#1017) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1017
 2025-05-28 15:03:54 +00:00
dj
7c2d713035 fix(components): 优化多个组件的显示逻辑 
- 在 ApprovalDetail组件中，改进了多个字段的显示逻辑，增加了对 0值的处理
- 在 AttachmentUpload 组件中，调整了必填项的显示逻辑
- 在 ProjectApply 组件中，修改了前置流程字段的显示条件
- 在 upload 组件中，优化了文件列表的处理逻辑
 2025-05-28 23:01:16 +08:00
dj
f4330b60d5 refactor(ProjectApply): 优化归档附件上传逻辑 2025-05-28 16:50:55 +08:00
odjbin
1a38381ab8 Merge pull request 'refactor(components): 调整文件上传大小限制并优化附件展示逻辑' (#1016) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1016
 2025-05-23 01:08:02 +00:00
dj
f61d50dbfc refactor(components): 调整文件上传大小限制并优化附件展示逻辑 2025-05-23 09:07:02 +08:00
odjbin
f5b9339b36 Merge pull request 'fix(ProjectAttachment): 重新获取附件列表' (#1015) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1015
 2025-05-22 15:09:20 +00:00
dj
66dc6df0d9 fix(ProjectAttachment): 重新获取附件列表 
在删除附件后，添加了重新获取附件列表的调用，以确保界面上的附件列表是最新的。
 2025-05-22 23:08:27 +08:00
odjbin
a3c7439a7f Merge pull request 'fix(ProjectAttachment): 修复删除附件后未及时更新文件列表的问题- 在删除文件后添加了更新文件列表的逻辑' (#1014) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1014
 2025-05-22 14:57:02 +00:00
dj
c7329f2f6d fix(ProjectAttachment): 修复删除附件后未及时更新文件列表的问题- 在删除文件后添加了更新文件列表的逻辑 
- 优化了获取本地文件列表的方法
- 调整了文件列表的初始化位置
 2025-05-22 22:56:06 +08:00
odjbin
59699b6118 Merge pull request 'feat(ProjectAttachment): 优化文件上传和管理功能' (#1013) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1013
 2025-05-22 08:46:46 +00:00
dj
673e4fa20a feat(ProjectAttachment): 优化文件上传和管理功能 
- 新增本地存储功能，暂存未提交的文件
- 优化文件删除逻辑，区分本地和服务器文件
- 添加提交按钮，将本地文件上传到服务器
- 调整标签切换时的文件列表显示逻辑
- 优化代码结构，提高可读性和可维护性
 2025-05-22 16:45:58 +08:00
odjbin
eb2a5581ca Merge pull request 'refactor(project-demand): 优化方案总结提交逻辑' (#1012) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1012
 2025-05-22 02:09:05 +00:00
dj
ee5fc2cba3 refactor(project-demand): 优化方案总结提交逻辑 
- 移除了不必要的空数组初始化
-简化了 requirementId 的赋值逻辑
- 添加了空行以提高代码可读性
 2025-05-22 10:06:44 +08:00
odjbin
952884a7fe Merge pull request 'fix(project-demand): 修复专项经费选择框逻辑' (#1011) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1011
 2025-05-21 15:17:49 +00:00
dj
b7ca97696a fix(project-demand): 修复专项经费选择框逻辑 
- 修改了专项经费选择逻辑，确保在选择专项经费时正确处理 specialFund 和 specialFundId 的值
- 优化了代码结构，提高了可读性和维护性
 2025-05-21 23:14:00 +08:00
odjbin
6ba9fa4bee Merge pull request 'master' (#1010) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1010
 2025-05-21 14:39:55 +00:00
dj
baea68c52a Merge remote-tracking branch 'origin/master' 2025-05-21 22:39:08 +08:00