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

1139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
da2f27bc72 Merge pull request 'master' (#543) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/543
 2024-07-13 05:24:06 +00:00
odjbin
e45c71ccd0 Merge pull request 'fix : 上传文件表格滚动时, 表头固定' (#542) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/542
 2024-07-13 05:23:53 +00:00
odjbin
3e1db9c1a4 fix : 上传文件表格滚动时, 表头固定 2024-07-13 13:23:28 +08:00
odjbin
eeb821de24 Merge pull request 'master' (#541) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/541
 2024-07-13 05:01:06 +00:00
odjbin
6c55b66dde Merge pull request 'fix : 征集公司居中' (#540) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/540
 2024-07-13 05:00:23 +00:00
odjbin
e4ecd22c2e fix : 征集公司居中 2024-07-13 13:00:04 +08:00
clay
22d1c6fc46 Merge remote-tracking branch 'origin/master' 2024-07-12 15:04:02 +08:00
clay
1c095d3fcc feat : 调整布局 2024-07-12 15:03:54 +08:00
odjbin
a754751832 Merge pull request 'master' (#539) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/539
 2024-07-12 06:06:36 +00:00
odjbin
d49b771101 Merge pull request 'fix : 前置流程全选' (#538) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/538
 2024-07-12 06:06:27 +00:00
odjbin
8ac168023b fix : 前置流程全选 2024-07-12 14:06:15 +08:00
odjbin
5235f23365 Merge pull request 'master' (#537) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/537
 2024-07-12 04:11:04 +00:00
odjbin
e7090f7cd8 Merge pull request 'fix : 前置流程enter的bug' (#536) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/536
 2024-07-12 04:10:43 +00:00
odjbin
7f581ef763 fix : 前置流程enter的bug 2024-07-12 12:10:18 +08:00
clay
7f684fa085 Merge pull request 'feat : 调整简答布局' (#535) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/535
 2024-07-12 03:53:06 +00:00
clay
fa05c22efc feat : 调整简答布局 2024-07-12 11:52:20 +08:00
clay
d674a6ea12 Merge pull request 'feat : 流程渲染与有任务跳转到首页' (#534) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/534
 2024-07-12 02:07:47 +00:00
clay
2856fa4785 feat : 流程渲染与有任务跳转到首页 2024-07-12 10:06:43 +08:00
odjbin
b315b667e9 Merge pull request 'master' (#533) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/533
 2024-07-11 16:00:00 +00:00
odjbin
0a40d4d068 Merge pull request 'fix : 表格更新负责人回显' (#532) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/532
 2024-07-11 15:59:51 +00:00
odjbin
649445f784 fix : 表格更新负责人回显 2024-07-11 23:59:39 +08:00
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