Commit Graph

1330 Commits

Author SHA1 Message Date
e527deabd5 fix : 首页备份 2024-09-18 22:30:39 +08:00
6800117ed4 Merge pull request 'de' (#773) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/773
2024-09-18 14:26:07 +00:00
ae31f68586 fix : 修复专项资金驳回弹窗高度 2024-09-18 22:24:41 +08:00
4568101f06 fix : 首页板块响应式优化 2024-09-12 23:26:38 +08:00
5bfa2a0243 Merge pull request 'fix : 首页细节样式优化' (#771) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/771
2024-09-12 15:16:02 +00:00
68fa803016 fix : 首页细节样式优化 2024-09-12 23:15:47 +08:00
adbfc42015 Merge pull request 'fix : 首页细节样式优化' (#769) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/769
2024-09-12 14:57:16 +00:00
0c26f2245e fix : 首页细节样式优化 2024-09-12 22:56:57 +08:00
01029195fb Merge pull request 'fix : 修复首页待立项等区域显示' (#767) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/767
2024-09-12 14:33:39 +00:00
68897bbabf fix : 修复首页待立项等区域显示 2024-09-12 22:33:16 +08:00
ac22684d69 Merge pull request 'de' (#765) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/765
2024-09-12 13:55:59 +00:00
fa977c5134 fix : 修复首页待立项等区域点击跳转 2024-09-12 21:55:38 +08:00
21cc38ed73 fix : 修改饼图间隔 2024-09-12 21:40:51 +08:00
258e340752 Merge pull request 'feat : 研发投入资金饼图' (#763) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/763
2024-09-12 13:29:13 +00:00
96378e161f feat : 研发投入资金饼图 2024-09-12 21:28:55 +08:00
2e3089e6b1 Merge pull request 'feat : 专项资金饼图' (#761) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/761
2024-09-11 18:34:45 +00:00
b5a1c76fad feat : 专项资金饼图 2024-09-12 02:34:27 +08:00
3fb35e085c Merge pull request 'feat : 首页' (#759) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/759
2024-09-11 16:48:51 +00:00
f2b1cad505 feat : 首页 2024-09-12 00:48:34 +08:00
87d4633b18 Merge pull request 'fix : 移除多余的>' (#757) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/757
2024-09-10 05:16:11 +00:00
2fdbc144a6 fix : 移除多余的> 2024-09-10 13:15:49 +08:00
e52efa0a45 Merge pull request 'fix : 修复上传两个文件之后删除一个文件报错问题,分摊研发人员clearable, 修复表格更新项目时间展示问题' (#755) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/755
2024-09-08 12:51:24 +00:00
3c6a8bedc2 fix : 修复上传两个文件之后删除一个文件报错问题,分摊研发人员clearable, 修复表格更新项目时间展示问题 2024-09-08 20:51:11 +08:00
a9cfa60b36 Merge pull request 'fix : 修复用户切换时,报错提示' (#753) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/753
2024-09-08 11:39:13 +00:00
09cef9de33 fix : 修复用户切换时,报错提示 2024-09-08 19:38:34 +08:00
8274f9f186 Merge pull request 'fix : 修复文件不能预览时的提示' (#751) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/751
2024-09-07 10:23:07 +00:00
b90d3bc466 fix : 修复文件不能预览时的提示 2024-09-07 18:22:54 +08:00
e99d217d34 Merge pull request 'fix : 修复金额千位格式化,新增征集时添加"新增专项资金"按钮' (#749) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/749
2024-09-07 07:10:25 +00:00
fc41bd8e6d fix : 修复金额千位格式化,新增征集时添加"新增专项资金"按钮 2024-09-07 15:09:37 +08:00
cff3198dcd Merge pull request 'fix : 修复项目实施-归档列表页附件项目实施/验收展示及上传附件功能,修复需求上报资金名称传参' (#747) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/747
2024-08-28 14:57:33 +00:00
d4d7601bae fix : 修复项目实施-归档列表页附件项目实施/验收展示及上传附件功能,修复需求上报资金名称传参 2024-08-28 22:57:08 +08:00
1ce0bf708b Merge pull request 'fix : 修复人员选择框取消功能' (#745) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/745
2024-08-28 09:31:04 +00:00
060f6e0fd8 fix : 修复人员选择框取消功能 2024-08-28 17:30:45 +08:00
4d5f163f17 Merge pull request 'fix : 修复费用分摊新增输入框宽度显示' (#743) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/743
2024-08-28 06:31:09 +00:00
f4a1e3e932 fix : 修复费用分摊新增输入框宽度显示 2024-08-28 14:30:49 +08:00
43211d6f0c Merge pull request 'fix : 详情修改为一个文件上传入口及测试校验,同步移动端详情展示' (#741) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/741
2024-08-28 06:19:15 +00:00
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