Commit Graph

623 Commits

Author SHA1 Message Date
75664822e4 Merge pull request 'fix : 修复项目费用显示bug' (#344) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/344
2024-06-16 12:35:12 +00:00
009d73ce86 fix : 修复项目费用显示bug 2024-06-16 20:34:46 +08:00
33a90e59f6 Merge pull request 'fix : 修改所属公司选择框bug' (#342) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/342
2024-06-16 11:50:30 +00:00
63107ece02 fix : 修改所属公司选择框bug 2024-06-16 19:50:17 +08:00
a75c2dd0fa Merge pull request 'fix : 流程图位置更换' (#341) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/341
2024-06-16 11:36:30 +00:00
d1a8077eea fix : 流程图位置更换 2024-06-16 19:34:08 +08:00
46e67f30a0 Merge pull request 'dj' (#339) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/339
2024-06-16 10:07:18 +00:00
7ffb689927 fix : 修复所属公司选择框 2024-06-16 18:06:53 +08:00
79171758f5 fix : 修复需求汇总重新提交专项资金参数回传 2024-06-16 15:41:38 +08:00
61a999758e fix : 修复默认矩阵审批 2024-06-15 18:02:32 +08:00
f624b4d290 Merge pull request 'fix : 修复公司选择框全选功能' (#337) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/337
2024-06-14 16:47:29 +00:00
9153c20902 fix : 修复公司选择框全选功能 2024-06-15 00:47:17 +08:00
5fdcf42336 Merge pull request 'fix : 修复阶段变更中抄送人员回显' (#335) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/335
2024-06-14 15:26:51 +00:00
73313a1532 fix : 修复阶段变更中抄送人员回显 2024-06-14 23:26:38 +08:00
21cfe73a13 Merge pull request 'fix : 修复新增需求征集所属公司选择弹框' (#333) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/333
2024-06-14 15:18:10 +00:00
532ef440ce fix : 修复新增需求征集所属公司选择弹框 2024-06-14 23:17:32 +08:00
2ff0dbd2a4 Merge pull request 'fix : 修复项目实施台账字典问题' (#331) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/331
2024-06-14 06:01:59 +00:00
58cbceb747 fix : 修复项目实施台账字典问题 2024-06-14 14:01:41 +08: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
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
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
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
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
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
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
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
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