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

731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
2206e2aa21 Merge pull request 'master' (#345) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/345
 2024-06-16 12:35:37 +00:00
odjbin
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
odjbin
009d73ce86 fix : 修复项目费用显示bug 2024-06-16 20:34:46 +08:00
odjbin
ba4e927ff5 Merge pull request 'master' (#343) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/343
 2024-06-16 11:50:40 +00:00
odjbin
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
odjbin
63107ece02 fix : 修改所属公司选择框bug 2024-06-16 19:50:17 +08:00
odjbin
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
odjbin
d1a8077eea fix : 流程图位置更换 2024-06-16 19:34:08 +08:00
odjbin
fa366d18e5 Merge pull request 'master' (#340) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/340
 2024-06-16 10:07:34 +00:00
odjbin
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
odjbin
7ffb689927 fix : 修复所属公司选择框 2024-06-16 18:06:53 +08:00
odjbin
79171758f5 fix : 修复需求汇总重新提交专项资金参数回传 2024-06-16 15:41:38 +08:00
odjbin
61a999758e fix : 修复默认矩阵审批 2024-06-15 18:02:32 +08:00
odjbin
31ff2a4502 Merge pull request 'master' (#338) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/338
 2024-06-14 16:47:38 +00:00
odjbin
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
odjbin
9153c20902 fix : 修复公司选择框全选功能 2024-06-15 00:47:17 +08:00
odjbin
4d312a8892 Merge pull request 'master' (#336) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/336
 2024-06-14 15:27:00 +00:00
odjbin
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
odjbin
73313a1532 fix : 修复阶段变更中抄送人员回显 2024-06-14 23:26:38 +08:00
odjbin
fc09c1db05 Merge pull request 'master' (#334) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/334
 2024-06-14 15:18:20 +00:00
odjbin
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
odjbin
532ef440ce fix : 修复新增需求征集所属公司选择弹框 2024-06-14 23:17:32 +08:00
odjbin
62983eea10 Merge pull request 'master' (#332) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/332
 2024-06-14 06:02:16 +00:00
odjbin
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
odjbin
58cbceb747 fix : 修复项目实施台账字典问题 2024-06-14 14:01:41 +08:00
odjbin
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
odjbin
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
odjbin
f240016e44 fix : 修复费用分摊复制功能、数字框默认值为null、项目归档显示是哪个流程的上传附件 2024-06-14 13:04:37 +08:00
odjbin
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
odjbin
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
odjbin
3db0f3bd5b fix : 修复细节 2024-06-11 21:14:09 +08:00
odjbin
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
odjbin
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
odjbin
90a26f2e1e fix : 修复新增需求细节 2024-06-11 21:05:31 +08:00
odjbin
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
odjbin
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
odjbin
e64b7fe0ae fix : 修复新增需求细节 2024-06-11 20:58:47 +08:00
odjbin
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
odjbin
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
odjbin
a2977d0702 fix : 屏蔽导出修复角色权限 2024-06-11 20:56:22 +08:00
odjbin
78ab1ddc45 fix : 屏蔽导出 2024-06-11 20:32:20 +08:00
odjbin
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
odjbin
208584c34b fix : 修复流程图切换功能和屏蔽导出 2024-06-11 20:14:49 +08:00
odjbin
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
odjbin
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
odjbin
b425e709aa fix : 修复流程图切换功能及修改"研发阶段"文字为项目阶段 2024-06-11 19:16:35 +08:00
odjbin
3f7de153da fix : 修复项目立项/验收前置流程展示及系统部分页面分页bug 2024-06-11 18:47:35 +08:00
odjbin
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
odjbin
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
odjbin
ab83724056 fix : 修复详情页切换流程图渲染bug 2024-06-11 15:42:01 +08:00