Commit Graph

987 Commits

Author SHA1 Message Date
0c3580768b feat : 刷新缓存 2024-07-17 23:11:26 +08:00
cccd370671 feat : 刷新缓存 2024-07-17 22:47:38 +08:00
2dea264c51 fix : 修复年度计划创建及状态 2024-07-17 21:20:48 +08:00
fb469d5139 fix : 还原需求征集详情按钮显示 2024-07-17 17:29:24 +08: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
45fccc9d57 Merge pull request 'feat : 用户个人中心展示及密码设置' (#564) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/564
2024-07-15 13:47:02 +00:00
8f993d0644 feat : 用户个人中心展示及密码设置 2024-07-15 21:46:40 +08:00
587c3c6477 Merge pull request 'dd' (#562) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/562
2024-07-15 12:45:24 +00:00
1f631ea65d fix : 注释log输出 2024-07-15 20:45:09 +08:00
4d9007c87e fix : 修复年度计划细节,表格高度 2024-07-15 20:44:48 +08:00
f4cf15656e Merge pull request 'fix : 修复阶段变更附件显示' (#560) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/560
2024-07-15 11:47:01 +00:00
55f12a2fb8 fix : 修复阶段变更附件显示 2024-07-15 19:46:34 +08:00
2616b916db Merge pull request 'fix : 修复项目详情排版,组织机构管理排版' (#558) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/558
2024-07-15 11:13:06 +00:00
6ac1dba2b5 fix : 修复项目详情排版,组织机构管理排版 2024-07-15 19:12:30 +08:00
lilinyuan
f6dcb6b71b fix: 页面缓存 2024-07-15 09:47:02 +08:00
7e1f5ca820 Merge pull request 'feat : 组织机构管理公司详情' (#555) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/555
2024-07-14 16:03:17 +00:00
5342a4d891 feat : 组织机构管理公司详情 2024-07-15 00:02:58 +08:00
602e69007c Merge pull request 'fix : 修复需求上报排版' (#553) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/553
2024-07-14 14:51:12 +00:00
04bbedf025 fix : 修复需求上报排版 2024-07-14 22:50:58 +08:00
6ab2b5f947 Merge pull request 'fix : 修改需求征集状态权限' (#551) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/551
2024-07-14 14:36:52 +00:00
a64e6827c1 fix : 修改需求征集状态权限 2024-07-14 22:36:40 +08:00
8173bfb6fb Merge pull request 'fix : 修改首页排版' (#550) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/550
2024-07-14 14:35:39 +00:00
599fe5febb fix : 修改首页排版 2024-07-14 22:35:12 +08:00
8313be513b Merge pull request 'fix : 修复项目立项回车搜索' (#549) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/549
2024-07-14 11:21:03 +00:00
cef1d50833 fix : 修复项目立项回车搜索 2024-07-14 19:08:49 +08:00
54db74b033 Merge pull request 'fix : 修复项目立项校验' (#548) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/548
2024-07-14 11:07:44 +00:00
cdb7811133 fix : 修复项目立项校验 2024-07-14 19:07:30 +08:00
wenhua
4c91a6a336 Merge branch 'master' of http://git.feashow.cn/clay/mosr-web 2024-07-14 18:18:36 +08:00
wenhua
c6222e0528 fix: 增加tag组件兼容性; 调整steps样式 2024-07-14 18:18:32 +08:00
a7d8bf63ca Merge pull request 'fix : 修复项目立项校验' (#547) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/547
2024-07-14 09:50:02 +00:00
29180cfb9f fix : 修复项目立项校验 2024-07-14 17:48:26 +08:00
02bf07f4da Merge pull request 'dd' (#546) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/546
2024-07-14 08:43:41 +00:00
8791d220e6 fix : 组织机构样式修改 2024-07-14 16:43:14 +08:00
88ab0d3526 fix : 修改项目立项校验 2024-07-14 15:57:56 +08:00
04cc61047a fix : 文件表格高度, 组织机构管理 2024-07-14 15:55:55 +08:00
925a8045f4 fix : 台账更新权限 2024-07-13 17:41:37 +08:00
3c12bafa59 fix : 所有下拉框, 加上搜索删除 2024-07-13 17:10:41 +08:00
f1237de72a Merge pull request 'fix : 上传文件表格滚动时, 表头固定' (#544) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/544
2024-07-13 06:19:07 +00:00