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

1657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
39af97815c Merge pull request 'master' (#840) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/840
 2024-10-14 04:17:33 +00:00
odjbin
bcffdba692 Merge pull request 'fix : 修改首页提示' (#839) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/839
 2024-10-14 04:17:25 +00:00
odjbin
2e9d015623 fix : 修改首页提示 2024-10-14 12:16:57 +08:00
odjbin
4654f71f11 Merge pull request 'master' (#838) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/838
 2024-10-13 16:28:06 +00:00
odjbin
9d63e05d03 Merge pull request 'fix : 修改首页提示' (#837) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/837
 2024-10-13 16:27:46 +00:00
odjbin
6ea9538b0a fix : 修改首页提示 2024-10-14 00:27:15 +08:00
odjbin
88f4a93a81 Merge pull request 'master' (#836) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/836
 2024-10-13 14:48:38 +00:00
odjbin
9671d5a36d Merge pull request 'dj' (#835) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/835
 2024-10-13 14:48:29 +00:00
odjbin
f476dc9203 feat : 首页待办/已办查看更多列表 2024-10-13 22:47:44 +08:00
odjbin
235ec0c4ff fix : 修复首页刷新功能 2024-10-13 22:18:18 +08:00
odjbin
f2ba567b93 fix : 修复首页刷新功能 2024-10-13 22:15:39 +08:00
odjbin
525385cd17 Merge pull request 'fix : 修复首页研发投入资金渲染bug' (#834) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/834
 2024-10-13 14:08:27 +00:00
odjbin
ee8df164d1 fix : 修复首页研发投入资金渲染bug 2024-10-13 22:08:10 +08:00
odjbin
df2d53b9da Merge pull request 'master' (#833) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/833
 2024-10-13 14:00:02 +00:00
odjbin
9b1d51273d Merge pull request 'fix : 修复审批节点' (#832) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/832
 2024-10-13 13:59:52 +00:00
odjbin
0fc92b7742 fix : 修复审批节点 2024-10-13 21:59:27 +08:00
odjbin
1996ff0b3a Merge pull request 'master' (#831) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/831
 2024-10-13 09:45:25 +00:00
odjbin
735dedfb42 Merge pull request 'feat : 首页项目四个状态统计' (#830) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/830
 2024-10-13 09:45:15 +00:00
odjbin
4ab7a04c92 feat : 首页项目四个状态统计 2024-10-13 17:44:53 +08:00
odjbin
8864e13030 Merge pull request 'master' (#829) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/829
 2024-10-11 08:17:47 +00:00
odjbin
b3bfff9588 Merge pull request 'dj' (#828) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/828
 2024-10-11 08:17:38 +00:00
odjbin
c6d8b45537 fix : 优化费用台账-导出按钮位置 2024-10-11 16:07:35 +08:00
odjbin
e7e1f33985 fix : 修复pointTag组件报错 2024-10-11 15:40:28 +08:00
odjbin
4f67329f6b Merge pull request 'master' (#827) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/827
 2024-10-11 07:26:52 +00:00
odjbin
4aff4667ef Merge pull request 'feat : 费用台账导出' (#826) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/826
 2024-10-11 07:26:33 +00:00
odjbin
41fd5bef4d feat : 费用台账导出 2024-10-11 15:26:03 +08:00
odjbin
11e4b4ab3f Merge pull request 'master' (#825) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/825
 2024-10-11 07:15:56 +00:00
odjbin
509b7e35c9 Merge pull request 'fix : 修复“专项资金名称”显示不全问题' (#824) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/824
 2024-10-11 07:15:44 +00:00
odjbin
a7143c8c58 fix : 修复“专项资金名称”显示不全问题 2024-10-11 15:15:28 +08:00
odjbin
f588695f3c Merge pull request 'master' (#823) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/823
 2024-10-11 07:01:13 +00:00
odjbin
26ba628cae Merge pull request 'dj' (#822) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/822
 2024-10-11 07:00:58 +00:00
odjbin
7fbc2037d3 feat : 研发投入资金管理按钮权限 2024-10-11 15:00:42 +08:00
odjbin
5c1a1d507a feat : 首页专项资金项目数据展示 2024-10-11 14:49:18 +08:00
odjbin
ee2ddfca14 Merge pull request 'fix : 修复popover删除组件按钮显示问题' (#821) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/821
 2024-10-11 06:27:11 +00:00
odjbin
c456c6f642 fix : 修复popover删除组件按钮显示问题 2024-10-11 14:27:00 +08:00
odjbin
2c2055a11a Merge pull request 'master' (#820) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/820
 2024-10-11 06:06:42 +00:00
odjbin
502b4cff10 Merge pull request 'fix : 修复文章操作权限' (#819) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/819
 2024-10-11 06:06:31 +00:00
odjbin
c34fb88311 fix : 修复文章操作权限 2024-10-11 14:02:36 +08:00
odjbin
5949cdd843 Merge pull request 'master' (#818) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/818
 2024-10-11 04:15:10 +00:00
odjbin
22548f34c1 Merge pull request 'fix : 修复研发投入资金年份筛选时chart没渲染的bug' (#817) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/817
 2024-10-11 04:14:36 +00:00
odjbin
c643aa0e1d fix : 修复研发投入资金年份筛选时chart没渲染的bug 2024-10-11 12:13:59 +08:00
odjbin
9be3a714d1 Merge pull request 'master' (#816) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/816
 2024-10-11 03:39:32 +00:00
odjbin
478f9d2639 Merge pull request 'feat : 添加首页待办数据和研发投入资金年份筛选' (#815) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/815
 2024-10-11 03:39:17 +00:00
odjbin
19c4f7469d feat : 添加首页待办数据和研发投入资金年份筛选 2024-10-11 11:38:45 +08:00
odjbin
9b50bcd0ee Merge pull request 'master' (#814) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/814
 2024-10-09 13:20:01 +00:00
odjbin
06f3fcefee Merge pull request 'dj' (#813) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/813
 2024-10-09 13:17:26 +00:00
odjbin
62d18089c4 fix : 简化代码 2024-10-09 21:16:55 +08:00
odjbin
03a34bb637 Merge pull request 'fix : 优化首页样式' (#812) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/812
 2024-10-09 11:57:50 +00:00
odjbin
9d144af68a fix : 优化首页样式 2024-10-09 19:54:27 +08:00
odjbin
00c346c7b1 Merge remote-tracking branch 'origin/master' 2024-10-09 19:47:44 +08:00