Commit Graph

934 Commits

Author SHA1 Message Date
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
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
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
8ac168023b fix : 前置流程全选 2024-07-12 14:06:15 +08:00
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
7f581ef763 fix : 前置流程enter的bug 2024-07-12 12:10:18 +08:00
clay
fa05c22efc feat : 调整简答布局 2024-07-12 11:52:20 +08:00
clay
2856fa4785 feat : 流程渲染与有任务跳转到首页 2024-07-12 10:06:43 +08:00
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
649445f784 fix : 表格更新负责人回显 2024-07-11 23:59:39 +08:00
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
45220348d3 fix : 项目立项页面细节优化 2024-07-11 23:49:15 +08:00
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
80cd6363ab fix : 项目立项页面细节优化 2024-07-11 23:31:59 +08:00
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
5dacc784ea fix : 项目立项页面细节优化 2024-07-11 23:00:18 +08:00
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
2722c9915b fix : 项目立项页面细节优化 2024-07-11 22:47:53 +08:00
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
61e7e096a4 fix : 项目立项页面细节优化 2024-07-11 22:28:43 +08:00
clay
3401c8a5e3 feat : 年度计划删除操作 2024-07-11 22:22:20 +08:00
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
37755d62b1 fix : 项目立项页面细节优化 2024-07-11 21:09:10 +08:00
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
ddcbc02025 fix : 项目立项页面细节优化 2024-07-11 16:40:11 +08:00
7c63c5e791 Merge remote-tracking branch 'origin/master' 2024-07-11 14:48:27 +08: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
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
5efa1b8764 Merge remote-tracking branch 'origin/master' 2024-07-10 16:57:08 +08:00
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
7836450a10 fix: bug修复 2024-07-09 23:31:10 +08:00
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
7a38c34da9 fix : 修复年度计划详情展示 2024-07-09 19:35:04 +08:00
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
23975e056a fix : 修复专项资金权限, 费用台账时间搜索 2024-07-07 23:36:20 +08:00
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
2c8de29fcd fix : 修复归档-附件搜索传参问题 2024-07-07 04:12:06 +08:00
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
09d95babd0 fix : 修复征集公司选择 2024-07-07 03:31:18 +08:00
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
06090fc00b fix : 修复费用台账时间搜索 2024-07-07 02:43:40 +08:00
fce1bfdb6f fix : 修复年度计划编辑功能 2024-07-07 02:36:40 +08:00
c10f7b2398 Merge pull request 'fix : 修复台账基础信息展示及年度计划通过后跳转' (#503) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/503
2024-07-06 18:22:36 +00:00