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

2174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
3c459f4be2 Merge pull request 'fix(filling): 修改用户管理归属部门显示' (#1099) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1099
 2025-08-01 15:14:10 +00:00
dj
1ad6e021a1 fix(filling): 修改用户管理归属部门显示 2025-08-01 22:50:59 +08:00
odjbin
6cbc3f83e6 Merge pull request 'master' (#1098) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1098
 2025-07-27 12:40:09 +00:00
dj
9560a964e7 fix(filling): 修改下属公司归档状态 2025-07-27 20:39:21 +08:00
odjbin
94bd9930b6 Merge pull request 'prod' (#1097) from prod into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1097
 2025-07-22 16:24:29 +00:00
odjbin
f2e80e4874 Merge pull request 'fix : 需求上报部分字段默认null' (#1096) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1096
 2025-07-22 16:23:07 +00:00
dj
62e98b9e3f fix : 需求上报部分字段默认null 2025-07-23 00:21:28 +08:00
zhangkaihuai
a620b248f4 更新 .drone.yml 2025-07-22 07:52:07 +00:00
zhangkaihuai
e2e4d3226f 更新 .drone.yml 2025-07-22 07:45:47 +00:00
zhangkaihuai
af2788583f 更新 .drone.yml 2025-07-22 07:42:40 +00:00
zhangkaihuai
ba58089e94 更新 .drone.yml 2025-07-22 07:29:18 +00:00
zhangkaihuai
88dcbf3196 更新 .drone.yml 2025-07-22 07:26:24 +00:00
odjbin
9092b1e960 Merge pull request 'master' (#1095) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1095
 2025-07-22 07:13:45 +00:00
dj
3ddd24cc70 fix : 修复支出明细-项目类型字段 2025-07-22 15:13:22 +08:00
odjbin
1fb3345afe Merge pull request 'fix : 屏蔽账号编辑' (#1094) from prod into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1094
 2025-07-11 02:27:43 +00:00
dj
d1fe0faad1 fix : 屏蔽账号编辑 2025-07-11 10:24:32 +08:00
odjbin
64d10a711d Merge pull request 'fix : 修复角色修改权限' (#1093) from prod into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1093
 2025-07-11 02:19:47 +00:00
dj
1d5e8a23ed fix : 修复角色修改权限 2025-07-11 10:12:48 +08:00
odjbin
2973bbe6a7 Merge pull request 'prod' (#1092) from prod into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1092
 2025-07-10 03:34:00 +00:00
zhangkaihuai
8974282b44 更新 docker.sh 2025-07-10 03:26:55 +00:00
zhangkaihuai
81705482a8 更新 docker.sh 2025-07-10 03:22:00 +00:00
odjbin
9cc8d337be Merge pull request 'fix : 修复实施图片' (#1091) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1091
 2025-07-09 14:59:44 +00:00
dengjie
973dc0f2e4 fix : 修复实施图片 2025-07-09 22:56:09 +08:00
odjbin
db696ca389 Merge pull request 'feat(components): 调整分页组件默认页码和每页条数' (#1090) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1090
 2025-07-03 15:30:50 +00:00
dj
64e2ff0647 feat(components): 调整分页组件默认页码和每页条数 
- 将 fvPagination 组件的默认每页条数从 10 调整为 20
- 在 pageSizes 数组中添加 100 选项
- 更新 fvTable 组件中的默认每页条数和 pageSizes 配置
- 修改首页专项资金项目和研发投入资金的相关文案
 2025-07-03 23:30:22 +08:00
odjbin
53b0e4b240 Merge pull request 'master' (#1089) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1089
 2025-07-03 15:08:34 +00:00
dj
17010a15a3 fix : 修复首页数量 2025-07-03 23:08:16 +08:00
odjbin
f74743c00f Merge pull request 'fix : 修复首页数量' (#1088) from prod into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1088
 2025-07-03 15:01:37 +00:00
dj
e14b6d676c fix : 修复首页数量 2025-07-03 18:41:57 +08:00
odjbin
3ecea87de8 Merge pull request 'prod' (#1087) from prod into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1087
 2025-06-25 10:05:41 +00:00
dj
cb290acf09 test : ci/cd 2025-06-25 17:52:27 +08:00
odjbin
f6cabee345 Merge pull request 'feat(upload): 优化文件上传组件逻辑' (#1086) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1086
 2025-06-25 09:41:38 +00:00
dj
8b03d62a75 feat(upload): 优化文件上传组件逻辑 
- 在删除文件时，将删除的文件信息存储到本地存储中
- 在选择文件时，检查本地存储中是否有删除的文件信息，并从选择的文件中移除
- 优化了文件上传流程，提高了用户体验
 2025-06-25 17:41:15 +08:00
odjbin
1674d1acd0 Merge pull request 'fix(ProjectAttachment): 优化附件删除逻辑' (#1085) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1085
 2025-06-25 07:38:49 +00:00
dj
41a455338f fix(ProjectAttachment): 优化附件删除逻辑 
- 在删除其他附件时，同时从 allFiles 中移除对应文件
- 移除删除附件后不必要的重新获取附件列表操作
 2025-06-25 15:38:22 +08:00
odjbin
5b67f97021 Merge pull request 'master' (#1084) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1084
 2025-06-20 01:57:33 +00:00
dj
a451f7481e style(fvTable): 移除表格单元格悬停时的宽度限制 
- 注释掉 .fv-table :deep(.el-tooltip) 中的 width: 100% !important 样式
-此修改解决了单元格内容过长时导致的表格布局问题
 2025-06-20 09:57:06 +08:00
odjbin
2400660b1f Merge pull request 'prod' (#1083) from prod into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1083
 2025-06-14 16:37:37 +00:00
dj
26e0009ebd test : ci/cd 2025-06-15 00:36:56 +08:00
dj
34b0b88f07 test : ci/cd 2025-06-15 00:31:01 +08:00
dj
37a3cd75a2 test : ci/cd 2025-06-15 00:25:25 +08:00
dj
81d4002034 test : ci/cd 2025-06-15 00:10:47 +08:00
dj
5c000cdba3 test : ci/cd 2025-06-15 00:06:42 +08:00
zhangkaihuai
5dcdbe9ae1 Merge pull request 'zhangkaihuai-patch-1' (#1082) from zhangkaihuai-patch-1 into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1082
 2025-06-14 15:25:46 +00:00
zhangkaihuai
4371ccb5e7 更新 .drone.yml 2025-06-14 15:25:22 +00:00
zhangkaihuai
f9ef5c7087 更新 .drone.yml 2025-06-14 15:20:57 +00:00
zhangkaihuai
bf2f28960f Merge pull request '更新 .drone.yml' (#1081) from zhangkaihuai-patch-1 into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1081
 2025-06-14 14:56:58 +00:00
zhangkaihuai
f42eacd06e 更新 .drone.yml 2025-06-14 14:56:50 +00:00
odjbin
861a6489c7 Merge pull request 'test : ci/cd' (#1080) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1080
 2025-06-14 11:26:25 +00:00
dj
9133f7a7e3 test : ci/cd 2025-06-14 19:26:13 +08:00