|
|
d59c9d8cca
|
fix : 详情修改为一个文件上传入口及测试校验,同步移动端详情展示
|
2024-08-28 14:18:55 +08:00 |
|
|
|
8d731ff7c5
|
Merge pull request 'fix : 修改为一个文件上传入口, 阶段变更增加变更状态,修复项目实施显示' (#740) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/740
|
2024-08-27 14:29:12 +00:00 |
|
|
|
50504f4e94
|
fix : 修改为一个文件上传入口, 阶段变更增加变更状态,修复项目实施显示
|
2024-08-27 22:28:52 +08:00 |
|
|
|
5362a47d1e
|
Merge pull request 'fix : 修复项目实施展示' (#738) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/738
|
2024-08-27 02:40:57 +00:00 |
|
|
|
a1a3c0ac9f
|
fix : 修复项目实施展示
|
2024-08-27 10:40:35 +08:00 |
|
|
|
5d44bae1c3
|
Merge pull request 'fix : 修复项目实施序号对齐' (#736) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/736
|
2024-08-26 15:10:17 +00:00 |
|
|
|
4d78debb92
|
fix : 修复项目实施序号对齐
|
2024-08-26 23:10:01 +08:00 |
|
|
|
936f5dbf4c
|
Merge pull request 'fix : 修复项目实施步骤显示' (#734) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/734
|
2024-08-26 14:52:54 +00:00 |
|
|
|
d4e7503306
|
fix : 修复项目实施步骤显示
|
2024-08-26 22:52:37 +08:00 |
|
|
|
d1a20fbad1
|
Merge pull request 'fix : 修复人员选择/公司选择bug' (#732) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/732
|
2024-08-26 14:14:06 +00:00 |
|
|
|
6e8f2328c6
|
fix : 修复人员选择/公司选择bug
|
2024-08-26 22:13:06 +08:00 |
|
|
|
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 |
|
|
|
30d1664a9b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/components/steps/index.vue
|
2024-08-26 20:56:12 +08:00 |
|
|
|
2173cd1cf1
|
fix : 修改打印范围, 详情增加项目实施模块
|
2024-08-26 20:52:54 +08:00 |
|
|
|
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 |
|
|
|
bc2c77ff34
|
fix : 修改打印范围
|
2024-08-26 20:18:21 +08:00 |
|
|
|
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 |
|
|
|
8f9d5eb37b
|
fix : 修复公司/人员选择框bug
|
2024-08-20 00:56:12 +08:00 |
|
|
|
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 |
|
|
|
ce2d39e3bf
|
fix : 修复用户管理,角色管理提交时, 一直loading的bug
|
2024-08-18 11:12:26 +08:00 |
|
|
|
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 |
|
|
|
b6b1c8a3ff
|
feat : 表格分页时序号连续
|
2024-08-17 11:24:43 +08:00 |
|
|
|
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 |
|
|
|
09c51f13fc
|
fix : 修复人员选择框取消功能
|
2024-08-17 10:40:46 +08:00 |
|
|
|
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 |
|
|
|
7637608226
|
fix : 修复人员取消功能
|
2024-08-17 00:13:17 +08:00 |
|
|
|
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 |
|
|
|
2e101d1017
|
fix : 优化新增分摊,新增专项资金及详情间距,年度计划详情间距
|
2024-08-13 23:06:59 +08:00 |
|
|
|
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 |
|
|
|
c1bba811b9
|
fix : 修复项目实施/归档上传附件表格高度,完善归档附件/上传附件时的文件预览
|
2024-08-13 18:01:44 +08:00 |
|
|
|
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 |
|
|
|
38b6299dbf
|
fix : 修改表格高度,页面左右边距,上传文件不能和标题并排
|
2024-08-13 17:21:19 +08:00 |
|
|
|
fa054d2a07
|
fix : 修复需求征集详情排版
|
2024-08-13 15:42:24 +08:00 |
|
|
|
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 |
|
|
|
4755849a8c
|
fix : 修复专项资金详情排版
|
2024-08-13 15:31:32 +08:00 |
|
|
|
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 |
|
|
|
6cf0a0b0da
|
fix : 修复新增分摊排版
|
2024-08-13 13:19:08 +08:00 |
|
|
|
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 |
|
|
|
42fc5524f3
|
fix : 修复新增分摊判断
|
2024-08-13 00:41:04 +08:00 |
|
|
|
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 |
|
|
|
1dd381cc1e
|
fix : 修复角色替换
|
2024-08-12 23:25:56 +08:00 |
|
|
|
1e02e00000
|
fix : 修复项目实施-附件标签选项刷新
|
2024-08-12 22:50:56 +08:00 |
|
|
|
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 |
|
|
|
e643d9ef86
|
fix : 修复新增专项资金/需求征集排版
|
2024-08-12 22:37:31 +08:00 |
|
|
|
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 |
|
|
|
95a2161ab3
|
fix : 修复需求上报排版
|
2024-08-12 21:54:39 +08:00 |
|
|
|
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 |
|
|
|
8fade135fe
|
fix : 修复需求上报是否专项资金 清除后报错
|
2024-08-12 15:51:34 +08:00 |
|
|
|
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 |
|
|
|
b497e2117d
|
fix : 修复需求上报是否专项资金 清除后报错
|
2024-08-12 15:30:26 +08:00 |
|