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

746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
a795fa5786 Merge pull request 'master' (#354) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/354
 2024-06-18 12:43:42 +00:00
odjbin
a678420f4f Merge pull request 'fix : 修改征集类型为字典、直接上报时详情专项资金回显、项目归档-需求征集文件回显、重大项目前置流程必填' (#353) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/353
 2024-06-18 12:43:17 +00:00
odjbin
5100281c1f fix : 修改征集类型为字典、直接上报时详情专项资金回显、项目归档-需求征集文件回显、重大项目前置流程必填 2024-06-18 20:43:02 +08:00
odjbin
3a79c85033 Merge pull request 'fix : 修复所属公司选择框右侧的删除功能' (#352) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/352
 2024-06-18 08:45:40 +00:00
odjbin
df513a91fe fix : 修复所属公司选择框右侧的删除功能 2024-06-18 16:45:19 +08:00
wenhua
6fcb68d929 Merge pull request 'fix: 多标签页bug' (#351) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/351
 2024-06-18 08:10:35 +00:00
lilinyuan
506c794c5d fix: 多标签页bug 2024-06-18 16:09:21 +08:00
odjbin
9cf7396fb8 Merge pull request 'master' (#350) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/350
 2024-06-17 03:48:08 +00:00
odjbin
1c908017bb Merge pull request 'fix : 修复上传费用输入框垂直居中、台账时间搜索' (#349) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/349
 2024-06-17 03:40:03 +00:00
odjbin
9cbe89007d fix : 修复上传费用输入框垂直居中、台账时间搜索 2024-06-17 11:39:34 +08:00
odjbin
891cebec90 Merge pull request 'master' (#348) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/348
 2024-06-17 03:22:45 +00:00
odjbin
132ab60d0f Merge pull request 'fix : 修复新增费用分摊输入框垂直居中' (#347) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/347
 2024-06-16 13:41:33 +00:00
odjbin
0c36801e83 fix : 修复新增费用分摊输入框垂直居中 2024-06-16 21:41:20 +08:00
odjbin
f187e7c5b1 Merge pull request 'fix : 修复费用分摊时间搜索' (#346) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/346
 2024-06-16 13:08:13 +00:00
odjbin
b162bb8977 fix : 修复费用分摊时间搜索 2024-06-16 21:08:04 +08:00
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