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

1225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
ff09ed8c8a Merge pull request 'fix : 附件上传修复' (#590) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/590
 2024-07-18 07:22:17 +00:00
odjbin
203b53936f fix : 附件上传修复 2024-07-18 15:21:41 +08:00
odjbin
fdb76c31a8 Merge pull request 'master' (#589) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/589
 2024-07-18 06:53:26 +00: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
484efa5854 Merge pull request 'master' (#588) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/588
 2024-07-18 04:27:58 +00: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
07b3457409 Merge pull request 'master' (#585) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/585
 2024-07-17 15:11:51 +00: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
1150fdac86 Merge pull request 'master' (#583) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/583
 2024-07-17 14:48:03 +00: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
930684ac01 Merge pull request 'master' (#581) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/581
 2024-07-17 14:11:32 +00: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
760d452311 Merge pull request 'master' (#579) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/579
 2024-07-17 09:29:50 +00: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
6f0800162b Merge pull request 'master' (#577) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/577
 2024-07-17 09:21:41 +00: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
8f3432f9a0 Merge pull request 'master' (#575) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/575
 2024-07-16 13:57:08 +00: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
ae1c614ee8 Merge pull request 'master' (#574) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/574
 2024-07-16 13:11:29 +00: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
7ceb63b02f Merge pull request 'master' (#572) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/572
 2024-07-16 13:07:31 +00: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
a0fa5d43f1 Merge pull request 'master' (#570) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/570
 2024-07-16 12:36:35 +00: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
odjbin
008b3c942a Merge pull request 'master' (#568) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/568
 2024-07-15 14:24:24 +00: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
3cc9f40baf Merge pull request 'master' (#567) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/567
 2024-07-15 14:07:17 +00: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
ca030e42d4 Merge pull request 'master' (#565) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/565
 2024-07-15 13:47:14 +00: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
7b6ca29a93 Merge pull request 'master' (#563) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/563
 2024-07-15 12:45:49 +00: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