Commit Graph

706 Commits

Author SHA1 Message Date
a7f95e98aa Merge pull request 'master' (#330) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/330
2024-06-14 05:05:07 +00:00
49b64c177f Merge pull request 'fix : 修复费用分摊复制功能、数字框默认值为null、项目归档显示是哪个流程的上传附件' (#329) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/329
2024-06-14 05:04:56 +00:00
f240016e44 fix : 修复费用分摊复制功能、数字框默认值为null、项目归档显示是哪个流程的上传附件 2024-06-14 13:04:37 +08:00
df4312e61d Merge pull request 'master' (#328) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/328
2024-06-11 13:14:34 +00:00
6d56c4702b Merge pull request 'fix : 修复细节' (#327) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/327
2024-06-11 13:14:24 +00:00
3db0f3bd5b fix : 修复细节 2024-06-11 21:14:09 +08:00
65af3e7bfb Merge pull request 'master' (#326) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/326
2024-06-11 13:05:54 +00:00
363e2b983e Merge pull request 'fix : 修复新增需求细节' (#325) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/325
2024-06-11 13:05:46 +00:00
90a26f2e1e fix : 修复新增需求细节 2024-06-11 21:05:31 +08:00
fe5c28dbf0 Merge pull request 'master' (#324) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/324
2024-06-11 12:59:21 +00:00
f931c65b57 Merge pull request 'fix : 修复新增需求细节' (#323) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/323
2024-06-11 12:59:11 +00:00
e64b7fe0ae fix : 修复新增需求细节 2024-06-11 20:58:47 +08:00
5b78df27f5 Merge pull request 'master' (#322) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/322
2024-06-11 12:56:47 +00:00
48e97ed275 Merge pull request 'dj' (#321) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/321
2024-06-11 12:56:37 +00:00
a2977d0702 fix : 屏蔽导出修复角色权限 2024-06-11 20:56:22 +08:00
78ab1ddc45 fix : 屏蔽导出 2024-06-11 20:32:20 +08:00
7f73afa6b5 Merge pull request 'fix : 修复流程图切换功能和屏蔽导出' (#320) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/320
2024-06-11 12:15:02 +00:00
208584c34b fix : 修复流程图切换功能和屏蔽导出 2024-06-11 20:14:49 +08:00
f9cf478694 Merge pull request 'master' (#319) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/319
2024-06-11 11:17:20 +00:00
40d2bef0ba Merge pull request 'dj' (#318) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/318
2024-06-11 11:16:58 +00:00
b425e709aa fix : 修复流程图切换功能及修改"研发阶段"文字为项目阶段 2024-06-11 19:16:35 +08:00
3f7de153da fix : 修复项目立项/验收前置流程展示及系统部分页面分页bug 2024-06-11 18:47:35 +08:00
7b67e71bd6 Merge pull request 'master' (#317) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/317
2024-06-11 07:42:26 +00:00
99224392a3 Merge pull request 'dj' (#316) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/316
2024-06-11 07:42:16 +00:00
ab83724056 fix : 修复详情页切换流程图渲染bug 2024-06-11 15:42:01 +08:00
2c5c694445 Merge pull request 'master' (#315) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/315
2024-06-11 04:19:35 +00:00
e33a6d5c58 Merge pull request 'fix : 二级页面上加基础信息' (#314) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/314
2024-06-11 04:19:21 +00:00
5e2f9df706 Merge remote-tracking branch 'origin/master' 2024-06-11 12:18:43 +08:00
1009cb7345 fix : 二级页面上加基础信息 2024-06-10 23:28:34 +08:00
e5f80ed017 Merge pull request 'dj' (#313) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/313
2024-06-10 15:01:42 +00:00
050c5cf57a fix : 列表按钮加权限 2024-06-10 23:01:28 +08:00
3e6c82dd19 fix : 修复列表页按钮固定右侧 2024-06-10 22:38:26 +08:00
15a2dda0fa fix : 修复需求征集/汇总权限按钮 2024-06-10 22:36:03 +08:00
9c812af394 fix : 修复详情提交/重新提交功能 2024-06-10 22:34:51 +08:00
3379d851c6 Merge remote-tracking branch 'origin/master' 2024-06-10 22:34:27 +08:00
535d3f680b fix : 优化直接上报时项目归档附件tab展示 2024-06-10 16:19:09 +08:00
2f2dabb82d Merge pull request 'fix : 优化需求汇总详情页面' (#312) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/312
2024-06-10 07:52:38 +00:00
b05d0ff42f fix : 优化需求汇总详情页面 2024-06-10 15:50:26 +08:00
4649ad3abd Merge pull request 'master' (#311) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/311
2024-06-10 07:26:33 +00:00
4a749fc220 Merge pull request 'fix : 修复详情基本信息显示位置、项目验收、结项操作放在详情页面' (#310) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/310
2024-06-10 07:26:03 +00:00
07c089ed29 fix : 修复详情基本信息显示位置、项目验收、结项操作放在详情页面 2024-06-10 15:25:28 +08:00
3483a32d55 Merge pull request 'fix : 修改阶段变更抄送人样式' (#309) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/309
2024-06-09 16:44:41 +00:00
cb224ab437 fix : 修改阶段变更抄送人样式 2024-06-10 00:44:20 +08:00
d8b8c65dfb Merge pull request 'fix : 修复提交按钮旁边的返回页面细节' (#308) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/308
2024-06-09 16:25:25 +00:00
d3fe46f0bc fix : 修复提交按钮旁边的返回页面细节 2024-06-10 00:25:00 +08:00
bf0cb73946 Merge remote-tracking branch 'origin/master' 2024-06-09 23:48:50 +08:00
992eb2b890 fix : 修复分摊金额显示bug 2024-06-09 23:48:42 +08:00
fb52f8b04e Merge pull request 'fix : 修复需求上报接口' (#307) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/307
2024-06-09 14:11:06 +00:00
53e461bc4d fix : 修复需求上报接口 2024-06-09 22:10:52 +08:00
f251c08982 Merge pull request 'fix : 修复项目实施上传费用,查看分摊功能细节' (#306) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/306
2024-06-09 14:03:31 +00:00