1020 Commits

Author SHA1 Message Date
clay
e576000267 feat : 科创部直接跳过审批节点 2024-07-19 14:51:07 +08:00
clay
ae6da83a1a feat : 科创部直接跳过审批节点 2024-07-19 14:23:00 +08:00
clay
bd01e4c94b feat : 科创部直接跳过审批节点 2024-07-19 14:22:17 +08:00
lilinyuan
9783ca8506 feat: 表单组件添加回车事件 2024-07-19 11:10:51 +08:00
clay
264f6283dc feat : 部门副职用户选择框无法弹出 2024-07-19 10:07:39 +08:00
acf261b58b Merge pull request 'feat : 台账导入' (#602) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/602
2024-07-18 17:54:19 +00:00
fde9ba3781 feat : 台账导入 2024-07-19 01:53:51 +08:00
04a65c6932 Merge pull request 'dd' (#600) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/600
2024-07-18 16:43:39 +00:00
e9333f7859 feat : 台账导入 2024-07-19 00:43:11 +08:00
0a2004e3ce feat : 台账导入 2024-07-19 00:41:15 +08:00
b69a147c61 Merge pull request 'feat : 台账导入' (#598) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/598
2024-07-18 14:56:21 +00:00
5deae5d846 feat : 台账导入 2024-07-18 22:56:08 +08:00
c2c60d01af Merge pull request 'fix : 修复页面bug' (#596) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/596
2024-07-18 14:06:59 +00:00
9d5c393ebe fix : 修复页面bug 2024-07-18 22:06:23 +08:00
3ec7a9c78e Merge pull request 'dd' (#594) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/594
2024-07-18 09:49:11 +00:00
5dc25d1480 fix : 项目实施台账刷新 2024-07-18 17:48:56 +08:00
ad3e7479f4 fix : 项目实施台账时间搜索 2024-07-18 17:33:54 +08:00
c082ffc884 Merge pull request 'fix : 项目实施台账时间搜索' (#592) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/592
2024-07-18 08:56:59 +00:00
618cc8cb87 fix : 项目实施台账时间搜索 2024-07-18 16:56:38 +08:00
8e91feb616 fix : 附件上传修复 2024-07-18 16:15:11 +08:00
203b53936f fix : 附件上传修复 2024-07-18 15:21:41 +08:00
f154e2789b Merge remote-tracking branch 'origin/master' 2024-07-18 14:52:23 +08:00
b4cfb8a5c6 fix : 附件上传修复 2024-07-18 14:52:06 +08:00
6c874cac48 Merge pull request 'fix : 修复项目立项校验' (#587) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/587
2024-07-18 04:27:39 +00:00
63eba1d0dc Merge remote-tracking branch 'origin/master' 2024-07-18 12:22:45 +08:00
094474b680 fix : 修复项目立项校验 2024-07-18 12:19:43 +08:00
0cfe4a8698 Merge pull request 'fix : 修复项目立项校验' (#586) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/586
2024-07-18 03:45:59 +00:00
60d9b958bc fix : 修复项目立项校验 2024-07-18 11:45:30 +08:00
1591e5d057 Merge pull request 'feat : 刷新缓存' (#584) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/584
2024-07-17 15:11:41 +00:00
0c3580768b feat : 刷新缓存 2024-07-17 23:11:26 +08:00
2793a62628 Merge pull request 'feat : 刷新缓存' (#582) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/582
2024-07-17 14:47:52 +00:00
cccd370671 feat : 刷新缓存 2024-07-17 22:47:38 +08:00
ec86d11537 Merge pull request 'fix : 修复年度计划创建及状态' (#580) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/580
2024-07-17 13:21:00 +00:00
2dea264c51 fix : 修复年度计划创建及状态 2024-07-17 21:20:48 +08:00
7dbaf5ca48 Merge pull request 'fix : 还原需求征集详情按钮显示' (#578) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/578
2024-07-17 09:29:38 +00:00
fb469d5139 fix : 还原需求征集详情按钮显示 2024-07-17 17:29:24 +08:00
fbccc01bbc Merge pull request 'feat : 需求征集详情审核通过后加上需求上报按钮' (#576) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/576
2024-07-17 09:21:31 +00:00
92de396d12 feat : 需求征集详情审核通过后加上需求上报按钮 2024-07-17 17:20:45 +08:00
a1dbcf8dce Merge remote-tracking branch 'origin/master' 2024-07-16 21:56:48 +08:00
ad4f2f5ba9 fix : 人员组件和组织结构组件改为懒加载模式 2024-07-16 21:56:39 +08:00
da10fca727 Merge pull request 'fix : 修复人员选择框' (#573) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/573
2024-07-16 13:11:20 +00:00
a934176986 fix : 修复人员选择框 2024-07-16 21:10:55 +08:00
c60245fb79 Merge pull request 'fix : 修复组织机构左侧高亮' (#571) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/571
2024-07-16 13:07:21 +00:00
280137b7e2 fix : 修复组织机构左侧高亮 2024-07-16 21:07:10 +08:00
36440928ae Merge pull request 'feat : 项目管理表单缓存,文件回显,个人中心icon排版' (#569) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/569
2024-07-16 12:36:23 +00:00
b77253b0cb feat : 项目管理表单缓存,文件回显,个人中心icon排版 2024-07-16 20:36:06 +08:00
clay
d4ba4bc7c2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/layout/navbar/index.vue
2024-07-15 22:23:54 +08:00
clay
80116c77f6 feat : 账号切换刷新修改 2024-07-15 22:23:09 +08:00
d923330b77 Merge pull request 'feat : 用户个人中心密码校验及专项资金关联项目是否展示' (#566) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/566
2024-07-15 14:07:05 +00:00
4f41c43d37 feat : 用户个人中心密码校验及专项资金关联项目是否展示 2024-07-15 22:02:43 +08:00