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

1003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
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
odjbin
618cc8cb87 fix : 项目实施台账时间搜索 2024-07-18 16:56:38 +08:00
odjbin
8e91feb616 fix : 附件上传修复 2024-07-18 16:15:11 +08:00
odjbin
203b53936f fix : 附件上传修复 2024-07-18 15:21:41 +08:00
odjbin
f154e2789b Merge remote-tracking branch 'origin/master' 2024-07-18 14:52:23 +08:00
odjbin
b4cfb8a5c6 fix : 附件上传修复 2024-07-18 14:52:06 +08:00
odjbin
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
odjbin
63eba1d0dc Merge remote-tracking branch 'origin/master' 2024-07-18 12:22:45 +08:00
odjbin
094474b680 fix : 修复项目立项校验 2024-07-18 12:19:43 +08:00
odjbin
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
odjbin
60d9b958bc fix : 修复项目立项校验 2024-07-18 11:45:30 +08:00
odjbin
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
odjbin
0c3580768b feat : 刷新缓存 2024-07-17 23:11:26 +08:00
odjbin
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
odjbin
cccd370671 feat : 刷新缓存 2024-07-17 22:47:38 +08:00
odjbin
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
odjbin
2dea264c51 fix : 修复年度计划创建及状态 2024-07-17 21:20:48 +08:00
odjbin
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
odjbin
fb469d5139 fix : 还原需求征集详情按钮显示 2024-07-17 17:29:24 +08:00
odjbin
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
odjbin
92de396d12 feat : 需求征集详情审核通过后加上需求上报按钮 2024-07-17 17:20:45 +08:00
odjbin
a1dbcf8dce Merge remote-tracking branch 'origin/master' 2024-07-16 21:56:48 +08:00
odjbin
ad4f2f5ba9 fix : 人员组件和组织结构组件改为懒加载模式 2024-07-16 21:56:39 +08:00
odjbin
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
odjbin
a934176986 fix : 修复人员选择框 2024-07-16 21:10:55 +08:00
odjbin
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
odjbin
280137b7e2 fix : 修复组织机构左侧高亮 2024-07-16 21:07:10 +08:00
odjbin
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
odjbin
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
odjbin
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
odjbin
4f41c43d37 feat : 用户个人中心密码校验及专项资金关联项目是否展示 2024-07-15 22:02:43 +08:00
odjbin
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
odjbin
8f993d0644 feat : 用户个人中心展示及密码设置 2024-07-15 21:46:40 +08:00
odjbin
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
odjbin
1f631ea65d fix : 注释log输出 2024-07-15 20:45:09 +08:00
odjbin
4d9007c87e fix : 修复年度计划细节,表格高度 2024-07-15 20:44:48 +08:00
odjbin
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
odjbin
55f12a2fb8 fix : 修复阶段变更附件显示 2024-07-15 19:46:34 +08:00
odjbin
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
odjbin
6ac1dba2b5 fix : 修复项目详情排版,组织机构管理排版 2024-07-15 19:12:30 +08:00
lilinyuan
f6dcb6b71b fix: 页面缓存 2024-07-15 09:47:02 +08:00
odjbin
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
odjbin
5342a4d891 feat : 组织机构管理公司详情 2024-07-15 00:02:58 +08:00
odjbin
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
odjbin
04bbedf025 fix : 修复需求上报排版 2024-07-14 22:50:58 +08:00
odjbin
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
odjbin
a64e6827c1 fix : 修改需求征集状态权限 2024-07-14 22:36:40 +08:00
odjbin
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