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

1183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
251fdf7989 Merge pull request 'fix : 修改打印范围, 详情增加项目实施模块' (#730) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/730
 2024-08-26 12:56:27 +00:00
odjbin
30d1664a9b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/components/steps/index.vue
 2024-08-26 20:56:12 +08:00
odjbin
2173cd1cf1 fix : 修改打印范围, 详情增加项目实施模块 2024-08-26 20:52:54 +08:00
odjbin
9557e8595d Merge pull request 'fix : 修改打印范围' (#728) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/728
 2024-08-26 12:18:47 +00:00
odjbin
bc2c77ff34 fix : 修改打印范围 2024-08-26 20:18:21 +08:00
odjbin
741187c129 Merge pull request 'fix : 修复公司/人员选择框bug' (#726) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/726
 2024-08-19 16:56:37 +00:00
odjbin
8f9d5eb37b fix : 修复公司/人员选择框bug 2024-08-20 00:56:12 +08:00
odjbin
1541482e76 Merge pull request 'fix : 修复用户管理,角色管理提交时, 一直loading的bug' (#724) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/724
 2024-08-18 03:12:56 +00:00
odjbin
ce2d39e3bf fix : 修复用户管理,角色管理提交时, 一直loading的bug 2024-08-18 11:12:26 +08:00
odjbin
6d0a1940fc Merge pull request 'feat : 表格分页时序号连续' (#722) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/722
 2024-08-17 03:25:16 +00:00
odjbin
b6b1c8a3ff feat : 表格分页时序号连续 2024-08-17 11:24:43 +08:00
odjbin
9ecabb8f69 Merge pull request 'fix : 修复人员选择框取消功能' (#720) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/720
 2024-08-17 02:40:59 +00:00
odjbin
09c51f13fc fix : 修复人员选择框取消功能 2024-08-17 10:40:46 +08:00
odjbin
968eebaa2b Merge pull request 'fix : 修复人员取消功能' (#718) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/718
 2024-08-16 16:13:39 +00:00
odjbin
7637608226 fix : 修复人员取消功能 2024-08-17 00:13:17 +08:00
odjbin
26ed532684 Merge pull request 'fix : 优化新增分摊,新增专项资金及详情间距,年度计划详情间距' (#716) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/716
 2024-08-13 15:07:14 +00:00
odjbin
2e101d1017 fix : 优化新增分摊,新增专项资金及详情间距,年度计划详情间距 2024-08-13 23:06:59 +08:00
odjbin
cb2fe73481 Merge pull request 'fix : 修复项目实施/归档上传附件表格高度,完善归档附件/上传附件时的文件预览' (#714) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/714
 2024-08-13 10:03:32 +00:00
odjbin
c1bba811b9 fix : 修复项目实施/归档上传附件表格高度,完善归档附件/上传附件时的文件预览 2024-08-13 18:01:44 +08:00
odjbin
11598c507b Merge pull request 'dd' (#712) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/712
 2024-08-13 09:21:36 +00:00
odjbin
38b6299dbf fix : 修改表格高度,页面左右边距,上传文件不能和标题并排 2024-08-13 17:21:19 +08:00
odjbin
fa054d2a07 fix : 修复需求征集详情排版 2024-08-13 15:42:24 +08:00
odjbin
cafba1e18c Merge pull request 'fix : 修复专项资金详情排版' (#710) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/710
 2024-08-13 07:31:42 +00:00
odjbin
4755849a8c fix : 修复专项资金详情排版 2024-08-13 15:31:32 +08:00
odjbin
ad6509f043 Merge pull request 'fix : 修复新增分摊排版' (#708) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/708
 2024-08-13 05:19:44 +00:00
odjbin
6cf0a0b0da fix : 修复新增分摊排版 2024-08-13 13:19:08 +08:00
odjbin
f7b0461218 Merge pull request 'fix : 修复新增分摊判断' (#706) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/706
 2024-08-12 16:41:45 +00:00
odjbin
42fc5524f3 fix : 修复新增分摊判断 2024-08-13 00:41:04 +08:00
odjbin
10cfe6e6ad Merge pull request 'dd' (#704) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/704
 2024-08-12 15:26:10 +00:00
odjbin
1dd381cc1e fix : 修复角色替换 2024-08-12 23:25:56 +08:00
odjbin
1e02e00000 fix : 修复项目实施-附件标签选项刷新 2024-08-12 22:50:56 +08:00
odjbin
27cb965f3a Merge pull request 'fix : 修复新增专项资金/需求征集排版' (#702) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/702
 2024-08-12 14:37:54 +00:00
odjbin
e643d9ef86 fix : 修复新增专项资金/需求征集排版 2024-08-12 22:37:31 +08:00
odjbin
1da833f451 Merge pull request 'fix : 修复需求上报排版' (#700) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/700
 2024-08-12 13:54:53 +00:00
odjbin
95a2161ab3 fix : 修复需求上报排版 2024-08-12 21:54:39 +08:00
odjbin
a134dfd308 Merge pull request 'fix : 修复需求上报是否专项资金 清除后报错' (#698) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/698
 2024-08-12 07:51:49 +00:00
odjbin
8fade135fe fix : 修复需求上报是否专项资金 清除后报错 2024-08-12 15:51:34 +08:00
odjbin
1bdb1e6739 Merge pull request 'fix : 修复需求上报是否专项资金 清除后报错' (#696) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/696
 2024-08-12 07:30:40 +00:00
odjbin
b497e2117d fix : 修复需求上报是否专项资金 清除后报错 2024-08-12 15:30:26 +08:00
odjbin
ef38b0c18f Merge pull request 'fix : 修复列表页面搜索框排版' (#694) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/694
 2024-08-11 16:04:51 +00:00
odjbin
83af021d33 fix : 修复列表页面搜索框排版 2024-08-12 00:04:31 +08:00
odjbin
2227ceabde Merge pull request 'fix : 费用分摊同项目同人不能多次分摊判断' (#692) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/692
 2024-08-11 14:39:20 +00:00
odjbin
3e3d738362 fix : 费用分摊同项目同人不能多次分摊判断 2024-08-11 22:38:15 +08:00
odjbin
c4ad13b09c Merge pull request 'fix : 下拉框箭头显示' (#690) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/690
 2024-08-11 14:31:28 +00:00
odjbin
48430951ef fix : 下拉框箭头显示 2024-08-11 22:31:14 +08:00
odjbin
420605436c Merge pull request 'fix : 角色替换' (#688) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/688
 2024-08-11 10:38:11 +00:00
odjbin
a1fa0dab6a fix : 角色替换 2024-08-11 18:37:55 +08:00
odjbin
09b1c86ceb Merge pull request 'fix : 征集说明/专项资金介绍换行格式, 需求征集列表页搜索框间距, 切换账号层级, 需求上报4种情况排版' (#686) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/686
 2024-08-10 14:49:09 +00:00
odjbin
3dbaf21281 fix : 征集说明/专项资金介绍换行格式, 需求征集列表页搜索框间距, 切换账号层级, 需求上报4种情况排版 2024-08-10 22:48:46 +08:00
odjbin
433f0bc712 Merge pull request 'fix : 修改页面排版' (#684) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/684
 2024-08-07 15:48:14 +00:00