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

1118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
798c42beb9 Merge pull request 'master' (#531) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/531
 2024-07-11 15:49:43 +00:00
odjbin
bdc23982ce Merge pull request 'fix : 项目立项页面细节优化' (#530) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/530
 2024-07-11 15:49:34 +00:00
odjbin
45220348d3 fix : 项目立项页面细节优化 2024-07-11 23:49:15 +08:00
odjbin
2613884a89 Merge pull request 'master' (#529) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/529
 2024-07-11 15:32:53 +00:00
odjbin
dfe422345e Merge pull request 'fix : 项目立项页面细节优化' (#528) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/528
 2024-07-11 15:32:44 +00:00
odjbin
80cd6363ab fix : 项目立项页面细节优化 2024-07-11 23:31:59 +08:00
odjbin
9a9702227c Merge pull request 'master' (#527) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/527
 2024-07-11 15:01:06 +00:00
odjbin
0b6e825bbd Merge pull request 'fix : 项目立项页面细节优化' (#526) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/526
 2024-07-11 15:00:36 +00:00
odjbin
5dacc784ea fix : 项目立项页面细节优化 2024-07-11 23:00:18 +08:00
odjbin
74ad7e9eb9 Merge pull request 'master' (#525) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/525
 2024-07-11 14:48:29 +00:00
odjbin
68938c7ff0 Merge pull request 'fix : 项目立项页面细节优化' (#524) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/524
 2024-07-11 14:48:17 +00:00
odjbin
2722c9915b fix : 项目立项页面细节优化 2024-07-11 22:47:53 +08:00
odjbin
cdb984a439 Merge pull request 'master' (#523) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/523
 2024-07-11 14:29:08 +00:00
odjbin
97a81b6670 Merge pull request 'fix : 项目立项页面细节优化' (#522) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/522
 2024-07-11 14:28:59 +00:00
odjbin
61e7e096a4 fix : 项目立项页面细节优化 2024-07-11 22:28:43 +08:00
clay
3401c8a5e3 feat : 年度计划删除操作 2024-07-11 22:22:20 +08:00
odjbin
ab33f09538 Merge pull request 'master' (#521) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/521
 2024-07-11 13:09:38 +00:00
odjbin
480d419a6c Merge pull request 'fix : 项目立项页面细节优化' (#520) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/520
 2024-07-11 13:09:26 +00:00
odjbin
37755d62b1 fix : 项目立项页面细节优化 2024-07-11 21:09:10 +08:00
odjbin
152da3c0e4 Merge pull request 'master' (#519) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/519
 2024-07-11 08:40:46 +00:00
odjbin
06e175cd8c Merge pull request 'dd' (#518) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/518
 2024-07-11 08:40:31 +00:00
odjbin
ddcbc02025 fix : 项目立项页面细节优化 2024-07-11 16:40:11 +08:00
odjbin
7c63c5e791 Merge remote-tracking branch 'origin/master' 2024-07-11 14:48:27 +08:00
clay
bd165769de Merge pull request 'master' (#517) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/517
 2024-07-10 15:20:26 +00:00
clay
7bf6336a46 fix : 年度计划删除 2024-07-10 23:19:41 +08:00
wenhua
50a4e21a99 Merge branch 'master' of http://git.feashow.cn/clay/mosr-web 2024-07-10 22:18:43 +08:00
wenhua
e8d3148937 fix: 调整样式 2024-07-10 22:18:40 +08:00
zhangkaihuai
dfdeaec16c Merge remote-tracking branch 'origin/master' 2024-07-10 18:09:02 +08:00
zhangkaihuai
42fd8d9740 feat:增加项目负责人和成员选择功能 
在项目申请详情中，新增了项目负责人和成员的选择功能，使用user-picker组件实现。
同时，对前置流程的展示进行了调整，并完善了审批记录和流程图的相关逻辑。
 2024-07-10 18:08:51 +08:00
odjbin
17994928bf Merge pull request 'fix : 细节优化' (#516) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/516
 2024-07-10 08:57:20 +00:00
odjbin
5efa1b8764 Merge remote-tracking branch 'origin/master' 2024-07-10 16:57:08 +08:00
odjbin
71b9065f29 fix : 细节优化 2024-07-10 16:56:28 +08:00
zhangkaihuai
b1616b716c Merge remote-tracking branch 'origin/master' 2024-07-10 16:53:48 +08:00
wenhua
c266e27c51 Merge pull request 'fix: bug修复' (#515) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/515
 2024-07-09 15:32:00 +00:00
wenhua
7836450a10 fix: bug修复 2024-07-09 23:31:10 +08:00
odjbin
1bfa0095ae Merge pull request 'master' (#514) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/514
 2024-07-09 11:35:37 +00:00
odjbin
cbc97891b8 Merge pull request 'fix : 修复年度计划详情展示' (#513) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/513
 2024-07-09 11:35:25 +00:00
odjbin
7a38c34da9 fix : 修复年度计划详情展示 2024-07-09 19:35:04 +08:00
odjbin
33c4e4baa7 Merge pull request 'master' (#512) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/512
 2024-07-07 15:36:51 +00:00
odjbin
9f06ecbc62 Merge pull request 'fix : 修复专项资金权限, 费用台账时间搜索' (#511) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/511
 2024-07-07 15:36:36 +00:00
odjbin
23975e056a fix : 修复专项资金权限, 费用台账时间搜索 2024-07-07 23:36:20 +08:00
odjbin
eb5df00b45 Merge pull request 'master' (#510) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/510
 2024-07-06 20:13:40 +00:00
odjbin
ac409710d8 Merge pull request 'fix : 修复归档-附件搜索传参问题' (#509) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/509
 2024-07-06 20:13:29 +00:00
odjbin
2c8de29fcd fix : 修复归档-附件搜索传参问题 2024-07-07 04:12:06 +08:00
odjbin
61be47b3d4 Merge pull request 'master' (#508) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/508
 2024-07-06 19:31:43 +00:00
odjbin
c5a3bc9b58 Merge pull request 'fix : 修复征集公司选择' (#507) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/507
 2024-07-06 19:31:33 +00:00
odjbin
09d95babd0 fix : 修复征集公司选择 2024-07-07 03:31:18 +08:00
odjbin
e5356787be Merge pull request 'master' (#506) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/506
 2024-07-06 18:44:08 +00:00
odjbin
584adb63d4 Merge pull request 'dd' (#505) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/505
 2024-07-06 18:43:56 +00:00
odjbin
06090fc00b fix : 修复费用台账时间搜索 2024-07-07 02:43:40 +08:00