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

2049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
20fb592584 Merge pull request 'test : 测试ci/cd' (#1042) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1042
 2025-06-13 06:23:55 +00:00
dj
bd35243cbd test : 测试ci/cd 2025-06-13 14:23:37 +08:00
odjbin
d7ca84a4a0 Merge pull request 'master' (#1041) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1041
 2025-06-13 06:19:11 +00:00
odjbin
6c7eddcf94 Merge pull request 'test : 测试ci/cd' (#1040) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1040
 2025-06-13 06:18:59 +00:00
odjbin
3588257f61 revert 215f7c6bbf 
revert feat(expense-management): 添加研发工时超过21.75天的提示功能

- 在保存分配明细时，增加对研发人员总工时的计算
- 如果总工时超过21.75天，系统将发出警告通知- 优化了控制台日志输出，便于调试和监控
 2025-06-13 06:18:21 +00:00
odjbin
6c47337318 Merge pull request 'revert 215f7c6bbf084b0bf6dbee1303a2539a3c21c3ad' (#1039) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1039
 2025-06-13 06:14:59 +00:00
odjbin
bacd397294 revert 215f7c6bbf 
revert feat(expense-management): 添加研发工时超过21.75天的提示功能

- 在保存分配明细时，增加对研发人员总工时的计算
- 如果总工时超过21.75天，系统将发出警告通知- 优化了控制台日志输出，便于调试和监控
 2025-06-13 06:14:19 +00:00
dj
b3dbb24bb2 test : 测试ci/cd 2025-06-13 14:11:25 +08:00
odjbin
9e194f5f04 Merge pull request 'test : 测试ci/cd' (#1038) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1038
 2025-06-12 07:29:49 +00:00
dj
f448ec47a3 test : 测试ci/cd 2025-06-12 15:26:52 +08:00
odjbin
f633862434 Merge pull request 'test : 测试ci/cd' (#1037) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1037
 2025-06-12 07:19:39 +00:00
dj
a4674d497b test : 测试ci/cd 2025-06-12 15:18:29 +08:00
odjbin
e8aee6f01c Merge pull request 'test : 测试ci/cd' (#1036) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1036
 2025-06-12 06:54:14 +00:00
dj
43e0f98509 test : 测试ci/cd 2025-06-12 14:53:52 +08:00
odjbin
10b66cbf15 Merge pull request 'master' (#1035) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1035
 2025-06-12 06:07:46 +00:00
dj
560bea739c test : 测试cicd 2025-06-12 14:07:25 +08:00
dj
1ed6156117 build(deps): 删除 moment 依赖 2025-06-12 12:08:41 +08:00
odjbin
4321b42003 Merge pull request 'build(deps): 添加 moment 依赖' (#1034) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1034
 2025-06-12 04:05:02 +00:00
dj
7f0f74c844 build(deps): 添加 moment 依赖 2025-06-12 12:04:11 +08:00
odjbin
c1065cb084 Merge pull request 'refactor(components): 优化文件上传成功提示' (#1033) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1033
 2025-06-12 03:42:56 +00:00
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