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

1985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dj
a2ed04e144 refactor(project-demand): 优化加载状态管理 
- 在获取数据失败时添加 loading.value = false，确保正确更新加载状态
 2025-05-21 22:38:53 +08:00
odjbin
8a218ad270 Merge pull request 'feat(project-demand): 编辑概览页面数据持久化' (#1009) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1009
 2025-05-21 06:31:54 +00:00
dj
287d6a3ad0 feat(project-demand): 编辑概览页面数据持久化 2025-05-21 14:31:38 +08:00
odjbin
9813f8c585 Merge pull request 'fix(project-demand): 修复专项基金选择问题' (#1008) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1008
 2025-05-21 04:55:59 +00:00
dj
673a26368a fix(project-demand): 修复专项基金选择问题 2025-05-21 12:55:23 +08:00
odjbin
9b90dbc649 Merge pull request 'feat(ProjectApply): 科技处用户申请项目时增加部门分管领导必选项' (#1007) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1007
 2025-05-19 14:13:55 +00:00
dj
9adea1060c feat(ProjectApply): 科技处用户申请项目时增加部门分管领导必选项 2025-05-19 22:13:03 +08:00
odjbin
4f471494cc Merge pull request 'refactor(permission): 优化面包屑控制逻辑' (#1006) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1006
 2025-05-16 10:15:13 +00:00
dj
4e5a4bb4b9 refactor(permission): 优化面包屑控制逻辑 2025-05-16 18:14:31 +08:00
odjbin
b4d6d97e27 Merge pull request 'fix : 修复需求上报缓存问题' (#1005) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1005
 2025-05-15 08:06:29 +00:00
dj
a5ebab16a6 fix : 修复需求上报缓存问题 2025-05-15 16:06:04 +08:00
odjbin
6ad76d1571 Merge pull request 'master' (#1004) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1004
 2025-05-05 12:15:31 +00:00
dj
0cc1b63ae7 feat(project-management): 优化前置流程选择功能 
- 在项目申请详情页面添加基本数据传递
- 实现前置流程的更改和选择功能
- 优化前置流程数据的存储和展示
- 添加对不可重复选择的前置流程的校验
 2025-05-05 20:15:13 +08:00
dj
d76ef8ff9c feat(project-demand): 更新项目需求汇总功能 
- 新增 getProjectName 方法，用于项目名称关键词匹配- 修改远程搜索方法，使用 getProjectName 替代 getRequirementName
- 更新 ProjectApply 组件，调整专项资金输入框显示逻辑
- 移除 proxy 配置中的注释
 2025-05-05 17:53:55 +08:00
dj
f105485714 feat(project-demand): 添加项目名称远程搜索功能并优化前置流程显示逻辑 
- 在项目需求概览页面添加项目名称远程搜索功能，提高搜索效率和准确性
- 优化项目申请详情页面的前置流程显示逻辑，根据不同场景调整标签宽度
 2025-05-05 14:48:07 +08:00
odjbin
df99acd638 Merge pull request 'fix : 修复公告问题' (#1003) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1003
 2025-04-29 03:29:31 +00:00
dj
af275ea6c4 fix : 修复公告问题 2025-04-29 11:29:06 +08:00
odjbin
68830daab3 Merge pull request 'master' (#1002) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1002
 2025-04-27 06:29:31 +00:00
dj
c27162f918 feat : 项目归档-实施附件 2025-04-27 14:28:59 +08:00
dj
f1b81d86a2 fix : 备份附件 2025-04-27 11:00:38 +08:00
odjbin
0c24d2cf51 Merge pull request 'fix : 修复单位元' (#1001) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1001
 2025-04-24 13:48:41 +00:00
dj
710ccbdf65 fix : 修复单位元 2025-04-24 21:48:23 +08:00
odjbin
7001261f01 Merge pull request 'refactor(project-management): 统一经费预算单位' (#1000) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1000
 2025-04-24 07:30:38 +00:00
dj
7fcfc992fb refactor(project-management): 统一经费预算单位 
- 在多个组件中将"预估经费预算"和"实际经费预算"的标签添加单位"(元)"
-调整部分组件的标签宽度以适应新的单位
- 此修改统一了经费预算的显示格式，提高了用户体验
 2025-04-24 15:30:14 +08:00
odjbin
b7be0a34ae Merge pull request 'feat(components): 增加审核意见必填校验' (#999) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/999
 2025-04-23 14:47:41 +00:00
dj
a792df80e6 feat(components): 增加审核意见必填校验 2025-04-23 22:46:58 +08:00
odjbin
b56e5b3544 Merge pull request 'fix : 标签不可编辑' (#998) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/998
 2025-04-20 12:32:35 +00:00
dj
5dccaa1ee7 fix : 标签不可编辑 2025-04-20 20:32:16 +08:00
odjbin
6aa074bfa3 Merge pull request 'feat : 项目验收新增字段' (#997) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/997
 2025-04-20 11:50:58 +00:00
dj
8aefca0c82 feat : 项目验收新增字段 2025-04-20 19:49:57 +08:00
odjbin
e518791ddd Merge pull request 'master' (#996) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/996
 2025-04-20 06:44:18 +00:00
dj
afda146103 feat : 项目归档-附件新增项目阶段字段 2025-04-20 14:43:57 +08:00
dj
11f7fa37aa feat : 年度计划新字段 2025-04-20 13:01:43 +08:00
dj
35c2e1d9b4 feat : 需求上报新增字段 2025-04-20 12:46:14 +08:00
dj
fe3a15fcbd fix: 调整详情页面知识产权输出项 2025-04-19 21:03:54 +08:00
dj
9fd97f6ea2 feat :需求上报新增字段 2025-04-19 20:13:11 +08:00
dj
cccd14ec79 fix: 移除预期成果形式相关代码 2025-04-19 19:03:10 +08:00
odjbin
2ed2cae599 Merge pull request 'fix : 注释立项提交的前置流程' (#995) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/995
 2025-04-19 05:43:49 +00:00
dj
958399a32a fix : 注释立项提交的前置流程 2025-04-19 13:43:36 +08:00
odjbin
745971087c Merge pull request 'fix : 完善需求上报字段页面' (#994) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/994
 2025-04-19 02:58:46 +00:00
dj
8ea916c206 fix : 完善需求上报字段页面 2025-04-19 10:58:28 +08:00
odjbin
e0aefecf50 Merge pull request 'fix: 修复审批白名单中取消事件' (#993) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/993
 2025-04-18 14:52:27 +00:00
dj
10e9c9de19 fix: 修复审批白名单中取消事件 2025-04-18 22:51:49 +08:00
odjbin
950b32270b Merge pull request 'master' (#992) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/992
 2025-04-18 14:40:16 +00:00