Commit Graph

475 Commits

Author SHA1 Message Date
9be3d7096a Merge pull request 'fix : 修复菜单图标、金额单位为元、项目实施台账上传费用功能、' (#268) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/268
2024-06-02 03:05:08 +00:00
cd715fbf98 fix : 修复菜单图标、金额单位为元、项目实施台账上传费用功能、 2024-06-02 11:04:54 +08:00
lilinyuan
a796e7622f Merge branch 'master' of http://git.feashow.cn/clay/mosr-web 2024-06-01 23:15:39 +08:00
lilinyuan
e2d6722ec6 fix: 修复bug 2024-06-01 23:15:37 +08:00
13386303e8 Merge pull request 'fix : 修复细节' (#265) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/265
2024-06-01 14:54:37 +00:00
c4db5d6719 fix : 修复细节 2024-06-01 22:54:23 +08:00
clay
495e39c802 feat : 表单权限处理 2024-06-01 22:18:57 +08:00
dd5d24768b Merge pull request 'fix : 修复附件上传' (#263) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/263
2024-06-01 14:18:22 +00:00
3746a19063 fix : 修复附件上传 2024-06-01 22:17:46 +08:00
lilinyuan
9acd05a2cc fix: 修复角色页面跳转bug 2024-06-01 20:49:27 +08:00
d7a4eef7db Merge pull request 'fix : 修复申请文件校验' (#262) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/262
2024-06-01 12:34:25 +00:00
346ad4c4df fix : 修复申请文件校验 2024-06-01 20:33:28 +08:00
5d570f3108 Merge pull request 'dj' (#261) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/261
2024-06-01 11:25:22 +00:00
4a0b3db4e4 fix : 修复新增流程数据重置 2024-06-01 19:25:04 +08:00
bc27a83848 fix : 修复项目归档五个附件上传功能 2024-06-01 19:05:11 +08:00
dd046f645f fix : 修复项目归档五个附件上传功能、提示框、文件多选上传、详情驳回/同意路由跳转问题 2024-06-01 18:30:11 +08:00
04a7ba8802 Merge remote-tracking branch 'origin/master' 2024-06-01 17:33:22 +08:00
lilinyuan
b0199c8fd9 fix: 部分权限标识, 修复部门编辑bug 2024-06-01 17:03:43 +08:00
lilinyuan
d2f9bfcb33 fix: 项目管理详情查询为空的时候关闭loading 2024-06-01 16:24:40 +08:00
lilinyuan
6391ab458b feat: 退出时多标签页全部清空 2024-06-01 16:07:57 +08:00
e1f6652672 Merge remote-tracking branch 'origin/master' 2024-06-01 15:57:32 +08:00
lilinyuan
4d1ba82696 Merge branch 'master' of http://git.feashow.cn/clay/mosr-web 2024-06-01 15:57:11 +08:00
lilinyuan
de2475f39a feat: 部门详情, 编辑 2024-06-01 15:57:07 +08:00
80ecad0864 fix : 修复需求征集界面样式及提示 2024-06-01 14:36:03 +08:00
fa94f9e78d Merge pull request 'fix : 修复项目实施附件查询功能及上传附件页面初始' (#260) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/260
2024-06-01 05:34:32 +00:00
7501c37379 fix : 修复项目实施附件查询功能及上传附件页面初始 2024-06-01 13:34:12 +08:00
f776f994ab Merge pull request 'dj' (#259) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/259
2024-05-31 16:46:19 +00:00
daf5ffe2c9 fix : 修复项目实施附件查询及上传功能 2024-06-01 00:46:00 +08:00
f4ad871831 fix : 修改详情页数据回显问题及简化代码 2024-06-01 00:45:13 +08:00
lilinyuan
5be806104f fix: 修复退出登录再次登录菜单不刷新问题 2024-05-31 21:49:43 +08:00
7ec6cba0f0 Merge pull request 'fix : 修复页面细节' (#258) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/258
2024-05-31 13:05:09 +00:00
14abf64e5d fix : 修复页面细节 2024-05-31 21:04:54 +08:00
661bc2e397 Merge pull request 'dj' (#257) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/257
2024-05-31 12:57:30 +00:00
2246fcb621 fix : 修复页面细节 2024-05-31 20:57:17 +08:00
5ae8e4be78 fix : 修复页面细节 2024-05-31 20:56:58 +08:00
clay
5a1e1848cb fix : 字典为空死循环bug 2024-05-31 11:23:34 +08:00
3f9b7f9011 Merge pull request 'fix : 修复页面细节' (#254) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/254
2024-05-30 14:53:44 +00:00
f47180dfbe fix : 修复页面细节 2024-05-30 22:53:33 +08:00
2e7e55464d Merge pull request 'fix : 修复页面细节' (#252) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/252
2024-05-30 14:51:22 +00:00
7791648837 fix : 修复页面细节 2024-05-30 22:51:06 +08:00
clay
92e935622a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/views/project-demand/requirement/add.vue
2024-05-30 22:32:41 +08:00
clay
ee890c0e80 feat : 表单权限处理 2024-05-30 22:31:47 +08:00
e39d953385 Merge pull request 'fix : 修复页面细节' (#249) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/249
2024-05-30 12:06:55 +00:00
8c6da666d5 fix : 修复页面细节 2024-05-30 20:04:57 +08:00
29a019b32a Merge pull request 'fix : 修复页面细节' (#247) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/247
2024-05-30 09:48:57 +00:00
8bc9a27ccf fix : 修复页面细节 2024-05-30 17:48:36 +08:00
ed988b99b3 Merge pull request 'fix : 修复上传费用校验问题' (#246) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/246
2024-05-30 09:29:20 +00:00
c799c97643 fix : 修复上传费用校验问题 2024-05-30 17:29:05 +08:00
f9064ddeb4 Merge pull request 'dj' (#245) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/245
2024-05-30 08:49:38 +00:00
0c1e566578 fix : 修复项目附件页面细节 2024-05-30 16:46:51 +08:00