Commit Graph

532 Commits

Author SHA1 Message Date
0adb104c46 Merge pull request 'fix : 修改专项资金' (#295) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/295
2024-06-06 14:59:03 +00:00
54e7b81f1e fix : 修改专项资金 2024-06-06 22:58:50 +08:00
d9d3a7f02a Merge pull request 'dj' (#293) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/293
2024-06-06 14:21:30 +00:00
e1a7b46b35 fix : 修改分摊汇总bug 2024-06-06 22:13:14 +08:00
4ddd53cec7 fix : 修改需求征集征集说明输入框 2024-06-06 21:52:33 +08:00
a8921a0683 fix : 修复需求上报数字输入框和人员选择器优化 2024-06-06 21:44:43 +08:00
6a0c3570f6 fix : 修复需求上报的专项资金显示问题 2024-06-06 19:50:46 +08:00
781b4cfb96 Merge pull request 'fix : 修复分摊汇总及编辑功能' (#291) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/291
2024-06-06 05:36:20 +00:00
53ecadf315 fix : 修复分摊汇总及编辑功能 2024-06-06 13:36:07 +08:00
18806f13e4 Merge pull request 'dj' (#289) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/289
2024-06-05 18:01:52 +00:00
031a08e65c fix : 修复分摊汇总及编辑功能 2024-06-06 02:01:36 +08:00
ec4c61d758 fix : 修复费用分摊详情渲染数据问题 2024-06-06 01:15:12 +08:00
aa9d7d9028 Merge pull request 'fix : 修复细节' (#287) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/287
2024-06-05 14:57:14 +00:00
1c204b39df fix : 修复细节 2024-06-05 22:57:04 +08:00
0685143b3a Merge pull request 'dj' (#285) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/285
2024-06-05 14:10:46 +00:00
2e86683f41 fix : 修复新增分摊表格数据校验及矩阵审批加箭头 2024-06-05 22:03:49 +08:00
ca64562059 fix : 修复项目归档中附件上传问题 2024-06-05 11:40:31 +08:00
d676868cf7 fix : 修复首页点击阶段变更的查看跳转问题 2024-06-05 11:05:47 +08:00
80d84c4a85 fix : 修复首页点击费用分摊的查看跳转问题 2024-06-05 11:01:41 +08:00
71b2b372b1 Merge pull request 'fix : 修复审核意见位置' (#284) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/284
2024-06-04 16:51:52 +00:00
a7d91a8f32 fix : 修复审核意见位置 2024-06-05 00:51:27 +08:00
e513af4983 Merge pull request 'fix : 修复阶段变更详情页面细节' (#282) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/282
2024-06-04 10:43:23 +00:00
df6f49caeb fix : 修复阶段变更详情页面细节 2024-06-04 18:43:01 +08:00
3e2249431b Merge pull request 'dj' (#280) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/280
2024-06-04 10:23:55 +00:00
b9d33bd6e4 fix : 修复阶段变更/详情/编辑功能 2024-06-04 18:23:42 +08:00
8f1cc442ac fix : 修复项目立项上传文件bug 2024-06-04 17:10:32 +08:00
cc2babcd32 Merge pull request 'dj' (#279) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/279
2024-06-04 08:43:00 +00:00
8b5868fde6 fix : 优化需求征集详情页面 2024-06-04 16:42:00 +08:00
1d66c44edb fix : 优化需求征集详情页面 2024-06-04 16:41:28 +08:00
6597506435 Merge remote-tracking branch 'origin/master' 2024-06-04 10:36:31 +08:00
00a2b7a3af fix : 修复项目验收其他文件上传bug 2024-06-03 21:56:20 +08:00
63a6f9b85e fix : 修复新增台账功能 2024-06-03 16:48:00 +08:00
abd060b530 fix : 修复项目实施查看分摊功能 2024-06-03 15:53:21 +08:00
d1eb5c3327 Merge pull request 'fix : 修复项目实施附件查询及上传功能、代码文件优化' (#278) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/278
2024-06-03 07:39:38 +00:00
abe80eafdc fix : 修复项目实施附件查询及上传功能、代码文件优化 2024-06-03 15:39:22 +08:00
1ee92f698e Merge pull request 'fix : 项目归档附件查询功能优化' (#276) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/276
2024-06-02 15:17:16 +00:00
747b40f9ba fix : 项目归档附件查询功能优化 2024-06-02 23:17:06 +08:00
clay
83fd1b37e2 Merge remote-tracking branch 'origin/master' 2024-06-02 22:36:09 +08:00
clay
f6ada88026 feat : 附件处理 2024-06-02 22:36:02 +08:00
2a0e193374 Merge pull request 'fix : 文件权限处理' (#275) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/275
2024-06-02 14:23:39 +00:00
e0b5487951 fix : 文件权限处理 2024-06-02 22:23:19 +08:00
f20318843e Merge pull request 'fix : 修复直接上报的详情组件渲染' (#274) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/274
2024-06-02 14:22:15 +00:00
456f2284e9 fix : 修复直接上报的详情组件渲染 2024-06-02 22:22:06 +08:00
fb64361c64 Merge pull request 'fix : 修复细节' (#273) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/273
2024-06-02 11:42:44 +00:00
6bb97b4a1d fix : 修复细节 2024-06-02 19:42:33 +08:00
clay
9ad29c3a13 feat : 文件组件抽象封装 2024-06-02 19:37:20 +08:00
clay
20fbd0e2d4 feat : 需求上报详情删除 2024-06-02 18:23:32 +08:00
clay
eebb3003c7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/views/project-demand/requirement/detail.vue
2024-06-02 17:39:20 +08:00
clay
3ed5068dee feat : 需求上报fileLie 权限控制 2024-06-02 17:37:53 +08:00
918a02b201 Merge pull request 'fix : 修复获取流程接口的提示框' (#272) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/272
2024-06-02 08:54:58 +00:00