zhangkaihuai
4371ccb5e7
更新 .drone.yml
2025-06-14 15:25:22 +00:00
zhangkaihuai
f9ef5c7087
更新 .drone.yml
2025-06-14 15:20:57 +00:00
zhangkaihuai
f42eacd06e
更新 .drone.yml
2025-06-14 14:56:50 +00:00
861a6489c7
Merge pull request 'test : ci/cd' ( #1080 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1080
2025-06-14 11:26:25 +00:00
9133f7a7e3
test : ci/cd
2025-06-14 19:26:13 +08:00
e9be87990c
Merge pull request '3' ( #1079 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1079
2025-06-14 11:10:24 +00:00
ec8db3c199
test : ci/cd
2025-06-14 19:09:36 +08:00
d2520336cb
Merge pull request 'test : ci/cd' ( #1078 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1078
2025-06-14 10:59:38 +00:00
e97db1a70d
test : ci/cd
2025-06-14 18:59:25 +08:00
afd27e38b5
Merge pull request 'test : ci/cd' ( #1077 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1077
2025-06-14 10:50:02 +00:00
7dd5120133
test : ci/cd
2025-06-14 18:49:22 +08:00
75da0633e5
Merge pull request 'test : ci/cd' ( #1076 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1076
2025-06-14 10:43:23 +00:00
41b498066f
test : ci/cd
2025-06-14 18:43:10 +08:00
c852448089
Merge pull request 'test : ci/cd' ( #1075 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1075
2025-06-14 10:40:34 +00:00
9cd744d44e
test : ci/cd
2025-06-14 18:40:23 +08:00
a7917137c9
Merge pull request 'test : ci/cd' ( #1074 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1074
2025-06-14 10:30:29 +00:00
85346fa343
test : ci/cd
2025-06-14 18:30:04 +08:00
e5b205870d
Merge pull request 'test : ci/cd' ( #1073 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1073
2025-06-14 10:26:12 +00:00
5ae66763e1
test : ci/cd
2025-06-14 18:26:02 +08:00
9221d27960
Merge pull request 'test : ci/cd' ( #1072 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1072
2025-06-14 10:23:34 +00:00
c442b9b2fd
test : ci/cd
2025-06-14 18:23:25 +08:00
25c94284ca
Merge pull request 'test : ci/cd' ( #1071 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1071
2025-06-14 10:18:34 +00:00
5da74960f2
test : ci/cd
2025-06-14 18:18:22 +08:00
cdcb76d009
Merge pull request 'test : ci/cd' ( #1070 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1070
2025-06-14 10:14:51 +00:00
c87b5c57a6
test : ci/cd
2025-06-14 18:14:39 +08:00
fd0d70072b
Merge pull request '4' ( #1069 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1069
2025-06-14 09:39:44 +00:00
747f675cfc
test : ci/cd
2025-06-14 17:39:30 +08:00
941b06ab8b
Merge pull request 'test : ci/cd' ( #1068 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1068
2025-06-14 09:35:23 +00:00
3e6f86abfd
test : ci/cd
2025-06-14 17:35:12 +08:00
01ccc1ddcd
Merge pull request '12' ( #1067 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1067
2025-06-14 08:56:34 +00:00
b6ac47e88b
test : ci/cd
2025-06-14 16:56:18 +08:00
707486c69d
Merge pull request 'test : ci/cd' ( #1066 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1066
2025-06-14 08:50:34 +00:00
2ef726b95b
test : ci/cd
2025-06-14 16:50:17 +08:00
697af99240
Merge pull request 'test : ci/cd' ( #1065 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1065
2025-06-14 08:46:41 +00:00
ee2f7a9162
test : ci/cd
2025-06-14 16:45:18 +08:00
476f6a794d
Merge pull request 'test : ci/cd' ( #1064 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1064
2025-06-14 08:40:58 +00:00
0c53ee8392
test : ci/cd
2025-06-14 16:40:48 +08:00
4c1e892d35
Merge pull request 'test : ci/cd' ( #1063 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1063
2025-06-14 08:37:07 +00:00
ac6d7863da
test : ci/cd
2025-06-14 16:36:56 +08:00
ea33ffb60a
Merge pull request 'test : ci/cd' ( #1062 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1062
2025-06-14 08:31:16 +00:00
a1ae39cbd7
test : ci/cd
2025-06-14 16:31:03 +08:00
0ada78f180
Merge pull request 'test : ci/cd' ( #1061 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1061
2025-06-14 08:29:25 +00:00
60e29aca8d
test : ci/cd
2025-06-14 16:29:03 +08:00
3db2901a03
Merge pull request 'test : ci/cd' ( #1060 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1060
2025-06-14 08:25:50 +00:00
7428fe43d4
test : ci/cd
2025-06-14 16:25:38 +08:00
18592571a4
Merge pull request 'test : ci/cd' ( #1059 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1059
2025-06-14 07:44:49 +00:00
4bb03409f4
test : ci/cd
2025-06-14 15:42:17 +08:00
7fec9c5735
Merge pull request 'test : ci/cd 2' ( #1058 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1058
2025-06-14 07:26:53 +00:00
3d9f22d503
test : ci/cd 2
2025-06-14 15:26:40 +08:00
76c9a38718
Merge pull request 'test : ci/cd1' ( #1057 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1057
2025-06-14 07:21:25 +00:00
af7d0ac580
test : ci/cd1
2025-06-14 15:21:14 +08:00
4888a7e077
Merge pull request 'test : ci/cd' ( #1056 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1056
2025-06-14 07:18:38 +00:00
47a2f61036
test : ci/cd
2025-06-14 15:18:22 +08:00
f26e40df90
Merge pull request 'master' ( #1055 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1055
2025-06-14 07:13:11 +00:00
07103258f7
test : ci/cd
2025-06-14 15:12:49 +08:00
8fa0d72cc4
test : ci/cd
2025-06-14 15:09:17 +08:00
7684444e93
Merge pull request 'test : ci/cd' ( #1054 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1054
2025-06-14 07:05:25 +00:00
81446971e5
test : ci/cd
2025-06-14 15:04:38 +08:00
5930a2c4b6
Merge pull request 'test : ci/cd' ( #1053 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1053
2025-06-14 06:57:14 +00:00
052c0090e3
test : ci/cd
2025-06-14 14:56:46 +08:00
d24892141a
Merge pull request 'test : ci/cd' ( #1052 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1052
2025-06-14 06:43:28 +00:00
83dc28630b
test : ci/cd
2025-06-14 14:43:10 +08:00
086fdb36e9
Merge pull request 'test : ci/cd' ( #1051 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1051
2025-06-14 06:35:32 +00:00
ba4c4fccdd
test : ci/cd
2025-06-14 14:35:18 +08:00
bc79cfc0bc
Merge pull request 'test : ci/cd' ( #1050 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1050
2025-06-14 06:17:25 +00:00
35d4d1b7ba
test : ci/cd
2025-06-14 14:17:14 +08:00
71324efd0c
Merge pull request 'test : 测试ci/cd-5' ( #1049 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1049
2025-06-13 10:23:30 +00:00
781e7393e8
test : 测试ci/cd-5
2025-06-13 18:22:50 +08:00
1eea7a377c
Merge pull request 'test : 测试ci/cd-4' ( #1048 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1048
2025-06-13 10:17:23 +00:00
065eb6cfba
test : 测试ci/cd-4
2025-06-13 18:17:01 +08:00
35a2f755a2
Merge pull request 'test : 测试ci/cd-3' ( #1047 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1047
2025-06-13 10:10:41 +00:00
9bd9cda872
test : 测试ci/cd-3
2025-06-13 18:10:24 +08:00
dd6181880a
Merge pull request 'test : 测试ci/cd-2' ( #1046 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1046
2025-06-13 09:59:51 +00:00
cd2bfe8817
test : 测试ci/cd-2
2025-06-13 17:59:33 +08:00
8b6406c4e0
Merge pull request 'test : 测试ci/cd-1' ( #1045 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1045
2025-06-13 09:50:39 +00:00
fa3171fecd
test : 测试ci/cd-1
2025-06-13 17:50:21 +08:00
177ccee058
Merge pull request 'test : 测试ci/cd' ( #1044 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1044
2025-06-13 06:57:28 +00:00
28de3667f5
test : 测试ci/cd
2025-06-13 14:57:15 +08:00
05a5385d87
Merge pull request 'test : 测试ci/cd' ( #1043 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1043
2025-06-13 06:39:59 +00:00
529f482bc7
test : 测试ci/cd
2025-06-13 14:39:23 +08:00
20fb592584
Merge pull request 'test : 测试ci/cd' ( #1042 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1042
2025-06-13 06:23:55 +00:00
bd35243cbd
test : 测试ci/cd
2025-06-13 14:23:37 +08:00
d7ca84a4a0
Merge pull request 'master' ( #1041 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1041
2025-06-13 06:19:11 +00:00
6c7eddcf94
Merge pull request 'test : 测试ci/cd' ( #1040 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1040
2025-06-13 06:18:59 +00:00
3588257f61
revert 215f7c6bbf
...
revert feat(expense-management): 添加研发工时超过21.75天的提示功能
- 在保存分配明细时,增加对研发人员总工时的计算
- 如果总工时超过21.75天,系统将发出警告通知- 优化了控制台日志输出,便于调试和监控
2025-06-13 06:18:21 +00:00
6c47337318
Merge pull request 'revert 215f7c6bbf084b0bf6dbee1303a2539a3c21c3ad' ( #1039 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1039
2025-06-13 06:14:59 +00:00
bacd397294
revert 215f7c6bbf
...
revert feat(expense-management): 添加研发工时超过21.75天的提示功能
- 在保存分配明细时,增加对研发人员总工时的计算
- 如果总工时超过21.75天,系统将发出警告通知- 优化了控制台日志输出,便于调试和监控
2025-06-13 06:14:19 +00:00
b3dbb24bb2
test : 测试ci/cd
2025-06-13 14:11:25 +08:00
9e194f5f04
Merge pull request 'test : 测试ci/cd' ( #1038 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1038
2025-06-12 07:29:49 +00:00
f448ec47a3
test : 测试ci/cd
2025-06-12 15:26:52 +08:00
f633862434
Merge pull request 'test : 测试ci/cd' ( #1037 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1037
2025-06-12 07:19:39 +00:00
a4674d497b
test : 测试ci/cd
2025-06-12 15:18:29 +08:00
e8aee6f01c
Merge pull request 'test : 测试ci/cd' ( #1036 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1036
2025-06-12 06:54:14 +00:00
43e0f98509
test : 测试ci/cd
2025-06-12 14:53:52 +08:00
10b66cbf15
Merge pull request 'master' ( #1035 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1035
2025-06-12 06:07:46 +00:00
560bea739c
test : 测试cicd
2025-06-12 14:07:25 +08:00
1ed6156117
build(deps): 删除 moment 依赖
2025-06-12 12:08:41 +08:00
4321b42003
Merge pull request 'build(deps): 添加 moment 依赖' ( #1034 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1034
2025-06-12 04:05:02 +00:00
7f0f74c844
build(deps): 添加 moment 依赖
2025-06-12 12:04:11 +08:00
c1065cb084
Merge pull request 'refactor(components): 优化文件上传成功提示' ( #1033 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1033
2025-06-12 03:42:56 +00:00
579cadd687
refactor(components): 优化文件上传成功提示
2025-06-12 11:42:09 +08:00
78f4135efb
Merge pull request 'build: 调整 package.json' ( #1032 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1032
2025-06-12 03:29:12 +00:00
1a120418f0
build: 调整 package.json
2025-06-12 11:28:25 +08:00
d3ae1c1205
Merge pull request 'build: 更新 Node.js 版本并调整 package.json 格式' ( #1031 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1031
2025-06-12 03:16:06 +00:00
e49b6ef1a3
build: 更新 Node.js 版本并调整 package.json 格式
2025-06-12 11:15:52 +08:00
6fbf37ab78
Merge pull request 'fix(ProjectAttachment): 修改drone' ( #1030 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1030
2025-06-12 03:13:47 +00:00
a0d9c58c77
fix(ProjectAttachment): 修改drone
2025-06-12 11:12:52 +08:00
b3900a2a1c
Merge pull request 'fix(ProjectAttachment): 修改drone' ( #1029 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1029
2025-06-12 03:08:20 +00:00
4bb0c49dc8
fix(ProjectAttachment): 修改drone
2025-06-12 11:08:03 +08:00
4f6c36a20a
Merge pull request 'fix(ProjectAttachment): 修改drone' ( #1028 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1028
2025-06-12 02:17:12 +00:00
aada3d785b
fix(ProjectAttachment): 修改drone
2025-06-12 10:16:35 +08:00
fef4c57bd5
Merge pull request 'fix(ProjectAttachment): 添加依赖' ( #1027 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1027
2025-06-12 02:04:22 +00:00
35b332f640
fix(ProjectAttachment): 添加依赖
2025-06-12 10:03:57 +08:00
31da00d7e3
Merge pull request 'fix(ProjectAttachment): 添加依赖' ( #1026 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1026
2025-06-12 01:36:07 +00:00
6afac9be28
fix(ProjectAttachment): 添加依赖
2025-06-12 09:35:00 +08:00
b54289a0a5
Merge pull request 'fix(ProjectAttachment): 修改drone.yml' ( #1025 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1025
2025-06-12 01:28:38 +00:00
dc064de364
fix(ProjectAttachment): 修改drone.yml
2025-06-12 09:28:02 +08:00
7f656447b2
Merge pull request 'fix(ProjectAttachment): 修改drone.yml' ( #1024 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1024
2025-06-12 01:25:35 +00:00
78bafe0a7e
fix(ProjectAttachment): 修改drone.yml
2025-06-12 09:24:29 +08:00
ddf5159fbc
Merge pull request 'master' ( #1023 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1023
2025-06-11 14:49:29 +00:00
d0960f6ad6
feat(FileUpload): 实现多文件批量上传功能
...
- 添加自定义上传逻辑,支持多文件上传- 优化文件选择和上传流程,实现自动上传
-增加上传进度提示和完成通知
- 修复了一些与上传相关的小问题
2025-06-11 22:48:27 +08:00
e7b982ef6c
fix(ProjectAttachment): 移除未使用的上传附件相关代码
2025-06-11 16:34:59 +08:00
b5ada3a1ac
feat(FileUpload): 添加文件上传中的 loading 效果
2025-06-11 14:19:55 +08:00
418effdb04
Merge pull request 'feat(expense-management): 添加研发工时超过21.75天的提示功能' ( #1022 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1022
2025-06-09 14:28:50 +00:00
215f7c6bbf
feat(expense-management): 添加研发工时超过21.75天的提示功能
...
- 在保存分配明细时,增加对研发人员总工时的计算
- 如果总工时超过21.75天,系统将发出警告通知- 优化了控制台日志输出,便于调试和监控
2025-06-09 22:28:24 +08:00
57a1d2700f
Merge pull request 'refactor(expense-management): 注释掉研发人员重复性检查代码' ( #1021 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1021
2025-06-08 15:11:01 +00:00
e4025b90e9
refactor(expense-management): 注释掉研发人员重复性检查代码
...
- 在 add.vue 文件中,注释掉了两段用于检查研发人员重复性的代码
- 此修改可能是为了暂时禁用重复性检查功能,或者准备替换为新的检查逻辑
2025-06-08 23:08:02 +08:00
e44380c000
Merge pull request 'refactor(expense-management): 优化数字输入和附件处理' ( #1020 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1020
2025-06-07 01:30:52 +00:00
70d94f3c1d
refactor(expense-management): 优化数字输入和附件处理
...
- 在 ProjectApply 组件中,将多个 el-input 组件替换为 el-input-number 组件,用于限制输入格式
- 在 ProjectAttachment 组件中,优化附件列表获取逻辑,实现附件去重功能
- 在 add.vue 文件中,启用 console.log 输出,用于调试项目 ID 和研发人员 ID 数组
2025-06-06 22:58:48 +08:00
14c6ed1168
Merge pull request 'fix : 修复归档附件bug' ( #1019 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1019
2025-05-28 15:53:32 +00:00
05275aed15
fix : 修复归档附件bug
2025-05-28 23:53:10 +08:00
47d5863361
Merge pull request 'fix : 修复归档附件bug' ( #1018 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1018
2025-05-28 15:51:11 +00:00
9758981d3f
fix : 修复归档附件bug
2025-05-28 23:50:59 +08:00
a946247849
Merge pull request 'master' ( #1017 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1017
2025-05-28 15:03:54 +00:00
7c2d713035
fix(components): 优化多个组件的显示逻辑
...
- 在 ApprovalDetail组件中,改进了多个字段的显示逻辑,增加了对 0值的处理
- 在 AttachmentUpload 组件中,调整了必填项的显示逻辑
- 在 ProjectApply 组件中,修改了前置流程字段的显示条件
- 在 upload 组件中,优化了文件列表的处理逻辑
2025-05-28 23:01:16 +08:00
f4330b60d5
refactor(ProjectApply): 优化归档附件上传逻辑
2025-05-28 16:50:55 +08:00
1a38381ab8
Merge pull request 'refactor(components): 调整文件上传大小限制并优化附件展示逻辑' ( #1016 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1016
2025-05-23 01:08:02 +00:00
f61d50dbfc
refactor(components): 调整文件上传大小限制并优化附件展示逻辑
2025-05-23 09:07:02 +08:00
f5b9339b36
Merge pull request 'fix(ProjectAttachment): 重新获取附件列表' ( #1015 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1015
2025-05-22 15:09:20 +00:00
66dc6df0d9
fix(ProjectAttachment): 重新获取附件列表
...
在删除附件后,添加了重新获取附件列表的调用,以确保界面上的附件列表是最新的。
2025-05-22 23:08:27 +08:00
a3c7439a7f
Merge pull request 'fix(ProjectAttachment): 修复删除附件后未及时更新文件列表的问题- 在删除文件后添加了更新文件列表的逻辑' ( #1014 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1014
2025-05-22 14:57:02 +00:00
c7329f2f6d
fix(ProjectAttachment): 修复删除附件后未及时更新文件列表的问题- 在删除文件后添加了更新文件列表的逻辑
...
- 优化了获取本地文件列表的方法
- 调整了文件列表的初始化位置
2025-05-22 22:56:06 +08:00
59699b6118
Merge pull request 'feat(ProjectAttachment): 优化文件上传和管理功能' ( #1013 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1013
2025-05-22 08:46:46 +00:00
673e4fa20a
feat(ProjectAttachment): 优化文件上传和管理功能
...
- 新增本地存储功能,暂存未提交的文件
- 优化文件删除逻辑,区分本地和服务器文件
- 添加提交按钮,将本地文件上传到服务器
- 调整标签切换时的文件列表显示逻辑
- 优化代码结构,提高可读性和可维护性
2025-05-22 16:45:58 +08:00
eb2a5581ca
Merge pull request 'refactor(project-demand): 优化方案总结提交逻辑' ( #1012 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1012
2025-05-22 02:09:05 +00:00
ee5fc2cba3
refactor(project-demand): 优化方案总结提交逻辑
...
- 移除了不必要的空数组初始化
-简化了 requirementId 的赋值逻辑
- 添加了空行以提高代码可读性
2025-05-22 10:06:44 +08:00
952884a7fe
Merge pull request 'fix(project-demand): 修复专项经费选择框逻辑' ( #1011 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1011
2025-05-21 15:17:49 +00:00
b7ca97696a
fix(project-demand): 修复专项经费选择框逻辑
...
- 修改了专项经费选择逻辑,确保在选择专项经费时正确处理 specialFund 和 specialFundId 的值
- 优化了代码结构,提高了可读性和维护性
2025-05-21 23:14:00 +08:00
6ba9fa4bee
Merge pull request 'master' ( #1010 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1010
2025-05-21 14:39:55 +00:00
baea68c52a
Merge remote-tracking branch 'origin/master'
2025-05-21 22:39:08 +08:00
a2ed04e144
refactor(project-demand): 优化加载状态管理
...
- 在获取数据失败时添加 loading.value = false,确保正确更新加载状态
2025-05-21 22:38:53 +08:00
8a218ad270
Merge pull request 'feat(project-demand): 编辑概览页面数据持久化' ( #1009 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1009
2025-05-21 06:31:54 +00:00
287d6a3ad0
feat(project-demand): 编辑概览页面数据持久化
2025-05-21 14:31:38 +08:00
9813f8c585
Merge pull request 'fix(project-demand): 修复专项基金选择问题' ( #1008 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1008
2025-05-21 04:55:59 +00:00
673a26368a
fix(project-demand): 修复专项基金选择问题
2025-05-21 12:55:23 +08:00
9b90dbc649
Merge pull request 'feat(ProjectApply): 科技处用户申请项目时增加部门分管领导必选项' ( #1007 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1007
2025-05-19 14:13:55 +00:00
9adea1060c
feat(ProjectApply): 科技处用户申请项目时增加部门分管领导必选项
2025-05-19 22:13:03 +08:00
4f471494cc
Merge pull request 'refactor(permission): 优化面包屑控制逻辑' ( #1006 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1006
2025-05-16 10:15:13 +00:00
4e5a4bb4b9
refactor(permission): 优化面包屑控制逻辑
2025-05-16 18:14:31 +08:00
b4d6d97e27
Merge pull request 'fix : 修复需求上报缓存问题' ( #1005 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1005
2025-05-15 08:06:29 +00:00
a5ebab16a6
fix : 修复需求上报缓存问题
2025-05-15 16:06:04 +08:00
6ad76d1571
Merge pull request 'master' ( #1004 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1004
2025-05-05 12:15:31 +00:00
0cc1b63ae7
feat(project-management): 优化前置流程选择功能
...
- 在项目申请详情页面添加基本数据传递
- 实现前置流程的更改和选择功能
- 优化前置流程数据的存储和展示
- 添加对不可重复选择的前置流程的校验
2025-05-05 20:15:13 +08:00
d76ef8ff9c
feat(project-demand): 更新项目需求汇总功能
...
- 新增 getProjectName 方法,用于项目名称关键词匹配- 修改远程搜索方法,使用 getProjectName 替代 getRequirementName
- 更新 ProjectApply 组件,调整专项资金输入框显示逻辑
- 移除 proxy 配置中的注释
2025-05-05 17:53:55 +08:00
f105485714
feat(project-demand): 添加项目名称远程搜索功能并优化前置流程显示逻辑
...
- 在项目需求概览页面添加项目名称远程搜索功能,提高搜索效率和准确性
- 优化项目申请详情页面的前置流程显示逻辑,根据不同场景调整标签宽度
2025-05-05 14:48:07 +08:00
df99acd638
Merge pull request 'fix : 修复公告问题' ( #1003 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1003
2025-04-29 03:29:31 +00:00
af275ea6c4
fix : 修复公告问题
2025-04-29 11:29:06 +08:00
68830daab3
Merge pull request 'master' ( #1002 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1002
2025-04-27 06:29:31 +00:00
c27162f918
feat : 项目归档-实施附件
2025-04-27 14:28:59 +08:00
f1b81d86a2
fix : 备份附件
2025-04-27 11:00:38 +08:00
0c24d2cf51
Merge pull request 'fix : 修复单位元' ( #1001 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1001
2025-04-24 13:48:41 +00:00
710ccbdf65
fix : 修复单位元
2025-04-24 21:48:23 +08:00
7001261f01
Merge pull request 'refactor(project-management): 统一经费预算单位' ( #1000 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1000
2025-04-24 07:30:38 +00:00
7fcfc992fb
refactor(project-management): 统一经费预算单位
...
- 在多个组件中将"预估经费预算"和"实际经费预算"的标签添加单位"(元)"
-调整部分组件的标签宽度以适应新的单位
- 此修改统一了经费预算的显示格式,提高了用户体验
2025-04-24 15:30:14 +08:00
b7be0a34ae
Merge pull request 'feat(components): 增加审核意见必填校验' ( #999 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/999
2025-04-23 14:47:41 +00:00
a792df80e6
feat(components): 增加审核意见必填校验
2025-04-23 22:46:58 +08:00
b56e5b3544
Merge pull request 'fix : 标签不可编辑' ( #998 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/998
2025-04-20 12:32:35 +00:00
5dccaa1ee7
fix : 标签不可编辑
2025-04-20 20:32:16 +08:00
6aa074bfa3
Merge pull request 'feat : 项目验收新增字段' ( #997 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/997
2025-04-20 11:50:58 +00:00
8aefca0c82
feat : 项目验收新增字段
2025-04-20 19:49:57 +08:00
e518791ddd
Merge pull request 'master' ( #996 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/996
2025-04-20 06:44:18 +00:00
afda146103
feat : 项目归档-附件新增项目阶段字段
2025-04-20 14:43:57 +08:00
11f7fa37aa
feat : 年度计划新字段
2025-04-20 13:01:43 +08:00
35c2e1d9b4
feat : 需求上报新增字段
2025-04-20 12:46:14 +08:00
fe3a15fcbd
fix: 调整详情页面知识产权输出项
2025-04-19 21:03:54 +08:00
9fd97f6ea2
feat :需求上报新增字段
2025-04-19 20:13:11 +08:00
cccd14ec79
fix: 移除预期成果形式相关代码
2025-04-19 19:03:10 +08:00
2ed2cae599
Merge pull request 'fix : 注释立项提交的前置流程' ( #995 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/995
2025-04-19 05:43:49 +00:00
958399a32a
fix : 注释立项提交的前置流程
2025-04-19 13:43:36 +08:00
745971087c
Merge pull request 'fix : 完善需求上报字段页面' ( #994 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/994
2025-04-19 02:58:46 +00:00
8ea916c206
fix : 完善需求上报字段页面
2025-04-19 10:58:28 +08:00
e0aefecf50
Merge pull request 'fix: 修复审批白名单中取消事件' ( #993 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/993
2025-04-18 14:52:27 +00:00
10e9c9de19
fix: 修复审批白名单中取消事件
2025-04-18 22:51:49 +08:00
950b32270b
Merge pull request 'master' ( #992 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/992
2025-04-18 14:40:16 +00:00
b032903ed4
fix(project): 调整知识产权相关表述和附件表格样式
...
- 将"知识产权状况"修改为"知识产权归属"
- 优化附件上传和展示组件的样式- 统一知识产权归属相关的标签和提示信息
- 调整部分组件的显示逻辑和样式
2025-04-18 22:37:22 +08:00
696921243e
fix : 首页字体颜色统一
2025-04-18 18:13:03 +08:00
7200592f05
fix : 首页字体颜色统一
2025-04-18 14:04:44 +08:00
963b7b93e3
Merge remote-tracking branch 'origin/master'
2025-04-18 11:22:24 +08:00
86751acbd6
fix : 首页字体颜色统一
2025-04-18 11:22:00 +08:00
c17149235f
Merge pull request 'fix: 编辑上报时主项目选项过滤当前项目' ( #991 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/991
2025-04-15 16:00:21 +00:00
fda0f4fcde
fix: 编辑上报时主项目选项过滤当前项目
2025-04-15 23:56:05 +08:00
560485f255
Merge pull request 'style(article-management): 优化附件列表样式' ( #990 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/990
2025-04-15 15:31:31 +00:00
2847c88c61
style(article-management): 优化附件列表样式
...
- 在 add.vue 和 detail.vue 中为附件列表项添加底部间距,提升可读性
- 保持附件列表样式在不同页面中的一致性
2025-04-15 23:29:30 +08:00
5611fd9f02
Merge pull request 'feat: 费用导入功能' ( #989 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/989
2025-04-15 15:14:57 +00:00
2827c5ace6
feat: 费用导入功能
2025-04-15 23:14:46 +08:00
750a4c8178
Merge pull request 'fix: 注释公告附件列表相关代码' ( #988 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/988
2025-04-15 14:34:01 +00:00
9941fc14f6
fix: 注释公告附件列表相关代码
2025-04-15 22:33:38 +08:00
8b94f044db
Merge pull request 'feat: 抄送成功后刷新功能' ( #987 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/987
2025-04-15 03:15:54 +00:00
c71208c3e4
feat: 抄送成功后刷新功能
2025-04-15 11:15:15 +08:00
b2fb3fbb67
Merge pull request 'feat: 项目详情审批流程加立即抄送按钮' ( #986 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/986
2025-04-15 02:41:27 +00:00
7e6b48b62a
feat: 项目详情审批流程加立即抄送按钮
2025-04-15 10:40:52 +08:00
4aa0b093bb
Merge pull request 'fix: 修复附件上传和展示问题' ( #985 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/985
2025-04-14 13:20:20 +00:00
e77820e145
fix: 修复附件上传和展示问题
2025-04-14 21:19:55 +08:00
66d2c3c7cf
Merge pull request 'master' ( #984 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/984
2025-04-14 13:19:48 +00:00
a1422067d0
feat: 审批流程加立即抄送按钮
2025-04-14 16:44:42 +08:00
7579b77b2d
feat: 添加导入研发费用明细表和模板下载功能
2025-04-14 15:43:48 +08:00
c6390a8117
feat: 文章管理增加附件上传/删除/下载功能
2025-04-14 15:07:58 +08:00
e20f8cad7f
fix: 修复附件上传和展示问题
2025-04-13 21:22:22 +08:00
5cf2e4d208
feat(article-management): 增加文章附件上传功能
...
- 在文章管理页面添加公告附件列表
- 实现附件上传和展示功能- 优化 Tinymce 组件,支持附件上传事件
2025-04-11 18:21:43 +08:00
4f3a8550eb
Merge pull request 'master' ( #983 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/983
2025-04-11 06:09:41 +00:00
ad6d7af1a3
Merge remote-tracking branch 'origin/master'
2025-04-11 14:08:25 +08:00
65a4c72fd0
style(mobile): 优化附件文件列表的展示效果
2025-04-11 14:08:02 +08:00
5ea25ae8ae
Merge pull request 'fix: 修复附件上传和展示问题' ( #982 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/982
2025-04-09 15:11:29 +00:00
810757e828
fix: 修复附件上传和展示问题
2025-04-09 23:11:06 +08:00
e82c6e2316
Merge pull request 'master' ( #981 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/981
2025-04-09 04:59:16 +00:00
af593b08da
Merge remote-tracking branch 'origin/master'
2025-04-09 12:58:56 +08:00
2b14bd19a4
fix : 修复项目归档附件项目基本信息展示
2025-04-09 12:58:34 +08:00
da69cb4dba
Merge pull request 'master' ( #980 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/980
2025-04-09 02:59:02 +00:00
cc1d0c8cf2
Merge pull request 'fix : 修复项目实施附件上传功能' ( #979 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/979
2025-04-09 02:58:50 +00:00
f3d9ff44a3
fix : 修复项目实施附件上传功能
2025-04-09 10:58:26 +08:00
375a678fc3
Merge pull request 'master' ( #978 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/978
2025-04-09 01:42:30 +00:00
a3cbf4d24b
Merge pull request 'fix : 修复项目实施附件上传功能' ( #977 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/977
2025-04-09 01:42:17 +00:00
d3b12bd64c
fix : 修复项目实施附件上传功能
2025-04-09 09:37:53 +08:00
c213b3b41c
Merge pull request 'master' ( #976 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/976
2025-04-08 16:24:02 +00:00
d0c677cfb4
Merge pull request 'dj' ( #975 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/975
2025-04-08 16:23:33 +00:00
e9469439e8
Merge remote-tracking branch 'origin/dj'
2025-04-09 00:16:51 +08:00
62035606c9
Merge pull request 'master' ( #974 ) from master into dj
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/974
2025-04-08 16:16:26 +00:00
b101d70c75
fix: 修复附件上传和展示问题
2025-04-09 00:15:01 +08:00
382bad4cb3
Merge pull request 'master' ( #973 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/973
2025-04-08 16:14:37 +00:00
8c5d08874f
fix: 修复附件上传和展示问题
2025-04-09 00:14:10 +08:00
25d5b20b65
fix: 修复附件上传和展示问题
2025-04-09 00:13:51 +08:00
2f43919132
fix: 分摊明细导出调整参数
2025-04-08 23:05:42 +08:00
8f5b9fc637
Merge pull request 'fix: 分摊明细导出调整参数' ( #972 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/972
2025-04-07 16:30:53 +00:00
7b619a9bef
fix: 分摊明细导出调整参数
2025-04-08 00:30:32 +08:00
f33543c540
Merge pull request 'fix: 优化首页通知公告样式' ( #971 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/971
2025-04-07 13:57:40 +00:00
a9a2be2c74
fix: 优化首页通知公告样式
2025-04-07 21:57:13 +08:00
3160e86710
Merge pull request 'fix: 优化移动端项目管理功能' ( #970 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/970
2025-04-06 14:38:30 +00:00
a307697028
fix: 优化移动端项目管理功能
2025-04-06 22:38:14 +08:00
062f9c7bee
Merge pull request 'feat(article-management): 首页通知公告加时间, 将"备注"字段改为"发文单位"' ( #969 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/969
2025-04-06 13:26:05 +00:00
e8a5b4e788
feat(article-management): 首页通知公告加时间, 将"备注"字段改为"发文单位"
2025-04-06 21:25:30 +08:00
da9624663e
Merge pull request 'master' ( #968 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/968
2025-04-06 09:11:03 +00:00
7b8cedcfb0
Merge pull request 'master' ( #967 ) from master into dj
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/967
2025-04-06 09:10:49 +00:00
d3c0b36657
refactor(views/components): 优化首页通知公告展示和项目附件搜索功能
...
- 首页通知公告:调整公告列表的序号显示逻辑
- 项目附件:改进附件搜索功能,支持按全部文件搜索
- 搜索组件:更新搜索界面文本,根据搜索范围动态显示标签或项目阶段
2025-04-06 17:10:08 +08:00
eabf9cb3d6
refactor(project): 优化项目相关页面显示内容
...
- 修改项目需求、总结、立项、实施、归档页面中的编号标签
- 更新项目申请组件,根据项目类型动态显示实际专项资金输入框
-调整 API 代理配置
2025-04-06 16:47:23 +08:00
b84c2ce131
Merge pull request 'feat(project-management): 优化文件归档表格状态展示和权限控制' ( #966 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/966
2025-04-02 16:34:20 +00:00
348027f355
feat(project-management): 优化文件归档表格状态展示和权限控制
2025-04-03 00:34:04 +08:00
579f2777cf
Merge pull request 'master' ( #965 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/965
2025-04-02 16:11:32 +00:00
ed22942ab2
fix(project-management): 优化附件启用禁用操作反馈
2025-04-03 00:11:21 +08:00
119e3d8333
feat(ProjectAttachment): 优化文件上传标签逻辑
2025-04-03 00:09:41 +08:00
011566cb22
Merge pull request 'feat(ProjectAttachment): 添加文件下载功能' ( #964 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/964
2025-04-02 15:37:56 +00:00
bf34d8aa0c
feat(ProjectAttachment): 添加文件下载功能
2025-04-02 23:34:45 +08:00
7f3fedc2f2
Merge pull request 'master' ( #963 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/963
2025-04-02 15:28:05 +00:00
69aa6aa0fb
refactor(project-demand): 优化需求变更时特殊基金逻辑
2025-04-02 23:26:01 +08:00
e54db551a6
feat(project-demand): 添加需求征集变更逻辑
2025-04-02 23:01:17 +08:00
6c91a0740a
Merge pull request 'fix: 修改分摊明细页面路由跳转逻辑' ( #962 ) from master into dj
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/962
2025-04-01 16:06:24 +00:00
f0fe6c8269
Merge pull request 'master' ( #961 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/961
2025-04-01 16:06:06 +00:00
9174c09a6b
fix: 修改分摊明细页面路由跳转逻辑
2025-04-02 00:05:48 +08:00
4dc5ca40ee
feat(share-detail): 添加分摊导出按钮
2025-04-02 00:02:49 +08:00
09705e634a
Merge pull request 'feat(expense-management): 新增费用分摊功能并优化项目管理相关页面' ( #960 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/960
2025-04-01 15:58:33 +00:00
1e29e6bdc4
feat(expense-management): 新增费用分摊功能并优化项目管理相关页面
2025-04-01 23:57:46 +08:00
e49d8cfb5e
Merge pull request 'master' ( #959 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/959
2025-04-01 10:19:27 +00:00
a3bb1a9156
Merge pull request 'feat: 支出明细筛选和导出功能' ( #958 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/958
2025-04-01 10:19:16 +00:00
e9ced267ed
feat: 支出明细筛选和导出功能
2025-04-01 13:04:34 +08:00
ef9a536b5c
Merge pull request 'master' ( #957 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/957
2025-03-31 15:16:40 +00:00
a87be0e6e2
Merge pull request 'dj' ( #956 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/956
2025-03-31 15:16:28 +00:00
98d8ea4805
feat(expense-management): 新增费用分摊功能并优化项目管理相关页面
2025-03-31 23:14:54 +08:00
244f2e72b4
feat: 项目基本信息新增实际经费预算和专项资金相关字段
2025-03-31 14:12:28 +08:00
f9aa6191ce
feat(project-manage): 新增项目附件标签功能
2025-03-30 15:06:56 +08:00
ebd7fa3851
feat(project-manage): 新增项目附件标签功能
2025-03-30 15:06:39 +08:00
2941847f54
Merge pull request 'dj' ( #955 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/955
2025-03-29 12:25:32 +00:00
ca9e281119
feat(project-manage): 新增项目附件标签功能
2025-03-29 20:24:53 +08:00
a1ed160445
Merge remote-tracking branch 'origin/master'
2025-03-28 19:41:10 +08:00
9db0e8e9ec
feat(expense-management): 新增费用分摊功能
2025-03-25 15:17:08 +08:00
fe09ced0bc
Merge pull request 'master' ( #954 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/954
2025-03-25 06:37:02 +00:00
d73eb49461
Merge pull request 'dj' ( #953 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/953
2025-03-25 06:28:09 +00:00
b890372fc5
feat(ProjectAttachment): 优化项目附件组件功能和布局
...
- 移除了不必要的搜索和上传按钮
- 添加了文件上传功能和单个文件删除功能
- 优化了标签页切换逻辑
-调整了样式和布局
2025-03-25 14:27:48 +08:00
53bab74ea9
feat(project-management): 更新项目管理相关页面文案并优化附件功能
2025-03-22 23:11:09 +08:00
zhangkaihuai
023256630e
更新 Dockerfile
2025-03-19 12:24:06 +00:00
zhangkaihuai
f65663071a
更新 nginx.conf
2025-03-19 12:13:31 +00:00
zhangkaihuai
9a55494da7
更新 nginx.conf
2025-03-19 08:07:37 +00:00
zhangkaihuai
d5a07e772f
更新 nginx.conf
2025-03-19 07:55:07 +00:00
zhangkaihuai
42499bcb22
更新 nginx.conf
2025-03-19 07:40:27 +00:00
zhangkaihuai
0243d6fc56
Merge pull request '更新 nginx.conf' ( #952 ) from gary into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/952
2025-03-19 07:34:21 +00:00
zhangkaihuai
6bdbde262f
更新 nginx.conf
2025-03-19 07:34:04 +00:00
zhangkaihuai
78435bbcac
Merge pull request 'gary' ( #951 ) from gary into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/951
2025-03-19 07:32:49 +00:00
zhangkaihuai
c3358acf73
Merge remote-tracking branch 'origin/gary'
2025-03-19 15:32:05 +08:00
zhangkaihuai
3b1b822882
nginx ssl 证书配置
2025-03-19 15:29:56 +08:00
f874cd75b7
Merge pull request 'master' ( #950 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/950
2025-03-13 13:35:25 +00:00
d9a5099436
Merge pull request 'dj' ( #949 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/949
2025-03-13 13:35:11 +00:00
dd75bc6513
fix: 修复汇总列表征集名称筛选判重
2025-03-13 21:34:48 +08:00
d3506d841e
fix: 注释掉需求添加和附件上传中的标签编辑功能
2025-03-10 21:25:12 +08:00
263df9e489
feat: 列表新增征集, 筛选新增公司,征集名称
2025-03-10 17:42:21 +08:00
65b76da880
Merge pull request 'master' ( #948 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/948
2025-03-08 11:23:50 +00:00
50973efb0a
Merge pull request 'feat(system): 新增审批白名单功能并优化用户列表' ( #947 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/947
2025-03-08 11:23:40 +00:00
8256c80648
feat(system): 新增审批白名单功能并优化用户列表
2025-03-08 19:23:17 +08:00
d0dc8ba9f8
Merge pull request 'master' ( #946 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/946
2025-03-08 09:48:33 +00:00
97e9799b1a
Merge pull request 'dj' ( #945 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/945
2025-03-08 09:48:20 +00:00
e81b2bc42f
feat(system): 新增审批白名单功能并优化用户列表
2025-03-08 17:47:54 +08:00
9c297d92c9
feat : 需求征集新增公司筛选
2025-03-02 22:16:12 +08:00
e2de62e54a
Merge pull request 'master' ( #944 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/944
2024-12-21 07:08:22 +00:00
a3b1f96ab6
Merge pull request 'fix:移除未使用的文件下载和删除功能' ( #943 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/943
2024-12-21 07:07:45 +00:00
d2c77b9cc2
fix:移除未使用的文件下载和删除功能
2024-12-21 15:07:10 +08:00
61feb031aa
Merge pull request 'master' ( #942 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/942
2024-12-21 06:50:05 +00:00
b06b4b88bb
Merge pull request 'fix: 优化文件删除逻辑(采用前端删除文件)' ( #941 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/941
2024-12-21 06:49:55 +00:00
560fd3af3b
fix: 优化文件删除逻辑(采用前端删除文件)
2024-12-21 14:49:32 +08:00
e5b5b26e24
Merge pull request 'master' ( #940 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/940
2024-12-20 15:32:31 +00:00
19aa70a8ca
Merge pull request 'fix: 优化文件删除逻辑(采用前端删除文件)' ( #939 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/939
2024-12-20 15:32:21 +00:00
06af12ca88
fix: 优化文件删除逻辑(采用前端删除文件)
2024-12-20 22:27:22 +08:00
41b04e6fac
Merge pull request 'master' ( #938 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/938
2024-12-19 15:07:32 +00:00
96d912ff44
Merge pull request 'fix: 修改流程审批字样' ( #937 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/937
2024-12-19 15:07:23 +00:00
10f1afe23c
fix: 修改流程审批字样
2024-12-19 23:07:06 +08:00
0f2cb87f66
Merge pull request 'master' ( #936 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/936
2024-12-19 14:26:49 +00:00
e10978cadd
Merge pull request 'dj' ( #935 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/935
2024-12-19 14:26:36 +00:00
7ce2d6edb7
fix: 修改多图片上传页面
2024-12-19 22:26:17 +08:00
5f8a29f2d6
fix: 修改用户选择器标题文案
2024-12-15 00:20:28 +08:00
ccba937158
Merge pull request 'master' ( #934 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/934
2024-12-14 14:54:58 +00:00
efe27b8580
Merge pull request 'fix : 优化需求上报时需求征集显示' ( #933 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/933
2024-12-14 14:54:46 +00:00
7a535c41e7
fix : 优化需求上报时需求征集显示
2024-12-14 22:54:33 +08:00
edffc54453
Merge pull request 'master' ( #932 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/932
2024-12-14 11:05:47 +00:00
1cf05c8653
Merge pull request 'feat : 需求上报新增需求征集字段' ( #931 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/931
2024-12-14 11:05:38 +00:00
7f4a3a274e
feat : 需求上报新增需求征集字段
2024-12-14 19:05:12 +08:00
f5b3791762
Merge pull request 'master' ( #930 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/930
2024-12-13 06:29:10 +00:00
6e5c7d172d
Merge pull request 'fix: 优化图片上传插件' ( #929 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/929
2024-12-13 06:28:59 +00:00
4123a685b7
fix: 优化图片上传插件
2024-12-13 14:28:37 +08:00
7e25e76683
Merge pull request 'master' ( #928 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/928
2024-12-13 05:10:55 +00:00
2fe09971ab
Merge pull request 'fix: 优化图片上传插件' ( #927 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/927
2024-12-13 05:10:46 +00:00
dc099c9347
fix: 优化图片上传插件
2024-12-13 13:10:30 +08:00
7e7aac5139
Merge pull request 'master' ( #926 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/926
2024-12-13 04:42:16 +00:00
54e7a8f662
Merge pull request 'feat: 优化文章详情页面pdf预览功能' ( #925 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/925
2024-12-13 04:42:04 +00:00
43785b7460
feat: 优化文章详情页面pdf预览功能
2024-12-13 12:38:08 +08:00
eed18d0c17
Merge pull request 'master' ( #924 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/924
2024-12-13 03:52:19 +00:00
ad969d33bb
Merge pull request 'feat : 需求上报加上保存按钮' ( #923 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/923
2024-12-13 03:52:03 +00:00
b41e39abbf
feat : 需求上报加上保存按钮
2024-12-13 11:51:18 +08:00
981d65c759
Merge pull request 'master' ( #922 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/922
2024-12-11 05:13:47 +00:00
d7e36ee464
Merge pull request 'feat: 在文章管理中集成多图片上传插件' ( #921 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/921
2024-12-11 05:13:33 +00:00
54eeefd5dd
feat: 在文章管理中集成多图片上传插件
2024-12-11 13:12:43 +08:00
049091719a
Merge pull request 'master' ( #920 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/920
2024-11-10 14:52:43 +00:00
df6f0083ea
Merge pull request 'feat : 需求汇总加上"主项目"字段' ( #919 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/919
2024-11-10 14:52:34 +00:00
a5486c1948
feat : 需求汇总加上"主项目"字段
2024-11-10 22:52:15 +08:00
5f120bff1e
Merge pull request 'master' ( #918 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/918
2024-11-10 05:50:47 +00:00
f6d5a97dfb
Merge pull request 'feat : 需求汇总加上 " 是否在预算内"筛选' ( #917 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/917
2024-11-10 05:50:37 +00:00
a6ace0a27d
feat : 需求汇总加上 " 是否在预算内"筛选
2024-11-10 13:50:22 +08:00
70a4899337
Merge pull request 'master' ( #916 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/916
2024-11-07 03:09:06 +00:00
b2eec2e1f3
Merge pull request 'fix : 修改系统名称' ( #915 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/915
2024-11-07 03:08:56 +00:00
5506ebee7a
fix : 修改系统名称
2024-11-07 11:08:38 +08:00
a6fd326774
Merge pull request 'master' ( #914 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/914
2024-11-07 03:08:17 +00:00
348edd66bd
Merge pull request 'fix : 修改系统名称' ( #913 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/913
2024-11-07 03:08:00 +00:00
d58579579d
fix : 修改系统名称
2024-11-07 11:07:47 +08:00
3139c78179
Merge pull request 'fix : 修改系统名称' ( #911 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/911
2024-11-07 03:05:59 +00:00
252a077dcd
fix : 修改系统名称
2024-11-07 11:04:16 +08:00
45aaaf5360
Merge pull request 'master' ( #910 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/910
2024-11-03 11:50:33 +00:00
87d5677352
Merge pull request 'feat : 项目立项, 阶段变更zip下载' ( #909 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/909
2024-11-03 11:32:31 +00:00
39c9408f34
feat : 项目立项, 阶段变更zip下载
2024-11-03 19:31:59 +08:00
193862f58b
Merge pull request 'master' ( #908 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/908
2024-11-02 14:05:27 +00:00
36624c5621
Merge pull request 'feat : "需求上报, 项目立项, 项目验收, 阶段变更, 专项资金" 上传文件旁边加上模板下载功能' ( #907 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/907
2024-11-02 14:05:13 +00:00
08da2601d8
feat : "需求上报, 项目立项, 项目验收, 阶段变更, 专项资金" 上传文件旁边加上模板下载功能
2024-11-02 22:00:08 +08:00
24563fd7df
Merge pull request 'master' ( #906 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/906
2024-11-02 12:01:42 +00:00
4b4aed5600
Merge pull request 'feat : 需求征集和项目管理的名称匹配搜索' ( #905 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/905
2024-11-02 12:01:11 +00:00
a175a6456a
feat : 需求征集和项目管理的名称匹配搜索
2024-11-02 20:00:29 +08:00
6de9896ead
Merge pull request 'master' ( #904 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/904
2024-10-30 13:14:01 +00:00
0bbe97c582
Merge pull request 'dj' ( #903 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/903
2024-10-30 13:13:52 +00:00
960d294870
feat : 修复项目归档的附件的全部附件加个类型筛选
2024-10-30 21:13:16 +08:00
f3fbb8d76b
fix : 修复选择前置流程时的提示为红色
2024-10-29 21:53:07 +08:00
60df95cc20
Merge pull request 'master' ( #902 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/902
2024-10-29 13:45:26 +00:00
8a0f6c6f37
Merge pull request 'feat : 需求汇总列表新增当前审批节点字段,阶段变更新增项目终止字段' ( #901 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/901
2024-10-29 13:45:17 +00:00
99be2b0501
feat : 需求汇总列表新增当前审批节点字段,阶段变更新增项目终止字段
2024-10-29 21:44:50 +08:00
d8a1a661df
Merge pull request 'master' ( #900 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/900
2024-10-27 11:01:00 +00:00
942603c344
Merge pull request 'fix : 修复项目实施文件预览' ( #899 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/899
2024-10-27 11:00:53 +00:00
54772cbbb1
fix : 修复项目实施文件预览
2024-10-27 19:00:37 +08:00
f720c3cddb
Merge pull request 'master' ( #898 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/898
2024-10-27 10:08:59 +00:00
a4e95e21b3
Merge pull request 'fix : 修复新增征集/需求上报时缓存和注释log' ( #897 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/897
2024-10-27 10:08:50 +00:00
53b581e71c
fix : 修复新增征集/需求上报时缓存和注释log
2024-10-27 18:08:16 +08:00
0a6803371b
Merge pull request 'master' ( #896 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/896
2024-10-26 17:54:18 +00:00
604a0fedb8
Merge pull request 'fix : 修复tinymce的多图片上传插件/文章详情附件下载' ( #895 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/895
2024-10-26 17:54:09 +00:00
8f226e6fa3
fix : 修复tinymce的多图片上传插件/文章详情附件下载
2024-10-27 01:53:42 +08:00
fb48952924
Merge pull request 'master' ( #894 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/894
2024-10-26 17:10:15 +00:00
44eb378423
Merge pull request 'fix : 修复tinymce的多图片上传插件' ( #893 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/893
2024-10-26 17:10:08 +00:00
40ba004082
fix : 修复tinymce的多图片上传插件
2024-10-27 01:06:54 +08:00
1a5dda5302
Merge pull request 'master' ( #892 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/892
2024-10-26 17:04:25 +00:00
2b2e54957f
Merge pull request 'fix : 修复文章上传要显示的文本' ( #891 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/891
2024-10-26 17:04:18 +00:00
db2a062400
fix : 修复文章上传要显示的文本
2024-10-27 01:04:08 +08:00
cde8d9f0b4
Merge pull request 'master' ( #890 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/890
2024-10-26 16:56:10 +00:00
f36d7abca8
Merge pull request 'fix : 修复文章下载文件名问题' ( #889 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/889
2024-10-26 16:56:02 +00:00
4f2bfb80ae
fix : 修复文章下载文件名问题
2024-10-27 00:55:49 +08:00
a560460cc1
Merge pull request 'master' ( #888 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/888
2024-10-26 13:29:37 +00:00
7ee2f084db
Merge pull request 'fix : 修改文章详情里面附件链接颜色' ( #887 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/887
2024-10-26 13:29:23 +00:00
b5d2dceda1
fix : 修改文章详情里面附件链接颜色
2024-10-26 21:28:48 +08:00
7d234e523b
Merge pull request 'master' ( #886 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/886
2024-10-26 13:18:51 +00:00
7c7984b08f
Merge pull request 'fix : 隐藏多图片上传' ( #885 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/885
2024-10-26 13:18:37 +00:00
68f9c787e9
fix : 隐藏多图片上传
2024-10-26 21:18:22 +08:00
bf6779a008
Merge pull request 'master' ( #884 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/884
2024-10-26 13:16:33 +00:00
baecbac6c3
Merge pull request 'fix : 修复tinymce编辑器的图片上传loading提示' ( #883 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/883
2024-10-26 13:16:17 +00:00
ea625f98f3
fix : 修复tinymce编辑器的图片上传loading提示
2024-10-26 21:15:58 +08:00
065a232333
Merge pull request 'master' ( #882 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/882
2024-10-26 13:03:36 +00:00
9b2baf43ef
Merge pull request 'fix : 修复需求汇总的征集名称匹配及注释部分log' ( #881 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/881
2024-10-26 13:03:20 +00:00
49596316f2
fix : 修复需求汇总的征集名称匹配及注释部分log
2024-10-26 21:02:53 +08:00
4c492a8866
Merge pull request 'master' ( #880 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/880
2024-10-25 15:31:11 +00:00
203721e9e0
Merge pull request 'fix : 修复需求上报提交功能' ( #879 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/879
2024-10-25 15:31:03 +00:00
1a72339ade
fix : 修复需求上报提交功能
2024-10-25 23:30:54 +08:00
bb84f72836
Merge pull request 'master' ( #878 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/878
2024-10-25 15:11:33 +00:00
83a740de91
Merge pull request 'fix : 修复首页待立项等任务跳转及各种类型文章跳转显示对应数据' ( #877 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/877
2024-10-25 15:11:24 +00:00
fb0a0cd719
fix : 修复首页待立项等任务跳转及各种类型文章跳转显示对应数据
2024-10-25 23:11:01 +08:00
45b8b91152
Merge pull request 'master' ( #876 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/876
2024-10-25 13:50:16 +00:00
2b36fd181f
Merge pull request 'dj' ( #875 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/875
2024-10-25 13:50:05 +00:00
5c2ec69fd6
feat : 项目实施-上传附件加上缓存
2024-10-25 21:49:53 +08:00
ffe7d0bb6c
feat : 阶段变更的项目基本信息加上"是否在预算内"字段
2024-10-25 21:41:26 +08:00
94a46d01fe
Merge pull request 'master' ( #874 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/874
2024-10-25 13:33:13 +00:00
99d8bc156b
Merge pull request 'dj' ( #873 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/873
2024-10-25 13:33:04 +00:00
e78ae692ee
feat : 新增需求上报缓存
2024-10-25 21:32:45 +08:00
80bf9ae9bd
feat : 新增需求征集缓存
2024-10-25 21:26:58 +08:00
7be10381bd
Merge pull request 'master' ( #872 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/872
2024-10-25 12:52:42 +00:00
1fbd31f137
Merge pull request 'dj' ( #871 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/871
2024-10-25 12:52:33 +00:00
9d55426a2a
feat : 新增需求征集缓存
2024-10-25 20:52:20 +08:00
e0299baf46
fix : 修复项目归档全部附件名称搜索
2024-10-25 20:52:03 +08:00
39fedea1ca
Merge pull request 'master' ( #870 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/870
2024-10-25 12:21:03 +00:00
ed8104ba92
Merge pull request 'feat : 项目归档加上全部标签' ( #869 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/869
2024-10-25 12:20:54 +00:00
c5d7961b4d
feat : 项目归档加上全部标签
2024-10-25 20:20:39 +08:00
ec9c4c526c
Merge pull request 'master' ( #868 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/868
2024-10-25 02:48:22 +00:00
0cb840a466
Merge pull request 'dj' ( #867 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/867
2024-10-25 02:48:06 +00:00
b8aa24e6a0
fix : 修复tinymce的多图片上传和附件上传
2024-10-25 10:46:53 +08:00
e3b17f0f04
fix : 修复tinymce的多图片上传和附件上传
2024-10-25 10:46:35 +08:00
a1b249b86c
Merge pull request 'master' ( #866 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/866
2024-10-24 15:04:46 +00:00
d12d4865c7
Merge pull request 'feat : 项目基本信息加上是否在预算内字段' ( #865 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/865
2024-10-24 15:04:37 +00:00
a01cede9c0
feat : 项目基本信息加上是否在预算内字段
2024-10-24 23:01:54 +08:00
318410ff74
Merge pull request 'feat : 需求上报和详情新增是否在预算内字段' ( #864 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/864
2024-10-24 14:04:59 +00:00
a8feed2d7f
feat : 需求上报和详情新增是否在预算内字段
2024-10-24 22:04:46 +08:00
fe0a6bb3be
Merge pull request 'master' ( #863 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/863
2024-10-24 05:13:45 +00:00
872c54abd3
Merge pull request 'fix : 修复前置流程弹窗的提示,首页需求上报跳转位置' ( #862 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/862
2024-10-24 05:13:34 +00:00
c2c1cfd6e1
fix : 修复前置流程弹窗的提示,首页需求上报跳转位置
2024-10-24 13:13:11 +08:00
41bd6d1686
Merge pull request 'master' ( #861 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/861
2024-10-24 02:29:18 +00:00
779d6f7094
Merge pull request 'fix : 按钮放在右上角浮动' ( #860 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/860
2024-10-24 02:29:06 +00:00
5c4f25dc1a
fix : 按钮放在右上角浮动
2024-10-24 10:28:53 +08:00
e65bf98db2
Merge pull request 'master' ( #859 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/859
2024-10-23 15:15:36 +00:00
c17396d44a
Merge pull request 'fix : 按钮放在右上角浮动' ( #858 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/858
2024-10-23 15:15:15 +00:00
344a3a03b3
fix : 按钮放在右上角浮动
2024-10-23 23:14:56 +08:00
dc8fc056f9
Merge pull request 'master' ( #857 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/857
2024-10-23 14:56:37 +00:00
9ff596c167
Merge pull request 'fix : 修复年docx文件预览框溢出bug' ( #856 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/856
2024-10-23 14:56:28 +00:00
a82030b04f
fix : 修复年docx文件预览框溢出bug
2024-10-23 22:53:46 +08:00
d316661574
Merge pull request 'master' ( #855 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/855
2024-10-23 14:32:41 +00:00
3690235ae7
Merge pull request 'fix : 修复年度计划项目详情跳转' ( #854 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/854
2024-10-23 14:32:32 +00:00
2a788fff0a
fix : 修复年度计划项目详情跳转
2024-10-23 22:32:10 +08:00
a3b93d0e1a
Merge pull request 'master' ( #853 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/853
2024-10-23 13:58:17 +00:00
3d6bdd50ca
Merge pull request 'fix : 修复文章详情排版' ( #852 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/852
2024-10-23 13:58:08 +00:00
20b2203930
fix : 修复文章详情排版
2024-10-23 21:56:18 +08:00
d23a86e9ea
Merge pull request 'master' ( #851 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/851
2024-10-23 13:38:31 +00:00
6afc855cd8
Merge pull request 'feat : 费用管理中新增项目台账' ( #850 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/850
2024-10-23 13:38:06 +00:00
44a50176cc
feat : 费用管理中新增项目台账
2024-10-23 21:37:17 +08:00
069816e17f
Merge pull request 'dj' ( #849 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/849
2024-10-22 15:20:03 +00:00
57ec7832f2
fix : 修复文件预览弹窗适配
2024-10-22 23:19:44 +08:00
dfdaabeb48
fix : 修复新增研发投入资金bug
2024-10-20 21:17:45 +08:00
f427fa9ef2
Merge pull request 'master' ( #848 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/848
2024-10-17 14:49:45 +00:00
bfc6845071
Merge pull request 'fix : 清空登录默认账号' ( #847 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/847
2024-10-17 14:48:53 +00:00
ea9047ee2a
fix : 清空登录默认账号
2024-10-17 22:47:27 +08:00
87ab014111
Merge pull request 'master' ( #846 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/846
2024-10-17 14:36:15 +00:00
1341f3749b
Merge pull request 'fix : 修复首页时间提示' ( #845 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/845
2024-10-17 14:36:05 +00:00
30f3f3bdcd
fix : 修复首页时间提示
2024-10-17 22:35:54 +08:00
f9d7b765d1
Merge pull request 'master' ( #844 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/844
2024-10-17 14:25:57 +00:00
fbb277cb30
Merge pull request 'fix : 修复非超级管理员的名称搜索问题' ( #843 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/843
2024-10-17 14:25:45 +00:00
145bb01fdd
fix : 修复非超级管理员的名称搜索问题
2024-10-17 22:25:31 +08:00
7601a7872c
Merge pull request 'master' ( #842 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/842
2024-10-14 06:49:01 +00:00
f36c8ffcac
Merge pull request 'fix : 清空登录默认账号' ( #841 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/841
2024-10-14 06:36:01 +00:00
de0b64909d
fix : 清空登录默认账号
2024-10-14 14:35:43 +08:00
39af97815c
Merge pull request 'master' ( #840 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/840
2024-10-14 04:17:33 +00:00
bcffdba692
Merge pull request 'fix : 修改首页提示' ( #839 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/839
2024-10-14 04:17:25 +00:00
2e9d015623
fix : 修改首页提示
2024-10-14 12:16:57 +08:00
4654f71f11
Merge pull request 'master' ( #838 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/838
2024-10-13 16:28:06 +00:00
9d63e05d03
Merge pull request 'fix : 修改首页提示' ( #837 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/837
2024-10-13 16:27:46 +00:00
6ea9538b0a
fix : 修改首页提示
2024-10-14 00:27:15 +08:00
88f4a93a81
Merge pull request 'master' ( #836 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/836
2024-10-13 14:48:38 +00:00
9671d5a36d
Merge pull request 'dj' ( #835 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/835
2024-10-13 14:48:29 +00:00
f476dc9203
feat : 首页待办/已办查看更多列表
2024-10-13 22:47:44 +08:00
235ec0c4ff
fix : 修复首页刷新功能
2024-10-13 22:18:18 +08:00
f2ba567b93
fix : 修复首页刷新功能
2024-10-13 22:15:39 +08:00
525385cd17
Merge pull request 'fix : 修复首页研发投入资金渲染bug' ( #834 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/834
2024-10-13 14:08:27 +00:00
ee8df164d1
fix : 修复首页研发投入资金渲染bug
2024-10-13 22:08:10 +08:00
df2d53b9da
Merge pull request 'master' ( #833 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/833
2024-10-13 14:00:02 +00:00
9b1d51273d
Merge pull request 'fix : 修复审批节点' ( #832 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/832
2024-10-13 13:59:52 +00:00
0fc92b7742
fix : 修复审批节点
2024-10-13 21:59:27 +08:00
1996ff0b3a
Merge pull request 'master' ( #831 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/831
2024-10-13 09:45:25 +00:00
735dedfb42
Merge pull request 'feat : 首页项目四个状态统计' ( #830 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/830
2024-10-13 09:45:15 +00:00
4ab7a04c92
feat : 首页项目四个状态统计
2024-10-13 17:44:53 +08:00
8864e13030
Merge pull request 'master' ( #829 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/829
2024-10-11 08:17:47 +00:00
b3bfff9588
Merge pull request 'dj' ( #828 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/828
2024-10-11 08:17:38 +00:00
c6d8b45537
fix : 优化费用台账-导出按钮位置
2024-10-11 16:07:35 +08:00
e7e1f33985
fix : 修复pointTag组件报错
2024-10-11 15:40:28 +08:00
4f67329f6b
Merge pull request 'master' ( #827 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/827
2024-10-11 07:26:52 +00:00
4aff4667ef
Merge pull request 'feat : 费用台账导出' ( #826 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/826
2024-10-11 07:26:33 +00:00
41fd5bef4d
feat : 费用台账导出
2024-10-11 15:26:03 +08:00
11e4b4ab3f
Merge pull request 'master' ( #825 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/825
2024-10-11 07:15:56 +00:00
509b7e35c9
Merge pull request 'fix : 修复“专项资金名称”显示不全问题' ( #824 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/824
2024-10-11 07:15:44 +00:00
a7143c8c58
fix : 修复“专项资金名称”显示不全问题
2024-10-11 15:15:28 +08:00
f588695f3c
Merge pull request 'master' ( #823 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/823
2024-10-11 07:01:13 +00:00
26ba628cae
Merge pull request 'dj' ( #822 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/822
2024-10-11 07:00:58 +00:00
7fbc2037d3
feat : 研发投入资金管理按钮权限
2024-10-11 15:00:42 +08:00
5c1a1d507a
feat : 首页专项资金项目数据展示
2024-10-11 14:49:18 +08:00
ee2ddfca14
Merge pull request 'fix : 修复popover删除组件按钮显示问题' ( #821 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/821
2024-10-11 06:27:11 +00:00
c456c6f642
fix : 修复popover删除组件按钮显示问题
2024-10-11 14:27:00 +08:00
2c2055a11a
Merge pull request 'master' ( #820 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/820
2024-10-11 06:06:42 +00:00
502b4cff10
Merge pull request 'fix : 修复文章操作权限' ( #819 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/819
2024-10-11 06:06:31 +00:00
c34fb88311
fix : 修复文章操作权限
2024-10-11 14:02:36 +08:00
5949cdd843
Merge pull request 'master' ( #818 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/818
2024-10-11 04:15:10 +00:00
22548f34c1
Merge pull request 'fix : 修复研发投入资金年份筛选时chart没渲染的bug' ( #817 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/817
2024-10-11 04:14:36 +00:00
c643aa0e1d
fix : 修复研发投入资金年份筛选时chart没渲染的bug
2024-10-11 12:13:59 +08:00
9be3a714d1
Merge pull request 'master' ( #816 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/816
2024-10-11 03:39:32 +00:00
478f9d2639
Merge pull request 'feat : 添加首页待办数据和研发投入资金年份筛选' ( #815 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/815
2024-10-11 03:39:17 +00:00
19c4f7469d
feat : 添加首页待办数据和研发投入资金年份筛选
2024-10-11 11:38:45 +08:00
9b50bcd0ee
Merge pull request 'master' ( #814 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/814
2024-10-09 13:20:01 +00:00
06f3fcefee
Merge pull request 'dj' ( #813 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/813
2024-10-09 13:17:26 +00:00
62d18089c4
fix : 简化代码
2024-10-09 21:16:55 +08:00
03a34bb637
Merge pull request 'fix : 优化首页样式' ( #812 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/812
2024-10-09 11:57:50 +00:00
9d144af68a
fix : 优化首页样式
2024-10-09 19:54:27 +08:00
00c346c7b1
Merge remote-tracking branch 'origin/master'
2024-10-09 19:47:44 +08:00
fcc67e542e
fix : 优化首页样式
2024-10-09 19:47:21 +08:00
zhangkaihuai
f18dd60383
Merge pull request 'master' ( #811 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/811
2024-09-23 02:59:58 +00:00
zhangkaihuai
5019a88fd5
Merge pull request '更新 nginx.conf' ( #810 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/810
2024-09-23 02:59:43 +00:00
zhangkaihuai
b573fafb8e
更新 nginx.conf
2024-09-23 02:59:22 +00:00
1440ba821a
Merge pull request 'master' ( #809 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/809
2024-09-22 13:42:04 +00:00
e0b564c56c
Merge pull request 'fix : 修复代理人回显' ( #808 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/808
2024-09-22 13:41:56 +00:00
158fbfd124
fix : 修复代理人回显
2024-09-22 21:41:46 +08:00
1a005f3b9e
Merge pull request 'master' ( #807 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/807
2024-09-22 13:40:04 +00:00
f1cc13ae71
Merge pull request 'fix : 修复个人中心代理人回显' ( #806 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/806
2024-09-22 13:39:57 +00:00
35ba4523e8
fix : 修复个人中心代理人回显
2024-09-22 21:39:48 +08:00
c8731e0612
Merge pull request 'master' ( #805 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/805
2024-09-22 11:53:42 +00:00
30f74720b4
Merge pull request 'fix : 研发资金格式化' ( #804 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/804
2024-09-22 11:53:30 +00:00
9e9c4beb45
fix : 研发资金格式化
2024-09-22 19:53:20 +08:00
20798e0ce6
Merge pull request 'master' ( #803 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/803
2024-09-22 10:46:42 +00:00
810479701c
Merge pull request 'fix : 饼图间距' ( #802 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/802
2024-09-22 10:46:25 +00:00
b8392f199c
fix : 饼图间距
2024-09-22 18:46:10 +08:00
9646a0110f
Merge pull request 'master' ( #801 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/801
2024-09-22 10:07:34 +00:00
11f887c93d
Merge pull request 'fix : 移除首页待办模拟数据' ( #800 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/800
2024-09-22 10:07:24 +00:00
b539f4a6d7
fix : 移除首页待办模拟数据
2024-09-22 18:07:15 +08:00
216bc5034b
Merge pull request 'master' ( #799 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/799
2024-09-22 09:58:43 +00:00
cefee8298a
Merge pull request 'de' ( #798 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/798
2024-09-22 09:58:32 +00:00
47633749fb
feat : 审批记录的代理审批,用户管理的设置代理功能,首页待办
2024-09-22 17:58:13 +08:00
4e325196c8
feat : 个人中心和用户管理设置代理
2024-09-22 15:26:45 +08:00
18c5386fdd
Merge pull request 'master' ( #797 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/797
2024-09-22 04:22:34 +00:00
242fb1ddee
Merge pull request 'fix : 修复首页适配/人员选择器取消功能bug' ( #796 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/796
2024-09-22 04:22:25 +00:00
2546db9b64
fix : 修复首页适配/人员选择器取消功能bug
2024-09-22 12:21:57 +08:00
b28fbaf903
Merge pull request 'master' ( #795 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/795
2024-09-21 16:42:15 +00:00
58ffb22bf6
Merge pull request 'fix : 修复首页适配' ( #794 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/794
2024-09-21 16:42:04 +00:00
d7d825b5b0
fix : 修复首页适配
2024-09-22 00:40:40 +08:00
dc9f82f30e
Merge pull request 'master' ( #793 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/793
2024-09-21 16:31:33 +00:00
7077604a27
Merge pull request 'fix : 修复首页适配' ( #792 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/792
2024-09-21 16:31:12 +00:00
ea38a6ddef
fix : 修复首页适配
2024-09-22 00:31:00 +08:00
bba7a8e456
Merge pull request 'master' ( #791 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/791
2024-09-21 16:28:44 +00:00
4a620c5d78
Merge pull request 'de' ( #790 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/790
2024-09-21 16:28:36 +00:00
c37e150bb9
fix : 修复首页适配
2024-09-22 00:28:18 +08:00
fe45524d52
fix : 修复首页适配
2024-09-22 00:27:22 +08:00
5d21271316
Merge pull request 'master' ( #789 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/789
2024-09-21 15:52:09 +00:00
9b78d4e52e
Merge pull request 'fix : 修复首页数据展示' ( #788 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/788
2024-09-21 15:51:57 +00:00
349f514bcb
fix : 修复首页数据展示
2024-09-21 23:51:33 +08:00
85a910b794
Merge pull request 'master' ( #787 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/787
2024-09-21 14:38:43 +00:00
e4069c0de2
Merge pull request 'fix : 修复首页数据展示,更改文章时间字段' ( #786 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/786
2024-09-21 14:38:32 +00:00
7b155f649d
fix : 修复首页数据展示,更改文章时间字段
2024-09-21 22:37:59 +08:00
ecc7b0ebc3
Merge pull request 'master' ( #785 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/785
2024-09-21 13:59:36 +00:00
c6a8a6fc70
Merge pull request 'feat : 文章管理crud功能完成' ( #784 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/784
2024-09-21 13:59:26 +00:00
4f594b0bfd
feat : 文章管理crud功能完成
2024-09-21 21:59:12 +08:00
f1a02e9188
Merge pull request 'master' ( #783 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/783
2024-09-21 10:19:39 +00:00
f011a1e8fd
Merge pull request 'feat : 研发投入资金crud功能完成' ( #782 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/782
2024-09-21 10:19:30 +00:00
090e9a1ea8
feat : 研发投入资金crud功能完成
2024-09-21 18:19:17 +08:00
fc8575dd0b
Merge pull request 'master' ( #781 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/781
2024-09-21 07:40:12 +00:00
f162befa0d
Merge pull request 'feat : 研发投入资金和文章管理' ( #780 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/780
2024-09-21 07:40:01 +00:00
10bb9cbc37
feat : 研发投入资金和文章管理
2024-09-21 15:39:45 +08:00
52ca3791b3
Merge pull request 'master' ( #779 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/779
2024-09-19 09:14:09 +00:00
2fe143b6c7
Merge pull request 'fix : 优化首页样式' ( #778 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/778
2024-09-19 09:13:52 +00:00
bbf63ec51f
fix : 优化首页样式
2024-09-19 17:12:50 +08:00
222b9829b6
Merge pull request 'master' ( #777 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/777
2024-09-18 16:52:16 +00:00
ffaf17d6f9
Merge pull request 'fix : 优化首页样式' ( #776 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/776
2024-09-18 16:52:06 +00:00
e9835df985
fix : 优化首页样式
2024-09-19 00:51:55 +08:00
377e041eb2
Merge pull request 'de' ( #775 ) from de into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/775
2024-09-18 16:26:18 +00:00
b3fe207469
fix : 优化首页样式
2024-09-19 00:26:05 +08:00
e527deabd5
fix : 首页备份
2024-09-18 22:30:39 +08:00
d644b0e3ca
Merge pull request 'master' ( #774 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/774
2024-09-18 14:26:18 +00: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
c67e5cf15e
Merge pull request 'master' ( #772 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/772
2024-09-12 15:16:11 +00: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
457547a34e
Merge pull request 'master' ( #770 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/770
2024-09-12 14:57:26 +00: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
e4959cecd7
Merge pull request 'master' ( #768 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/768
2024-09-12 14:33:51 +00: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
ed3462be87
Merge pull request 'master' ( #766 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/766
2024-09-12 13:56:13 +00: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
662042a228
Merge pull request 'master' ( #764 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/764
2024-09-12 13:29:22 +00: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
7e7197b9b8
Merge pull request 'master' ( #762 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/762
2024-09-11 18:34:56 +00: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
b7ebe7e3b9
Merge pull request 'master' ( #760 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/760
2024-09-11 16:49:00 +00: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
e2e4f47c60
Merge pull request 'master' ( #758 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/758
2024-09-10 05:17:25 +00: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
c43ea8be87
Merge pull request 'master' ( #756 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/756
2024-09-08 12:51:36 +00: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
a0906ed5c7
Merge pull request 'master' ( #754 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/754
2024-09-08 11:39:22 +00: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
c884333fc1
Merge pull request 'master' ( #752 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/752
2024-09-07 10:23:16 +00: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
e4094dcd73
Merge pull request 'master' ( #750 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/750
2024-09-07 07:10:35 +00: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
5640978025
Merge pull request 'master' ( #748 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/748
2024-08-28 14:57:41 +00: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
6018cd6838
Merge pull request 'master' ( #746 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/746
2024-08-28 09:31:13 +00: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
7e110dd656
Merge pull request 'master' ( #744 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/744
2024-08-28 06:31:17 +00: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
195cc714ab
Merge pull request 'master' ( #742 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/742
2024-08-28 06:19:33 +00: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
37ee6af0e5
Merge pull request 'master' ( #739 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/739
2024-08-27 02:41:06 +00: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
f22e14b1ba
Merge pull request 'master' ( #737 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/737
2024-08-26 15:10:31 +00: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
93d69861bf
Merge pull request 'master' ( #735 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/735
2024-08-26 14:53:02 +00: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
81c24023e9
Merge pull request 'master' ( #733 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/733
2024-08-26 14:14:15 +00: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
83e780c17d
Merge pull request 'master' ( #731 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/731
2024-08-26 12:56:38 +00: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
298d298dc5
Merge pull request 'master' ( #729 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/729
2024-08-26 12:18:57 +00: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
99c93dd582
Merge pull request 'master' ( #727 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/727
2024-08-19 16:57:05 +00: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
f0e25b21d3
Merge pull request 'master' ( #725 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/725
2024-08-18 03:13:08 +00: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
d229f957e5
Merge pull request 'master' ( #723 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/723
2024-08-17 03:27:40 +00: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
4a52ab51df
Merge pull request 'master' ( #721 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/721
2024-08-17 02:41:10 +00: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
a6ee226073
Merge pull request 'master' ( #719 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/719
2024-08-16 16:13:48 +00: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
db720f6d1b
Merge pull request 'master' ( #717 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/717
2024-08-13 15:07:24 +00: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
abda409817
Merge pull request 'master' ( #715 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/715
2024-08-13 10:03:41 +00: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
1183be2987
Merge pull request 'master' ( #713 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/713
2024-08-13 09:21:45 +00: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
7541b37117
Merge pull request 'master' ( #711 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/711
2024-08-13 07:31:51 +00: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
f219635348
Merge pull request 'master' ( #709 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/709
2024-08-13 05:20:02 +00: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
b2774892de
Merge pull request 'master' ( #707 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/707
2024-08-12 16:42:19 +00: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
ea51e6a300
Merge pull request 'master' ( #705 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/705
2024-08-12 15:26:25 +00: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
c799c16663
Merge pull request 'master' ( #703 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/703
2024-08-12 14:38:03 +00: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
becce5dfab
Merge pull request 'master' ( #701 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/701
2024-08-12 13:55:04 +00: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
873458595d
Merge pull request 'master' ( #699 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/699
2024-08-12 07:52:01 +00: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
8408697b57
Merge pull request 'master' ( #697 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/697
2024-08-12 07:30:49 +00: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
04d62635f8
Merge pull request 'master' ( #695 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/695
2024-08-11 16:05:10 +00:00
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
83af021d33
fix : 修复列表页面搜索框排版
2024-08-12 00:04:31 +08:00
12d3fbcda1
Merge pull request 'master' ( #693 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/693
2024-08-11 14:39:28 +00:00
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
3e3d738362
fix : 费用分摊同项目同人不能多次分摊判断
2024-08-11 22:38:15 +08:00
bcb74bf29f
Merge pull request 'master' ( #691 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/691
2024-08-11 14:31:38 +00:00
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
48430951ef
fix : 下拉框箭头显示
2024-08-11 22:31:14 +08:00
443f598173
Merge pull request 'master' ( #689 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/689
2024-08-11 10:38:21 +00:00
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
a1fa0dab6a
fix : 角色替换
2024-08-11 18:37:55 +08:00
8b5a4aba6f
Merge pull request 'master' ( #687 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/687
2024-08-10 14:52:21 +00:00
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
3dbaf21281
fix : 征集说明/专项资金介绍换行格式, 需求征集列表页搜索框间距, 切换账号层级, 需求上报4种情况排版
2024-08-10 22:48:46 +08:00
474cf72333
Merge pull request 'master' ( #685 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/685
2024-08-07 15:48:24 +00:00
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
e4d0b87069
fix : 修改页面排版
2024-08-07 23:47:49 +08:00
8d87e2a7a0
Merge pull request 'master' ( #683 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/683
2024-08-07 15:05:09 +00:00
4b56a92444
Merge pull request 'fix : 选择框为远程搜索解决卡顿问题' ( #682 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/682
2024-08-07 15:04:57 +00:00
3289e799be
fix : 选择框为远程搜索解决卡顿问题
2024-08-07 23:04:46 +08:00
a7367bef2f
Merge pull request 'master' ( #681 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/681
2024-08-07 14:51:34 +00:00
87d3493c34
Merge pull request 'dd' ( #680 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/680
2024-08-07 14:51:22 +00:00
0250e3008b
fix : 选择框为远程搜索解决卡顿问题
2024-08-07 22:51:04 +08:00
cab7311cfb
fix : 新增(单选框)默认否,修复需求上报业务描述换行数据显示,选择框为远程搜索解决卡顿问题
2024-08-07 22:37:41 +08:00
89603d1094
Merge pull request 'dd' ( #679 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/679
2024-08-07 14:00:39 +00:00
5cdec2b677
fix : 修复详情排版
2024-08-07 21:54:46 +08:00
66746458ee
Merge remote-tracking branch 'origin/master'
2024-08-07 17:03:23 +08:00
lilinyuan
892e9c01f1
fix: 修复关闭其他 后地址参数清空bug
2024-08-07 17:02:58 +08:00
203b0c9753
Merge remote-tracking branch 'origin/master'
2024-08-07 15:28:50 +08:00
d9d2d446f6
fix : 修改审批记录打印按钮左边距
2024-08-07 00:46:05 +08:00
bd37eb66a9
Merge pull request 'master' ( #678 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/678
2024-08-06 10:45:57 +00:00
9ed6fc1b94
Merge pull request 'fix : 修改审批记录回退节点icon' ( #677 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/677
2024-08-06 10:45:44 +00:00
74fd0a8610
fix : 修改审批记录回退节点icon
2024-08-06 18:45:31 +08:00
2244e96484
Merge pull request 'master' ( #676 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/676
2024-08-06 10:33:19 +00:00
f99422a8e0
Merge pull request 'fix : drone' ( #675 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/675
2024-08-06 10:33:06 +00:00
d27576ede2
fix : drone
2024-08-06 18:32:46 +08:00
c16d86354b
Merge pull request 'master' ( #674 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/674
2024-08-06 10:27:15 +00:00
d8a01ad3b1
Merge pull request 'fix : 修复详情排版' ( #673 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/673
2024-08-06 10:27:01 +00:00
c61b06e8b2
fix : 修复详情排版
2024-08-06 18:26:47 +08:00
88f12c7fce
Merge pull request 'master' ( #672 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/672
2024-08-06 07:27:28 +00:00
1b1e0a8174
Merge pull request 'fix : 需求上报详情删除重复项,优化台账上方基础信息排版,表格内容少时固定宽度,驳回弹窗'重新提交'改为'发起节点'' ( #671 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/671
2024-08-06 07:06:51 +00:00
33e6ad37b9
fix : 需求上报详情删除重复项,优化台账上方基础信息排版,表格内容少时固定宽度,驳回弹窗'重新提交'改为'发起节点'
2024-08-06 15:06:29 +08:00
zhangkaihuai
522eb5025c
更新 .drone.yml
2024-08-06 07:05:02 +00:00
zhangkaihuai
6aeb846ca4
更新 .drone.yml
2024-08-06 06:58:23 +00:00
zhangkaihuai
f5d8a46829
更新 README.md
2024-08-06 06:31:07 +00:00
a7a146c055
Merge pull request 'master' ( #670 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/670
2024-08-05 12:57:23 +00:00
94155d2ca6
Merge pull request 'fix : 审批人和当前节点合并' ( #669 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/669
2024-08-05 12:57:10 +00:00
ab191e940b
fix : 审批人和当前节点合并
2024-08-05 20:56:43 +08:00
5f95f461a8
Merge pull request 'fix : 修复退回节点弹窗' ( #668 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/668
2024-08-05 12:32:53 +00:00
173b928412
fix : 修复退回节点弹窗
2024-08-05 20:32:33 +08:00
f0d19e535c
Merge pull request 'fix : 修复项目基本信息展示' ( #667 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/667
2024-08-05 11:14:21 +00:00
63d8feb712
fix : 修复项目基本信息展示
2024-08-05 19:10:29 +08:00
ebccaaa12f
Merge pull request 'dd' ( #666 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/666
2024-08-05 09:26:35 +00:00
147d66c756
fix : 修复角色替换接口
2024-08-05 17:26:20 +08:00
04fff31b3a
fix : 修改'经费预算'文字及页面排版
2024-08-05 17:22:23 +08:00
96529cccc6
Merge pull request 'master' ( #665 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/665
2024-08-04 17:02:22 +00:00
848f167bb6
Merge pull request 'feat : 对接人用户替换' ( #664 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/664
2024-08-04 17:02:10 +00:00
ee869f3c34
feat : 对接人用户替换
2024-08-05 01:01:35 +08:00
clay
21a111ae8f
Merge pull request 'feat : 研发人员选择' ( #663 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/663
2024-08-04 13:02:08 +00:00
clay
5f6f1a7912
feat : 研发人员选择
2024-08-04 21:01:43 +08:00
5912f37ebb
Merge pull request 'master' ( #662 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/662
2024-08-03 13:33:37 +00:00
66bd341692
Merge pull request 'feat : 审批记录打印' ( #661 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/661
2024-08-03 13:33:26 +00:00
39b71a581a
Merge pull request 'master' ( #660 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/660
2024-08-03 13:32:57 +00:00
28257ceefe
feat : 审批记录打印
2024-08-03 21:32:00 +08:00
e2eed22d73
Merge pull request 'dd' ( #659 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/659
2024-08-03 13:30:46 +00:00
790cac67ef
feat : 审批记录打印
2024-08-03 21:30:26 +08:00
b6ddafdd25
feat : 审批记录打印
2024-08-03 21:29:33 +08:00
clay
bda93c9744
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/components/NameCircle.vue
2024-08-03 20:56:30 +08:00
clay
2634e9b70c
feat : 打印
2024-08-03 20:55:26 +08:00
2f3d47e349
Merge pull request 'master' ( #658 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/658
2024-08-03 11:30:35 +00:00
f7fcd79251
Merge pull request 'fix : 修复阶段变更, 项目立项/验收部门分管领导编辑回显' ( #657 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/657
2024-08-03 11:30:23 +00:00
25f4f33cb0
fix : 修复阶段变更, 项目立项/验收部门分管领导编辑回显
2024-08-03 19:30:12 +08:00
e06e2d553e
Merge pull request 'master' ( #656 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/656
2024-08-03 10:32:42 +00:00
a5e3e269a1
Merge pull request 'fix : 修复需求上报详情排版' ( #655 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/655
2024-08-03 10:32:29 +00:00
9d0d722880
fix : 修复需求上报详情排版
2024-08-03 18:29:05 +08:00
6ac90f3841
Merge pull request 'master' ( #654 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/654
2024-08-03 10:21:39 +00:00
e0bfe67c7e
Merge pull request 'fix : 修复移动端详情排版' ( #653 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/653
2024-08-03 10:21:27 +00:00
eaed989525
fix : 修复移动端详情排版
2024-08-03 18:21:13 +08:00
f08f754002
Merge pull request 'master' ( #652 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/652
2024-08-03 06:17:21 +00:00
77ff2143c3
Merge pull request 'fix : 修复需求上报详情排版' ( #651 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/651
2024-08-03 06:17:11 +00:00
a55031ed70
fix : 修复需求上报详情排版
2024-08-03 14:16:53 +08:00
b3c3156a08
Merge pull request 'master' ( #650 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/650
2024-08-03 05:22:06 +00:00
76d4254f5e
Merge pull request 'fix : 需求上报详情加上项目影响, 需求/征集/阶段变更/分摊/专项资金/项目立项/验收/结项编辑加上审批记录, 新增时审批记录加上空提示' ( #649 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/649
2024-08-03 05:21:54 +00:00
31928abbd1
fix : 需求上报详情加上项目影响, 需求/征集/阶段变更/分摊/专项资金/项目立项/验收/结项编辑加上审批记录, 新增时审批记录加上空提示
2024-08-03 13:21:18 +08:00
df349f1480
Merge pull request 'master' ( #648 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/648
2024-08-02 16:39:43 +00:00
15ec2d909c
Merge pull request 'fix : 修复部门分管领导回显,需求上报排版' ( #647 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/647
2024-08-02 16:39:28 +00:00
fbfbe5c328
fix : 修复部门分管领导回显,需求上报排版
2024-08-03 00:36:51 +08:00
067ff09c73
Merge pull request 'master' ( #646 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/646
2024-08-02 11:42:37 +00:00
36e76b15b9
Merge pull request 'dd' ( #645 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/645
2024-08-02 11:42:22 +00:00
6e612e1f7a
fix : 修复抄送节点
2024-08-02 19:41:51 +08:00
9b698cfdb3
Merge remote-tracking branch 'origin/master'
2024-08-02 19:39:02 +08:00
clay
45e0bf3c6c
Merge pull request 'feat : 抄送和if判断' ( #644 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/644
2024-08-02 11:37:35 +00:00
clay
5111897d13
feat : 抄送和if判断
2024-08-02 19:36:37 +08:00
38631df3f9
fix : 修复编辑流程访问接口
2024-08-02 00:09:19 +08:00
1e41101f9b
Merge pull request 'master' ( #643 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/643
2024-08-01 14:16:57 +00:00
36bb362fd7
Merge pull request 'fix : 修复页面排版及项目管理的公司查询' ( #642 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/642
2024-08-01 14:16:45 +00:00
2f42a7464a
fix : 修复页面排版及项目管理的公司查询
2024-08-01 22:16:30 +08:00
db2f0d8daf
Merge pull request 'master' ( #641 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/641
2024-08-01 09:01:27 +00:00
ff668b1887
Merge pull request 'fix : 表格前方加上序号' ( #640 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/640
2024-08-01 09:01:18 +00:00
a4f94099af
fix : 表格前方加上序号
2024-08-01 17:00:48 +08:00
96bcb30868
Merge pull request 'master' ( #639 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/639
2024-07-26 17:22:27 +00:00
40de9f0a4c
Merge pull request 'fix : word表格预览手机端宽度适配' ( #638 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/638
2024-07-26 17:22:11 +00:00
d265ef5a32
fix : word表格预览手机端宽度适配
2024-07-27 01:18:05 +08:00
a21f061589
Merge pull request 'feat : 台账模板下载' ( #637 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/637
2024-07-26 11:46:21 +00:00
58c3419b35
feat : 台账模板下载
2024-07-26 19:46:06 +08:00
5a443bfab9
Merge pull request 'master' ( #636 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/636
2024-07-25 16:12:20 +00:00
d92bcfe0aa
Merge pull request 'fix : 多图片格式预览' ( #635 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/635
2024-07-25 16:12:10 +00:00
055310b6e7
fix : 多图片格式预览
2024-07-26 00:11:44 +08:00
55782df345
Merge pull request 'master' ( #634 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/634
2024-07-25 15:14:42 +00:00
e0e5111f32
Merge pull request 'fix : 取消需求上报单文件权限' ( #633 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/633
2024-07-25 15:14:30 +00:00
4acd0cbab1
fix : 取消需求上报单文件权限
2024-07-25 23:14:20 +08:00
925b4a2eb4
Merge pull request 'master' ( #632 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/632
2024-07-25 14:48:39 +00:00
39cb9400f6
Merge pull request 'fix : 修复抄送人回显及取消箭头' ( #631 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/631
2024-07-25 14:10:27 +00:00
c6ddba8702
fix : 修复抄送人回显及取消箭头
2024-07-25 22:10:08 +08:00
clay
0fe2bb42ae
Merge remote-tracking branch 'origin/master'
2024-07-25 21:24:34 +08:00
clay
e0b937fce9
feat : 抄送
2024-07-25 21:24:26 +08:00
6f505ba281
Merge pull request 'master' ( #630 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/630
2024-07-25 11:36:35 +00:00
c740929622
Merge pull request 'feat : 需求上报,项目立项,验收加上分管领导选择' ( #629 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/629
2024-07-25 11:36:16 +00:00
8901053fd6
feat : 需求上报,项目立项,验收加上分管领导选择
2024-07-25 19:36:06 +08:00
15689dfbc1
Merge pull request 'fix : 修复编辑需求征集, 所有公司回显' ( #628 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/628
2024-07-25 09:44:32 +00:00
ea660fff65
fix : 修复编辑需求征集, 所有公司回显
2024-07-25 17:44:22 +08:00
303e981a0c
Merge pull request 'fix : 修复费用台账公司搜索,项目管理前置流程逗号分隔' ( #627 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/627
2024-07-25 09:09:23 +00:00
bab9597739
fix : 修复费用台账公司搜索,项目管理前置流程逗号分隔
2024-07-25 17:09:05 +08:00
1430b1eae7
Merge pull request 'master' ( #626 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/626
2024-07-24 16:53:36 +00:00
45104ecc87
Merge pull request 'fix : 修复流程图icon显示' ( #625 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/625
2024-07-24 16:53:19 +00:00
6bb55520cf
fix : 修复流程图icon显示
2024-07-25 00:52:51 +08:00
95b2193393
Merge pull request 'master' ( #624 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/624
2024-07-24 16:38:26 +00:00
74d2033857
Merge pull request 'fix : 修复项目归档切换问题' ( #623 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/623
2024-07-24 16:38:17 +00:00
8e8116e869
fix : 修复项目归档切换问题
2024-07-25 00:38:00 +08:00
7df05a46f2
Merge pull request 'master' ( #622 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/622
2024-07-24 14:31:12 +00:00
5754709a21
Merge pull request 'fix : 修复审核意见显示' ( #621 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/621
2024-07-24 14:30:38 +00:00
614bd328d1
fix : 修复审核意见显示
2024-07-24 22:29:53 +08:00
cc322f3352
Merge pull request 'fix : 还原drone.yml文件' ( #620 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/620
2024-07-24 14:10:10 +00:00
328c75b2e4
fix : 还原drone.yml文件
2024-07-24 22:09:57 +08:00
d6f53a69da
Merge pull request 'fix : 下载新依赖' ( #619 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/619
2024-07-24 13:50:51 +00:00
1716a3a562
fix : 下载新依赖
2024-07-24 21:50:31 +08:00
b5933a9016
Merge pull request 'master' ( #618 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/618
2024-07-24 13:43:19 +00:00
5048c638b8
Merge remote-tracking branch 'origin/master'
2024-07-24 21:43:02 +08:00
b4e9359165
fix : 下载新依赖
2024-07-24 21:42:53 +08:00
24f4a4a498
Merge pull request 'master' ( #617 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/617
2024-07-24 13:41:16 +00:00
42befadca5
Merge pull request 'fix : 下载新依赖' ( #616 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/616
2024-07-24 13:40:53 +00:00
da2721ca56
fix : 下载新依赖
2024-07-24 21:40:29 +08:00
19db2667c2
Merge pull request 'master' ( #615 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/615
2024-07-24 13:32:55 +00:00
291f91bc61
Merge pull request 'fix : 下载新依赖' ( #614 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/614
2024-07-24 13:32:45 +00:00
0c1aa248d5
fix : 下载新依赖
2024-07-24 21:32:33 +08:00
f617b815a1
Merge pull request 'master' ( #613 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/613
2024-07-24 13:22:31 +00:00
a13006d630
Merge pull request 'fix : 修复专项资金文件预览,优化上报前置流程展示' ( #612 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/612
2024-07-24 13:22:14 +00:00
clay
fc0451ca32
feat : 动态前置流程
2024-07-24 21:21:36 +08:00
5664faccfe
fix : 修复专项资金文件预览,优化上报前置流程展示
2024-07-24 20:05:29 +08:00
d769ec9755
Merge pull request 'feat : 前置流程组件' ( #611 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/611
2024-07-24 11:42:33 +00:00
b9de011871
feat : 前置流程组件
2024-07-24 19:42:20 +08:00
d2e672e761
Merge pull request 'feat : 文件预览,项目详情文件表格展示' ( #610 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/610
2024-07-24 10:18:11 +00:00
6cc409d744
feat : 文件预览,项目详情文件表格展示
2024-07-24 18:17:55 +08:00
clay
9506d3e0f6
feat : 流程判断条件添加
2024-07-24 18:14:38 +08:00
clay
b90ed53437
feat : 流程判断条件添加
2024-07-24 18:10:37 +08:00
clay
fe8ca80452
feat : 需求汇总年度计划审批前置流程选择
2024-07-24 00:28:42 +08:00
clay
1194f04eb6
feat : 需求汇总年度计划审批前置流程选择
2024-07-23 22:58:43 +08:00
clay
c7866f2e5e
feat : 节点参数设置
2024-07-23 19:18:29 +08:00
clay
e5452741e9
Merge remote-tracking branch 'origin/master'
2024-07-23 17:42:31 +08:00
ac8cbdc991
Merge pull request 'master' ( #609 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/609
2024-07-23 09:31:02 +00:00
d87dd8985c
Merge pull request 'fix : 修复组织机构显示及部门副职不能选择bug' ( #608 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/608
2024-07-23 09:30:43 +00:00
342b64273c
fix : 修复组织机构显示及部门副职不能选择bug
2024-07-23 17:30:27 +08:00
clay
3685174117
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/api/workflow/process-user.js
# src/views/system/organizationalStructure/index.vue
2024-07-23 17:02:57 +08:00
lilinyuan
7ee43a9b4d
feat: up serachForm
2024-07-23 14:05:31 +08:00
84e5c2dd7e
Merge pull request 'master' ( #607 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/607
2024-07-23 05:28:54 +00:00
ad7ca888a9
Merge pull request 'dd' ( #606 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/606
2024-07-23 05:28:39 +00:00
838f2edf7e
fix : 数据预览时左对齐
2024-07-22 23:06:20 +08:00
3c1fcc327c
fix : 征集公司校验,单文件显示改为表格,手机端审批后刷新,需求征集回车触发搜索,组织机构管理搜索
2024-07-22 20:39:26 +08:00
clay
e576000267
feat : 科创部直接跳过审批节点
2024-07-19 14:51:07 +08:00
clay
9a66c333c7
Merge pull request 'master' ( #605 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/605
2024-07-19 06:23:35 +00:00
clay
ae6da83a1a
feat : 科创部直接跳过审批节点
2024-07-19 14:23:00 +08:00
clay
bd01e4c94b
feat : 科创部直接跳过审批节点
2024-07-19 14:22:17 +08:00
lilinyuan
9783ca8506
feat: 表单组件添加回车事件
2024-07-19 11:10:51 +08:00
3580fb41f3
Merge pull request 'feat : 部门副职用户选择框无法弹出' ( #604 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/604
2024-07-19 02:11:13 +00:00
clay
264f6283dc
feat : 部门副职用户选择框无法弹出
2024-07-19 10:07:39 +08:00
dc822bba07
Merge pull request 'master' ( #603 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/603
2024-07-18 17:54:35 +00:00
acf261b58b
Merge pull request 'feat : 台账导入' ( #602 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/602
2024-07-18 17:54:19 +00:00
fde9ba3781
feat : 台账导入
2024-07-19 01:53:51 +08:00
1db5d4b11f
Merge pull request 'master' ( #601 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/601
2024-07-18 17:06:06 +00:00
04a65c6932
Merge pull request 'dd' ( #600 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/600
2024-07-18 16:43:39 +00:00
e9333f7859
feat : 台账导入
2024-07-19 00:43:11 +08:00
0a2004e3ce
feat : 台账导入
2024-07-19 00:41:15 +08:00
1ca25d8ec4
Merge pull request 'master' ( #599 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/599
2024-07-18 14:56:29 +00:00
b69a147c61
Merge pull request 'feat : 台账导入' ( #598 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/598
2024-07-18 14:56:21 +00:00
5deae5d846
feat : 台账导入
2024-07-18 22:56:08 +08:00
a9c7977347
Merge pull request 'master' ( #597 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/597
2024-07-18 14:07:11 +00:00
c2c60d01af
Merge pull request 'fix : 修复页面bug' ( #596 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/596
2024-07-18 14:06:59 +00:00
9d5c393ebe
fix : 修复页面bug
2024-07-18 22:06:23 +08:00
3c471b1124
Merge pull request 'master' ( #595 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/595
2024-07-18 09:49:25 +00:00
3ec7a9c78e
Merge pull request 'dd' ( #594 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/594
2024-07-18 09:49:11 +00:00
5dc25d1480
fix : 项目实施台账刷新
2024-07-18 17:48:56 +08:00
ad3e7479f4
fix : 项目实施台账时间搜索
2024-07-18 17:33:54 +08:00
2b94151780
Merge pull request 'master' ( #593 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/593
2024-07-18 08:57:15 +00:00
c082ffc884
Merge pull request 'fix : 项目实施台账时间搜索' ( #592 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/592
2024-07-18 08:56:59 +00:00
618cc8cb87
fix : 项目实施台账时间搜索
2024-07-18 16:56:38 +08:00
9088a792d1
Merge pull request 'fix : 附件上传修复' ( #591 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/591
2024-07-18 08:15:27 +00:00
8e91feb616
fix : 附件上传修复
2024-07-18 16:15:11 +08:00
ff09ed8c8a
Merge pull request 'fix : 附件上传修复' ( #590 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/590
2024-07-18 07:22:17 +00:00
203b53936f
fix : 附件上传修复
2024-07-18 15:21:41 +08:00
fdb76c31a8
Merge pull request 'master' ( #589 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/589
2024-07-18 06:53:26 +00:00
f154e2789b
Merge remote-tracking branch 'origin/master'
2024-07-18 14:52:23 +08:00
b4cfb8a5c6
fix : 附件上传修复
2024-07-18 14:52:06 +08:00
484efa5854
Merge pull request 'master' ( #588 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/588
2024-07-18 04:27:58 +00:00
6c874cac48
Merge pull request 'fix : 修复项目立项校验' ( #587 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/587
2024-07-18 04:27:39 +00:00
63eba1d0dc
Merge remote-tracking branch 'origin/master'
2024-07-18 12:22:45 +08:00
094474b680
fix : 修复项目立项校验
2024-07-18 12:19:43 +08:00
0cfe4a8698
Merge pull request 'fix : 修复项目立项校验' ( #586 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/586
2024-07-18 03:45:59 +00:00
60d9b958bc
fix : 修复项目立项校验
2024-07-18 11:45:30 +08:00
07b3457409
Merge pull request 'master' ( #585 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/585
2024-07-17 15:11:51 +00:00
1591e5d057
Merge pull request 'feat : 刷新缓存' ( #584 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/584
2024-07-17 15:11:41 +00:00
0c3580768b
feat : 刷新缓存
2024-07-17 23:11:26 +08:00
1150fdac86
Merge pull request 'master' ( #583 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/583
2024-07-17 14:48:03 +00:00
2793a62628
Merge pull request 'feat : 刷新缓存' ( #582 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/582
2024-07-17 14:47:52 +00:00
cccd370671
feat : 刷新缓存
2024-07-17 22:47:38 +08:00
930684ac01
Merge pull request 'master' ( #581 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/581
2024-07-17 14:11:32 +00:00
ec86d11537
Merge pull request 'fix : 修复年度计划创建及状态' ( #580 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/580
2024-07-17 13:21:00 +00:00
2dea264c51
fix : 修复年度计划创建及状态
2024-07-17 21:20:48 +08:00
760d452311
Merge pull request 'master' ( #579 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/579
2024-07-17 09:29:50 +00:00
7dbaf5ca48
Merge pull request 'fix : 还原需求征集详情按钮显示' ( #578 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/578
2024-07-17 09:29:38 +00:00
fb469d5139
fix : 还原需求征集详情按钮显示
2024-07-17 17:29:24 +08:00
6f0800162b
Merge pull request 'master' ( #577 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/577
2024-07-17 09:21:41 +00:00
fbccc01bbc
Merge pull request 'feat : 需求征集详情审核通过后加上需求上报按钮' ( #576 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/576
2024-07-17 09:21:31 +00:00
92de396d12
feat : 需求征集详情审核通过后加上需求上报按钮
2024-07-17 17:20:45 +08:00
8f3432f9a0
Merge pull request 'master' ( #575 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/575
2024-07-16 13:57:08 +00:00
a1dbcf8dce
Merge remote-tracking branch 'origin/master'
2024-07-16 21:56:48 +08:00
ad4f2f5ba9
fix : 人员组件和组织结构组件改为懒加载模式
2024-07-16 21:56:39 +08:00
ae1c614ee8
Merge pull request 'master' ( #574 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/574
2024-07-16 13:11:29 +00:00
da10fca727
Merge pull request 'fix : 修复人员选择框' ( #573 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/573
2024-07-16 13:11:20 +00:00
a934176986
fix : 修复人员选择框
2024-07-16 21:10:55 +08:00
7ceb63b02f
Merge pull request 'master' ( #572 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/572
2024-07-16 13:07:31 +00:00
c60245fb79
Merge pull request 'fix : 修复组织机构左侧高亮' ( #571 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/571
2024-07-16 13:07:21 +00:00
280137b7e2
fix : 修复组织机构左侧高亮
2024-07-16 21:07:10 +08:00
a0fa5d43f1
Merge pull request 'master' ( #570 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/570
2024-07-16 12:36:35 +00:00
36440928ae
Merge pull request 'feat : 项目管理表单缓存,文件回显,个人中心icon排版' ( #569 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/569
2024-07-16 12:36:23 +00:00
b77253b0cb
feat : 项目管理表单缓存,文件回显,个人中心icon排版
2024-07-16 20:36:06 +08:00
008b3c942a
Merge pull request 'master' ( #568 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/568
2024-07-15 14:24:24 +00:00
clay
d4ba4bc7c2
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/layout/navbar/index.vue
2024-07-15 22:23:54 +08:00
clay
80116c77f6
feat : 账号切换刷新修改
2024-07-15 22:23:09 +08:00
3cc9f40baf
Merge pull request 'master' ( #567 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/567
2024-07-15 14:07:17 +00:00
d923330b77
Merge pull request 'feat : 用户个人中心密码校验及专项资金关联项目是否展示' ( #566 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/566
2024-07-15 14:07:05 +00:00
4f41c43d37
feat : 用户个人中心密码校验及专项资金关联项目是否展示
2024-07-15 22:02:43 +08:00
ca030e42d4
Merge pull request 'master' ( #565 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/565
2024-07-15 13:47:14 +00:00
45fccc9d57
Merge pull request 'feat : 用户个人中心展示及密码设置' ( #564 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/564
2024-07-15 13:47:02 +00:00
8f993d0644
feat : 用户个人中心展示及密码设置
2024-07-15 21:46:40 +08:00
7b6ca29a93
Merge pull request 'master' ( #563 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/563
2024-07-15 12:45:49 +00:00
587c3c6477
Merge pull request 'dd' ( #562 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/562
2024-07-15 12:45:24 +00:00
1f631ea65d
fix : 注释log输出
2024-07-15 20:45:09 +08:00
4d9007c87e
fix : 修复年度计划细节,表格高度
2024-07-15 20:44:48 +08:00
8538f7d43f
Merge pull request 'master' ( #561 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/561
2024-07-15 11:47:14 +00:00
f4cf15656e
Merge pull request 'fix : 修复阶段变更附件显示' ( #560 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/560
2024-07-15 11:47:01 +00:00
55f12a2fb8
fix : 修复阶段变更附件显示
2024-07-15 19:46:34 +08:00
9f8e07c18a
Merge pull request 'master' ( #559 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/559
2024-07-15 11:13:19 +00:00
2616b916db
Merge pull request 'fix : 修复项目详情排版,组织机构管理排版' ( #558 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/558
2024-07-15 11:13:06 +00:00
6ac1dba2b5
fix : 修复项目详情排版,组织机构管理排版
2024-07-15 19:12:30 +08:00
lilinyuan
f6dcb6b71b
fix: 页面缓存
2024-07-15 09:47:02 +08:00
a2212ac8e6
Merge pull request 'master' ( #557 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/557
2024-07-14 16:03:48 +00:00
7e1f5ca820
Merge pull request 'feat : 组织机构管理公司详情' ( #555 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/555
2024-07-14 16:03:17 +00:00
5342a4d891
feat : 组织机构管理公司详情
2024-07-15 00:02:58 +08:00
d6c7538c36
Merge pull request 'master' ( #554 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/554
2024-07-14 14:51:23 +00:00
602e69007c
Merge pull request 'fix : 修复需求上报排版' ( #553 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/553
2024-07-14 14:51:12 +00:00
04bbedf025
fix : 修复需求上报排版
2024-07-14 22:50:58 +08:00
150ac2afcb
Merge pull request 'master' ( #552 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/552
2024-07-14 14:37:17 +00:00
6ab2b5f947
Merge pull request 'fix : 修改需求征集状态权限' ( #551 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/551
2024-07-14 14:36:52 +00:00
a64e6827c1
fix : 修改需求征集状态权限
2024-07-14 22:36:40 +08:00
8173bfb6fb
Merge pull request 'fix : 修改首页排版' ( #550 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/550
2024-07-14 14:35:39 +00:00
599fe5febb
fix : 修改首页排版
2024-07-14 22:35:12 +08:00
8313be513b
Merge pull request 'fix : 修复项目立项回车搜索' ( #549 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/549
2024-07-14 11:21:03 +00:00
cef1d50833
fix : 修复项目立项回车搜索
2024-07-14 19:08:49 +08:00
54db74b033
Merge pull request 'fix : 修复项目立项校验' ( #548 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/548
2024-07-14 11:07:44 +00:00
cdb7811133
fix : 修复项目立项校验
2024-07-14 19:07:30 +08:00
wenhua
4c91a6a336
Merge branch 'master' of http://git.feashow.cn/clay/mosr-web
2024-07-14 18:18:36 +08:00
wenhua
c6222e0528
fix: 增加tag组件兼容性; 调整steps样式
2024-07-14 18:18:32 +08:00
a7d8bf63ca
Merge pull request 'fix : 修复项目立项校验' ( #547 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/547
2024-07-14 09:50:02 +00:00
29180cfb9f
fix : 修复项目立项校验
2024-07-14 17:48:26 +08:00
02bf07f4da
Merge pull request 'dd' ( #546 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/546
2024-07-14 08:43:41 +00:00
8791d220e6
fix : 组织机构样式修改
2024-07-14 16:43:14 +08:00
88ab0d3526
fix : 修改项目立项校验
2024-07-14 15:57:56 +08:00
04cc61047a
fix : 文件表格高度, 组织机构管理
2024-07-14 15:55:55 +08:00
925a8045f4
fix : 台账更新权限
2024-07-13 17:41:37 +08:00
3c12bafa59
fix : 所有下拉框, 加上搜索删除
2024-07-13 17:10:41 +08:00
609df9855a
Merge pull request 'master' ( #545 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/545
2024-07-13 06:19:19 +00:00
f1237de72a
Merge pull request 'fix : 上传文件表格滚动时, 表头固定' ( #544 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/544
2024-07-13 06:19:07 +00:00
b1309fae57
fix : 上传文件表格滚动时, 表头固定
2024-07-13 14:18:47 +08:00
da2f27bc72
Merge pull request 'master' ( #543 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/543
2024-07-13 05:24:06 +00:00
e45c71ccd0
Merge pull request 'fix : 上传文件表格滚动时, 表头固定' ( #542 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/542
2024-07-13 05:23:53 +00:00
3e1db9c1a4
fix : 上传文件表格滚动时, 表头固定
2024-07-13 13:23:28 +08:00
eeb821de24
Merge pull request 'master' ( #541 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/541
2024-07-13 05:01:06 +00:00
6c55b66dde
Merge pull request 'fix : 征集公司居中' ( #540 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/540
2024-07-13 05:00:23 +00:00
e4ecd22c2e
fix : 征集公司居中
2024-07-13 13:00:04 +08:00
clay
22d1c6fc46
Merge remote-tracking branch 'origin/master'
2024-07-12 15:04:02 +08:00
clay
1c095d3fcc
feat : 调整布局
2024-07-12 15:03:54 +08:00
a754751832
Merge pull request 'master' ( #539 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/539
2024-07-12 06:06:36 +00:00
d49b771101
Merge pull request 'fix : 前置流程全选' ( #538 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/538
2024-07-12 06:06:27 +00:00
8ac168023b
fix : 前置流程全选
2024-07-12 14:06:15 +08:00
5235f23365
Merge pull request 'master' ( #537 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/537
2024-07-12 04:11:04 +00:00
e7090f7cd8
Merge pull request 'fix : 前置流程enter的bug' ( #536 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/536
2024-07-12 04:10:43 +00:00
7f581ef763
fix : 前置流程enter的bug
2024-07-12 12:10:18 +08:00
clay
7f684fa085
Merge pull request 'feat : 调整简答布局' ( #535 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/535
2024-07-12 03:53:06 +00:00
clay
fa05c22efc
feat : 调整简答布局
2024-07-12 11:52:20 +08:00
clay
d674a6ea12
Merge pull request 'feat : 流程渲染与有任务跳转到首页' ( #534 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/534
2024-07-12 02:07:47 +00:00
clay
2856fa4785
feat : 流程渲染与有任务跳转到首页
2024-07-12 10:06:43 +08:00
b315b667e9
Merge pull request 'master' ( #533 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/533
2024-07-11 16:00:00 +00:00
0a40d4d068
Merge pull request 'fix : 表格更新负责人回显' ( #532 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/532
2024-07-11 15:59:51 +00:00
649445f784
fix : 表格更新负责人回显
2024-07-11 23:59:39 +08:00
798c42beb9
Merge pull request 'master' ( #531 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/531
2024-07-11 15:49:43 +00:00
bdc23982ce
Merge pull request 'fix : 项目立项页面细节优化' ( #530 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/530
2024-07-11 15:49:34 +00:00
45220348d3
fix : 项目立项页面细节优化
2024-07-11 23:49:15 +08:00
2613884a89
Merge pull request 'master' ( #529 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/529
2024-07-11 15:32:53 +00:00
dfe422345e
Merge pull request 'fix : 项目立项页面细节优化' ( #528 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/528
2024-07-11 15:32:44 +00:00
80cd6363ab
fix : 项目立项页面细节优化
2024-07-11 23:31:59 +08:00
9a9702227c
Merge pull request 'master' ( #527 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/527
2024-07-11 15:01:06 +00:00
0b6e825bbd
Merge pull request 'fix : 项目立项页面细节优化' ( #526 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/526
2024-07-11 15:00:36 +00:00
5dacc784ea
fix : 项目立项页面细节优化
2024-07-11 23:00:18 +08:00
74ad7e9eb9
Merge pull request 'master' ( #525 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/525
2024-07-11 14:48:29 +00:00
68938c7ff0
Merge pull request 'fix : 项目立项页面细节优化' ( #524 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/524
2024-07-11 14:48:17 +00:00
2722c9915b
fix : 项目立项页面细节优化
2024-07-11 22:47:53 +08:00
cdb984a439
Merge pull request 'master' ( #523 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/523
2024-07-11 14:29:08 +00:00
97a81b6670
Merge pull request 'fix : 项目立项页面细节优化' ( #522 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/522
2024-07-11 14:28:59 +00:00
61e7e096a4
fix : 项目立项页面细节优化
2024-07-11 22:28:43 +08:00
clay
3401c8a5e3
feat : 年度计划删除操作
2024-07-11 22:22:20 +08:00
ab33f09538
Merge pull request 'master' ( #521 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/521
2024-07-11 13:09:38 +00:00
480d419a6c
Merge pull request 'fix : 项目立项页面细节优化' ( #520 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/520
2024-07-11 13:09:26 +00:00
37755d62b1
fix : 项目立项页面细节优化
2024-07-11 21:09:10 +08:00
152da3c0e4
Merge pull request 'master' ( #519 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/519
2024-07-11 08:40:46 +00:00
06e175cd8c
Merge pull request 'dd' ( #518 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/518
2024-07-11 08:40:31 +00:00
ddcbc02025
fix : 项目立项页面细节优化
2024-07-11 16:40:11 +08:00
7c63c5e791
Merge remote-tracking branch 'origin/master'
2024-07-11 14:48:27 +08:00
clay
bd165769de
Merge pull request 'master' ( #517 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/517
2024-07-10 15:20:26 +00:00
clay
7bf6336a46
fix : 年度计划删除
2024-07-10 23:19:41 +08:00
wenhua
50a4e21a99
Merge branch 'master' of http://git.feashow.cn/clay/mosr-web
2024-07-10 22:18:43 +08:00
wenhua
e8d3148937
fix: 调整样式
2024-07-10 22:18:40 +08:00
zhangkaihuai
dfdeaec16c
Merge remote-tracking branch 'origin/master'
2024-07-10 18:09:02 +08:00
zhangkaihuai
42fd8d9740
feat:增加项目负责人和成员选择功能
...
在项目申请详情中,新增了项目负责人和成员的选择功能,使用user-picker组件实现。
同时,对前置流程的展示进行了调整,并完善了审批记录和流程图的相关逻辑。
2024-07-10 18:08:51 +08:00
17994928bf
Merge pull request 'fix : 细节优化' ( #516 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/516
2024-07-10 08:57:20 +00:00
5efa1b8764
Merge remote-tracking branch 'origin/master'
2024-07-10 16:57:08 +08:00
71b9065f29
fix : 细节优化
2024-07-10 16:56:28 +08:00
zhangkaihuai
b1616b716c
Merge remote-tracking branch 'origin/master'
2024-07-10 16:53:48 +08:00
wenhua
c266e27c51
Merge pull request 'fix: bug修复' ( #515 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/515
2024-07-09 15:32:00 +00:00
wenhua
7836450a10
fix: bug修复
2024-07-09 23:31:10 +08:00
1bfa0095ae
Merge pull request 'master' ( #514 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/514
2024-07-09 11:35:37 +00:00
cbc97891b8
Merge pull request 'fix : 修复年度计划详情展示' ( #513 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/513
2024-07-09 11:35:25 +00:00
7a38c34da9
fix : 修复年度计划详情展示
2024-07-09 19:35:04 +08:00
33c4e4baa7
Merge pull request 'master' ( #512 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/512
2024-07-07 15:36:51 +00:00
9f06ecbc62
Merge pull request 'fix : 修复专项资金权限, 费用台账时间搜索' ( #511 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/511
2024-07-07 15:36:36 +00:00
23975e056a
fix : 修复专项资金权限, 费用台账时间搜索
2024-07-07 23:36:20 +08:00
eb5df00b45
Merge pull request 'master' ( #510 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/510
2024-07-06 20:13:40 +00:00
ac409710d8
Merge pull request 'fix : 修复归档-附件搜索传参问题' ( #509 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/509
2024-07-06 20:13:29 +00:00
2c8de29fcd
fix : 修复归档-附件搜索传参问题
2024-07-07 04:12:06 +08:00
61be47b3d4
Merge pull request 'master' ( #508 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/508
2024-07-06 19:31:43 +00:00
c5a3bc9b58
Merge pull request 'fix : 修复征集公司选择' ( #507 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/507
2024-07-06 19:31:33 +00:00
09d95babd0
fix : 修复征集公司选择
2024-07-07 03:31:18 +08:00
e5356787be
Merge pull request 'master' ( #506 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/506
2024-07-06 18:44:08 +00:00
584adb63d4
Merge pull request 'dd' ( #505 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/505
2024-07-06 18:43:56 +00:00
06090fc00b
fix : 修复费用台账时间搜索
2024-07-07 02:43:40 +08:00
fce1bfdb6f
fix : 修复年度计划编辑功能
2024-07-07 02:36:40 +08:00
f842bf375b
Merge pull request 'master' ( #504 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/504
2024-07-06 18:23:46 +00:00
c10f7b2398
Merge pull request 'fix : 修复台账基础信息展示及年度计划通过后跳转' ( #503 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/503
2024-07-06 18:22:36 +00:00
b21719aaa0
fix : 修复台账基础信息展示及年度计划通过后跳转
2024-07-07 02:22:17 +08:00
wenhua
9b19de0ff9
feat: 添加需求汇总详情
2024-07-07 00:56:20 +08:00
9ef88a2d17
Merge pull request 'master' ( #502 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/502
2024-07-06 16:47:04 +00:00
10e5db2cd6
Merge pull request 'fix : 修复需求上报预期成果形式回显' ( #501 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/501
2024-07-06 16:46:43 +00:00
2a25942cdf
fix : 修复需求上报预期成果形式回显
2024-07-07 00:46:19 +08:00
wenhua
a5864a32ce
feat: 添加详情静态路由
2024-07-07 00:45:16 +08:00
9688322f69
Merge pull request 'master' ( #500 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/500
2024-07-06 16:06:07 +00:00
5d661e1276
Merge pull request 'fix : 修复需求上报预期成果形式回显' ( #499 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/499
2024-07-06 16:05:57 +00:00
8feef06c11
fix : 修复需求上报预期成果形式回显
2024-07-07 00:05:47 +08:00
19a61159e4
Merge pull request 'master' ( #498 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/498
2024-07-06 15:29:56 +00:00
dd5fb4f44a
Merge pull request 'fix : 修复征集公司回显' ( #497 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/497
2024-07-06 15:29:45 +00:00
57776764f8
fix : 修复征集公司回显
2024-07-06 23:29:33 +08:00
beb727760b
Merge pull request 'master' ( #496 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/496
2024-07-06 15:11:08 +00:00
ce5297145b
Merge pull request 'fix : 修复文件删除功能' ( #495 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/495
2024-07-06 15:10:57 +00:00
3c564b600b
fix : 修复文件删除功能
2024-07-06 23:10:45 +08:00
e7ee3fbc9d
Merge pull request 'fix : 修复文件删除功能' ( #494 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/494
2024-07-06 15:09:04 +00:00
edec70ebbb
fix : 修复文件删除功能
2024-07-06 23:08:36 +08:00
aa2631b7de
Merge pull request 'master' ( #493 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/493
2024-07-06 14:39:17 +00:00
13cbd1c7cd
Merge pull request 'fix : 年度计划权限按钮' ( #492 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/492
2024-07-06 14:38:49 +00:00
06524178c7
fix : 年度计划权限按钮
2024-07-06 22:38:31 +08:00
564084cb02
Merge pull request 'fix : 年度计划权限按钮' ( #491 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/491
2024-07-06 14:38:05 +00:00
e5777b55bc
fix : 年度计划权限按钮
2024-07-06 22:37:51 +08:00
cfe89816f4
Merge pull request 'master' ( #490 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/490
2024-07-06 13:40:00 +00:00
41134a6266
Merge pull request 'fix : 台账表格更新输入框对齐' ( #489 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/489
2024-07-06 13:39:51 +00:00
7e07010f0d
fix : 台账表格更新输入框对齐
2024-07-06 21:39:37 +08:00
zhangkaihuai
ac28c3235e
Merge remote-tracking branch 'origin/master'
2024-07-06 17:40:24 +08:00
80d8d3c687
Merge pull request 'master' ( #488 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/488
2024-07-06 09:37:03 +00:00
2a5443dc4e
Merge pull request 'fix : 流程管理中人员回显,表格更新负责人按钮更换位置,需求汇总选择框过滤' ( #487 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/487
2024-07-06 09:36:54 +00:00
12f6f27b1a
fix : 流程管理中人员回显,表格更新负责人按钮更换位置,需求汇总选择框过滤
2024-07-06 17:36:39 +08:00
c75bd8a197
Merge pull request 'master' ( #486 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/486
2024-07-06 07:46:48 +00:00
9eebacc47a
Merge pull request 'fix : 修复审批记录主次账号显示, 年度计划详情显示' ( #485 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/485
2024-07-06 07:46:35 +00:00
ddc3b70ddf
fix : 修复审批记录主次账号显示, 年度计划详情显示
2024-07-06 15:46:22 +08:00
clay
bd57a54931
fix : 矩阵审批选择自己时可以跳过自己审批
2024-07-06 15:05:19 +08:00
12eeeced0e
Merge pull request 'master' ( #484 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/484
2024-07-05 18:21:54 +00:00
8f3d97ec1c
Merge pull request 'feat : 年度计划生成功能及分摊汇总导出功能' ( #483 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/483
2024-07-05 18:21:44 +00:00
8180c248ac
feat : 年度计划生成功能及分摊汇总导出功能
2024-07-06 02:21:26 +08:00
zhangkaihuai
a7c1c3a483
Merge remote-tracking branch 'origin/master'
2024-07-05 09:29:40 +08:00
wenhua
de69dc9b47
Merge pull request 'master' ( #482 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/482
2024-07-04 09:20:24 +00:00
lilinyuan
fce1708f5c
Merge branch 'master' of http://git.feashow.cn/clay/mosr-web
2024-07-04 17:18:41 +08:00
lilinyuan
dd80659044
fix: 样式调整
2024-07-04 17:18:38 +08:00
2edef9fcf0
Merge pull request 'master' ( #481 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/481
2024-07-04 06:14:10 +00:00
d7de238c38
Merge pull request 'fix : 分摊研发人员回显' ( #480 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/480
2024-07-04 06:13:40 +00:00
08bc318875
fix : 分摊研发人员回显
2024-07-04 14:13:26 +08:00
dfcf635f05
Merge pull request 'master' ( #479 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/479
2024-07-04 05:58:55 +00:00
888f97125b
Merge pull request 'fix : 统一按钮颜色' ( #478 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/478
2024-07-04 05:58:46 +00:00
c065008da0
fix : 统一按钮颜色
2024-07-04 13:58:26 +08:00
9beb9ed9de
Merge pull request 'master' ( #477 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/477
2024-07-04 05:08:47 +00:00
b2fdfc6227
Merge pull request 'fix : 流程图/人员与按钮间距' ( #476 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/476
2024-07-04 05:08:33 +00:00
05585bb980
fix : 流程图/人员与按钮间距
2024-07-04 13:08:00 +08:00
89dd56959a
Merge pull request 'master' ( #475 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/475
2024-07-04 04:31:02 +00:00
f2863557f9
Merge pull request 'fix : 修复分摊编辑传参' ( #474 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/474
2024-07-04 04:30:52 +00:00
70ffe5c1eb
fix : 修复分摊编辑传参
2024-07-04 12:30:38 +08:00
d2f7f6080a
Merge pull request 'master' ( #473 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/473
2024-07-04 03:31:16 +00:00
a17ab96395
Merge pull request 'fix : 修改所属公司->征集公司' ( #472 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/472
2024-07-04 03:31:06 +00:00
2466e15659
fix : 修改所属公司->征集公司
2024-07-04 11:30:03 +08:00
wenhua
0556e5eb79
Merge pull request 'master' ( #471 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/471
2024-07-04 02:05:44 +00:00
lilinyuan
5c889e41c2
Merge branch 'master' of http://git.feashow.cn/clay/mosr-web
2024-07-04 10:04:31 +08:00
lilinyuan
8ae817ffb3
fix: 分页
2024-07-04 10:04:28 +08:00
6fc5a3f6f3
Merge pull request 'master' ( #470 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/470
2024-07-03 14:58:32 +00:00
df09fbbd38
Merge pull request 'fix : 人员选择框,主次账号回显' ( #469 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/469
2024-07-03 14:58:20 +00:00
842fa7b782
fix : 人员选择框,主次账号回显
2024-07-03 22:58:01 +08:00
706bf36aa8
Merge pull request 'master' ( #468 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/468
2024-07-03 13:53:07 +00:00
a8afb48cf7
Merge pull request 'fix : 修复更新表格' ( #467 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/467
2024-07-03 13:52:55 +00:00
bbc883a116
fix : 修复更新表格
2024-07-03 21:52:33 +08:00
634931a624
Merge pull request 'master' ( #466 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/466
2024-07-03 13:46:14 +00:00
216b0d273e
Merge pull request 'fix : 修复台账表格最小高度' ( #465 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/465
2024-07-03 13:40:13 +00:00
361510242c
fix : 修复台账表格最小高度
2024-07-03 21:38:51 +08:00
94913d558d
Merge pull request 'dd' ( #464 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/464
2024-07-03 13:31:21 +00:00
9a789db8a7
fix : 修复分摊编辑传参问题
2024-07-03 21:31:05 +08:00
0f0fa0f4e0
fix : 修复研究人员每行的回显
2024-07-03 20:47:47 +08:00
afc079b670
Merge pull request 'master' ( #463 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/463
2024-07-03 11:40:24 +00:00
212cbbcb78
Merge pull request 'fix : 修复征集公司回显,所属公司改为征集公司' ( #462 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/462
2024-07-03 11:40:08 +00:00
9edf5d484f
fix : 修复征集公司回显,所属公司改为征集公司
2024-07-03 19:39:53 +08:00
c1a1b30c99
Merge pull request 'master' ( #461 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/461
2024-07-03 06:10:35 +00:00
3bae1d1cc0
Merge pull request 'feat : 优化指定用户时该用户的矩阵状态检查' ( #460 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/460
2024-07-03 06:10:26 +00:00
f26a29338a
feat : 优化指定用户时该用户的矩阵状态检查
2024-07-03 14:10:10 +08:00
d17bca9994
Merge pull request 'master' ( #459 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/459
2024-07-03 05:30:30 +00:00
509b216e4c
Merge pull request 'feat : 优化指定用户时该用户的矩阵状态检查' ( #458 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/458
2024-07-03 05:30:20 +00:00
bffa726cbf
feat : 优化指定用户时该用户的矩阵状态检查
2024-07-03 13:30:01 +08:00
0fbaa25cd6
Merge pull request 'master' ( #457 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/457
2024-07-02 17:46:35 +00:00
a7fb633b89
feat : 优化指定用户时该用户的矩阵状态检查
2024-07-03 01:46:13 +08:00
b1ac328d9d
Revert "feat : 优化指定用户时该用户的矩阵状态检查"
...
This reverts commit d2ddf378bf .
2024-07-03 01:45:10 +08:00
faaeb7be2b
Merge remote-tracking branch 'origin/master'
2024-07-03 01:44:38 +08:00
d2ddf378bf
feat : 优化指定用户时该用户的矩阵状态检查
2024-07-03 01:44:28 +08:00
9a1b04966d
Merge pull request 'master' ( #456 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/456
2024-07-02 16:38:48 +00:00
c97798696a
Merge pull request 'fix : 修复提交校验' ( #455 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/455
2024-07-02 16:38:36 +00:00
0d7c303397
fix : 修复提交校验
2024-07-03 00:38:21 +08:00
zhangkaihuai
3d9db30ba3
Merge remote-tracking branch 'origin/master'
2024-07-02 23:58:49 +08:00
759f93078b
Merge pull request 'master' ( #454 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/454
2024-07-01 12:53:23 +00:00
66be60d011
Merge pull request 'fix : 调整头部icon,删除没用的代码' ( #453 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/453
2024-07-01 12:53:12 +00:00
928f41112c
fix : 调整头部icon,删除没用的代码
2024-07-01 20:53:03 +08:00
1e97239d18
Merge pull request 'master' ( #452 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/452
2024-07-01 11:05:15 +00:00
9d55358d73
Merge pull request 'fix : 调整头部icon,删除没用的代码' ( #451 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/451
2024-07-01 10:56:40 +00:00
2fd2d1d25b
fix : 调整头部icon,删除没用的代码
2024-07-01 18:56:16 +08:00
49a3bbd701
Merge pull request 'master' ( #450 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/450
2024-06-30 14:50:10 +00:00
daa76ada6e
Merge pull request 'fix : 调整部门管理演示,优化移动端详情' ( #449 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/449
2024-06-30 14:49:59 +00:00
09e2bfc605
fix : 调整部门管理演示,优化移动端详情
2024-06-30 22:49:37 +08:00
68dc2ff018
Merge pull request 'master' ( #448 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/448
2024-06-30 13:29:31 +00:00
cae3746a7b
Merge pull request 'fix : 新增分摊/上传费用输入框显示问题' ( #447 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/447
2024-06-30 13:28:56 +00:00
47a5cd3338
fix : 新增分摊/上传费用输入框显示问题
2024-06-30 21:28:46 +08:00
6f843f54a6
Merge pull request 'master' ( #446 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/446
2024-06-30 13:09:47 +00:00
51d2e8357b
Merge pull request 'fix : "科研管理平台" 标题放开' ( #445 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/445
2024-06-30 13:09:24 +00:00
d87027423e
fix : "科研管理平台" 标题放开
2024-06-30 21:08:56 +08:00
19791498d4
Merge pull request 'master' ( #444 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/444
2024-06-30 12:50:56 +00:00
592bba132e
Merge pull request 'fix : 调整费用分摊,表格更新人员回显' ( #443 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/443
2024-06-30 12:50:39 +00:00
a7b898fe48
fix : 调整费用分摊,表格更新人员回显
2024-06-30 20:43:08 +08:00
4242b22c1a
Merge pull request 'master' ( #442 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/442
2024-06-30 12:10:14 +00:00
3c494d038e
Merge pull request 'fix : 调整台账显示信息' ( #441 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/441
2024-06-30 12:10:05 +00:00
c226715097
fix : 调整台账显示信息
2024-06-30 20:09:53 +08:00
6e3b1e8b54
Merge pull request 'master' ( #440 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/440
2024-06-30 12:04:14 +00:00
3ba97bca2d
Merge pull request 'fix : 调整台账显示信息' ( #439 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/439
2024-06-30 12:04:04 +00:00
7daa4b676d
fix : 调整台账显示信息
2024-06-30 20:03:31 +08:00
zhangkaihuai
88198a62b2
Merge remote-tracking branch 'origin/master'
2024-06-30 19:33:03 +08:00
a07bc1cc1c
Merge remote-tracking branch 'origin/master'
2024-06-30 19:18:04 +08:00
fd3231db4d
fix : 添加征集详情
2024-06-30 19:17:56 +08:00
43703f3366
Merge pull request 'master' ( #438 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/438
2024-06-30 09:21:22 +00:00
d011dc4008
Merge pull request 'fix : 优化分摊汇总项目阶段显示' ( #437 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/437
2024-06-30 09:21:10 +00:00
e43213d9a7
fix : 优化分摊汇总项目阶段显示
2024-06-30 17:21:00 +08:00
zhangkaihuai
9fbfa918e9
Merge remote-tracking branch 'origin/master'
2024-06-30 17:16:34 +08:00
bb052b85ac
Merge pull request 'master' ( #436 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/436
2024-06-30 08:43:52 +00:00
04fa4bc334
Merge pull request 'fix : 优化阶段变更详情/项目编辑界面' ( #435 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/435
2024-06-30 08:43:36 +00:00
c89f4db529
fix : 优化阶段变更详情/项目编辑界面
2024-06-30 16:43:21 +08:00
zhangkaihuai
7a49a23128
Merge remote-tracking branch 'origin/master'
2024-06-30 15:54:18 +08:00
4049becfb8
Merge pull request 'master' ( #434 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/434
2024-06-29 17:23:10 +00:00
7b18a92a26
Merge pull request 'fix : 优化移动端详情界面' ( #433 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/433
2024-06-29 17:22:58 +00:00
6434605c7a
fix : 优化移动端详情界面
2024-06-30 01:22:29 +08:00
2a8dabd648
Merge pull request 'master' ( #432 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/432
2024-06-29 16:11:11 +00:00
c8eea20196
Merge pull request 'dd' ( #431 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/431
2024-06-29 16:10:56 +00:00
87613e8113
fix : 优化移动端详情界面
2024-06-30 00:10:42 +08:00
80aef38e7a
fix : 优化移动端详情界面
2024-06-30 00:00:16 +08:00
14ce31262d
Merge pull request 'fix : 优化页面细节' ( #430 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/430
2024-06-29 15:18:01 +00:00
2e9adb3248
fix : 优化页面细节
2024-06-29 23:17:47 +08:00
a6bd56c29c
Merge pull request 'master' ( #429 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/429
2024-06-29 14:47:08 +00:00
68b954a21e
Merge pull request 'fix : 修复项目详情单个文件回显' ( #428 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/428
2024-06-29 14:46:50 +00:00
1e4397b5ea
fix : 修复项目详情单个文件回显
2024-06-29 22:46:37 +08:00
zhangkaihuai
eac76ca3bf
Merge remote-tracking branch 'origin/master'
2024-06-29 22:32:21 +08:00
215b17f066
Merge pull request 'fix : 修复需求汇总文件回显' ( #427 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/427
2024-06-29 14:31:46 +00:00
zhangkaihuai
719012f075
Merge remote-tracking branch 'origin/master'
2024-06-29 22:30:31 +08:00
40d3d423c7
fix : 修复需求汇总文件回显
2024-06-29 22:30:21 +08:00
02ac44f389
Merge pull request 'fix : 修复需求上报成果展示,需求新增专项资金校验' ( #426 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/426
2024-06-29 14:27:35 +00:00
3b884c0b78
fix : 修复需求上报成果展示,需求新增专项资金校验
2024-06-29 22:27:22 +08:00
870ee5a6d0
Merge pull request 'fix : 修复项目详情前置流程更改回显' ( #425 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/425
2024-06-29 13:44:08 +00:00
a446dfcaa6
fix : 修复项目详情前置流程更改回显
2024-06-29 21:43:57 +08:00
zhangkaihuai
167bff642e
Merge remote-tracking branch 'origin/master'
2024-06-29 19:57:55 +08:00
630e35b078
Merge pull request 'fix : 修复需求上报成果多选' ( #424 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/424
2024-06-29 10:57:13 +00:00
bd6fef9f7e
fix : 修复需求上报成果多选
2024-06-29 18:56:05 +08:00
zhangkaihuai
da885d4965
Merge remote-tracking branch 'origin/master'
2024-06-29 18:27:19 +08:00
662e11c154
Merge pull request 'master' ( #423 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/423
2024-06-29 09:14:09 +00:00
5394e45ab8
Merge pull request 'dd' ( #422 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/422
2024-06-29 09:13:54 +00:00
d25c285ad6
fix : 完善信息提示框
2024-06-29 17:13:42 +08:00
zhangkaihuai
0273e19156
Merge remote-tracking branch 'origin/master'
2024-06-29 16:47:45 +08:00
e075eeb0d5
fix : 时间选择框为月份
2024-06-29 16:39:30 +08:00
54e50de6b1
fix : 修复阶段变更编辑回显
2024-06-29 15:51:03 +08:00
fab991400e
Merge pull request 'master' ( #421 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/421
2024-06-29 07:40:19 +00:00
58d6a8f567
Merge pull request 'fix : 修复表格更新数据回显,新增征集提示框' ( #420 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/420
2024-06-29 07:40:05 +00:00
38e9c1d1e5
fix : 修复表格更新数据回显,新增征集提示框
2024-06-29 15:39:42 +08:00
b1b389ce8f
Merge pull request 'master' ( #419 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/419
2024-06-29 05:44:49 +00:00
080b588723
Merge pull request 'dd' ( #418 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/418
2024-06-29 05:43:24 +00:00
3efcc1d039
fix : 还原vite.config.js
2024-06-29 13:42:40 +08:00
0ad12c361d
fix : 优化需求征集新增
2024-06-29 13:40:05 +08:00
0bfa18eac8
fix : 修复所属公司选择框细节
2024-06-29 13:02:12 +08:00
12db4164d0
fix : 单文件和多文件上传样式调整
2024-06-29 12:05:10 +08:00
c977249713
Merge pull request 'master' ( #417 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/417
2024-06-29 03:22:35 +00:00
5d9331c23f
Merge remote-tracking branch 'origin/master'
2024-06-29 11:22:14 +08:00
c247659c6c
Merge pull request 'fix : 需求上报-预期成果形式多选及展示' ( #416 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/416
2024-06-29 03:22:13 +00:00
ed08c6a796
fix : 需求上报-预期成果形式多选及展示
2024-06-29 11:21:50 +08:00
9a306be965
Merge pull request 'master' ( #415 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/415
2024-06-28 19:37:22 +00:00
a769d114bb
Merge pull request 'fix : 优化流程图样式及位置,需求上报排版展示' ( #414 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/414
2024-06-28 19:30:39 +00:00
e44b41bf14
fix : 优化流程图样式及位置,需求上报排版展示
2024-06-29 03:30:26 +08:00
6fe8626acb
Merge pull request 'fix : 优化流程图样式及位置' ( #413 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/413
2024-06-28 18:12:34 +00:00
0a6c37019a
fix : 优化流程图样式及位置
2024-06-29 02:12:04 +08:00
d01f37f5b9
Merge pull request 'master' ( #412 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/412
2024-06-28 16:10:06 +00:00
657b43f739
Merge pull request 'fix : 修复需求汇总' ( #411 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/411
2024-06-28 16:09:54 +00:00
13c0e3a7f0
fix : 修复需求汇总
2024-06-29 00:09:42 +08:00
07069af7a0
Merge pull request 'master' ( #410 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/410
2024-06-28 16:08:09 +00:00
72d5448e90
Merge pull request 'dd' ( #409 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/409
2024-06-28 16:07:58 +00:00
72171fb573
fix : 需求征集新增/详情样式优化,需求汇总详情优化
2024-06-29 00:07:43 +08:00
wenhua
4a598f52d4
Merge pull request 'master' ( #408 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/408
2024-06-28 15:55:12 +00:00
wenhua
bd2d12551a
fix: 修改步骤条样式, 增强tag组件兼容性
2024-06-28 23:53:43 +08:00
942fc219e2
fix : 修复需求上报排版、费用分摊传参、需求汇总查询字段
2024-06-28 22:37:30 +08:00
zhangkaihuai
5a6d16afc6
Merge remote-tracking branch 'origin/master'
2024-06-28 22:03:09 +08:00
clay
16c4e07a86
Merge remote-tracking branch 'origin/master'
2024-06-28 21:54:34 +08:00
clay
58d5efb655
fix : 费用分摊选择用户会被批量修改
2024-06-28 21:54:16 +08:00
c199ecb9fb
Merge pull request 'fix : 修复项目归档-附件上传后跳转展示页面, 专项资金加"名称"二字' ( #407 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/407
2024-06-28 13:50:23 +00:00
aa9001edd7
fix : 修复项目归档-附件上传后跳转展示页面, 专项资金加"名称"二字
2024-06-28 21:50:05 +08:00
clay
377509b62a
feat : 分摊汇总小计保留两位小数
2024-06-28 21:41:24 +08:00
zhangkaihuai
c83a3b2ca3
Merge remote-tracking branch 'origin/master'
2024-06-28 21:13:44 +08:00
clay
fc034cc653
feat : 需求征集字段调整
2024-06-28 20:22:23 +08:00
fe72d0706a
Merge pull request 'dd' ( #406 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/406
2024-06-28 12:16:35 +00:00
84fb6838fb
fix : 优化所属公司选择框
2024-06-28 20:16:24 +08:00
efd06e0da7
fix : 修改需求上报展示
2024-06-28 20:15:58 +08:00
291708e71a
fix : 修改新增需求征集"专项资金名称"
2024-06-28 20:05:23 +08:00
c67a66c119
Merge pull request 'master' ( #405 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/405
2024-06-28 08:39:17 +00:00
9db5ad0052
Merge pull request 'dd' ( #404 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/404
2024-06-28 08:39:06 +00:00
b7946d44c8
fix : 修改用户管理展示
2024-06-28 16:38:35 +08:00
daac1812bf
fix : 优化审批记录、用户账号切换点击位置、所属公司选择框
2024-06-28 16:25:21 +08:00
clay
c99e553515
Merge pull request 'master' ( #403 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/403
2024-06-28 08:16:11 +00:00
wenhua
114c9116b1
feat: 阶段变更详情
2024-06-28 00:08:24 +08:00
wenhua
c5d5066ee1
Merge branch 'master' of http://git.feashow.cn/clay/mosr-web
2024-06-27 23:35:07 +08:00
wenhua
a943687afe
feat: 新增移动端适配详情
2024-06-27 23:35:05 +08:00
clay
380c476cf3
Merge pull request 'master' ( #402 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/402
2024-06-27 14:54:16 +00:00
clay
c61e584dea
Merge remote-tracking branch 'origin/master'
2024-06-27 22:53:50 +08:00
clay
9bdad91b7e
feat : 首页任务字段调整
2024-06-27 22:53:43 +08:00
b433efc81a
Merge pull request 'master' ( #401 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/401
2024-06-26 15:04:55 +00:00
8684132fc7
Merge pull request 'fix : 公司选择框' ( #400 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/400
2024-06-26 15:04:46 +00:00
7bcd75e6fb
fix : 公司选择框
2024-06-26 23:04:30 +08:00
ab4b9c1bf3
Merge pull request 'master' ( #399 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/399
2024-06-26 14:53:15 +00:00
c10f40f668
Merge pull request 'dd' ( #398 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/398
2024-06-25 10:47:01 +00:00
bbb8705cee
feat : 用户管理主账号-新增绑定账号功能
2024-06-25 18:13:43 +08:00
65b8af3e3e
fix : 修复新增分摊复制/添加一行功能
2024-06-25 16:21:40 +08:00
afa0a52898
fix : 修复新增分摊复制/添加一行功能
2024-06-25 16:21:03 +08:00
zhangkaihuai
1032340cc2
Merge remote-tracking branch 'origin/master'
2024-06-25 11:59:55 +08:00
169423d5f9
Merge pull request 'master' ( #397 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/397
2024-06-25 03:56:29 +00:00
0e633c40a1
Merge pull request 'fix : 修复分摊编辑传参和台账导出' ( #396 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/396
2024-06-25 03:56:00 +00:00
9d0490a253
fix : 修复分摊编辑传参和台账导出
2024-06-25 11:55:48 +08:00
zhangkaihuai
2eaa8337f6
Merge remote-tracking branch 'origin/master'
2024-06-24 18:35:22 +08:00
ce981882c8
Merge pull request 'master' ( #395 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/395
2024-06-24 05:39:59 +00:00
87768bfdf4
Merge pull request 'fix : 修复分摊/资金详情页面移动端适配' ( #394 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/394
2024-06-24 05:39:45 +00:00
36c5b04dbc
fix : 修复分摊/资金详情页面移动端适配
2024-06-24 13:39:30 +08:00
dd13f8d175
Merge pull request 'master' ( #393 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/393
2024-06-24 05:26:03 +00:00
9945cc1c86
Merge pull request 'fix : 修复详情页面移动端适配' ( #392 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/392
2024-06-24 05:25:50 +00:00
6f320a47bb
fix : 修复详情页面移动端适配
2024-06-24 13:25:34 +08:00
47f13d4b1e
Merge pull request 'master' ( #391 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/391
2024-06-24 03:09:53 +00:00
zhangkaihuai
0551379a65
Merge remote-tracking branch 'origin/master'
2024-06-24 01:06:15 +08:00
clay
f66a570f00
feat : 台账导出
2024-06-23 18:55:42 +08:00
clay
5edf97338e
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/views/expense-management/share/add.vue
2024-06-23 18:15:07 +08:00
433bb7e1a4
Merge pull request 'master' ( #390 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/390
2024-06-23 04:08:40 +00:00
0b9712962d
Merge pull request 'dd' ( #389 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/389
2024-06-23 04:08:23 +00:00
d03f352169
fix : 注释npm install
2024-06-23 12:08:02 +08:00
dc20a6e33d
Merge remote-tracking branch 'origin/master'
2024-06-23 12:06:53 +08:00
1efe8c4aaf
fix : 修复项目实施-台账基础信息展示及表格更新功能
2024-06-23 12:04:22 +08:00
wenhua
27b4f41749
Merge branch 'master' of http://git.feashow.cn/clay/mosr-web
2024-06-23 01:36:20 +08:00
wenhua
30bd9da52f
feat: 新增移动端详情
2024-06-23 01:36:17 +08:00
74e1938d3c
fix : 修改分摊汇总金额展示
2024-06-23 01:02:27 +08:00
08f86517da
Merge pull request 'master' ( #388 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/388
2024-06-22 16:59:19 +00:00
5757846e7c
Merge pull request 'fix : 修复费用分摊详情合计bug' ( #387 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/387
2024-06-22 16:59:07 +00:00
058421bdd7
fix : 修复费用分摊详情合计bug
2024-06-23 00:58:56 +08:00
794826f0c7
Merge pull request 'master' ( #386 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/386
2024-06-22 16:39:27 +00:00
da9bf2304b
Merge pull request 'feat : 项目实施-台账新增表格更新功能' ( #385 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/385
2024-06-22 16:39:16 +00:00
1a3d2bcf1a
feat : 项目实施-台账新增表格更新功能
2024-06-23 00:37:07 +08:00
e0ba874746
Merge pull request 'fix : 修复用户切换报错提示、税后余额数字输入框、新增分摊时研发人员传参' ( #384 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/384
2024-06-22 15:55:21 +00:00
7e524039bd
fix : 修复用户切换报错提示、税后余额数字输入框、新增分摊时研发人员传参
2024-06-22 23:54:54 +08:00
096fa6dc51
Merge pull request 'fix : 分摊详情小计与导出' ( #383 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/383
2024-06-22 10:49:59 +00:00
2d9bba98a7
fix : 分摊详情小计与导出
2024-06-22 18:49:14 +08:00
accf65ef10
Merge pull request 'master' ( #381 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/381
2024-06-22 10:46:16 +00:00
e849c6cde6
Merge remote-tracking branch 'origin/master'
2024-06-22 18:45:50 +08:00
5c60bf91e4
fix : 分摊详情小计与导出
2024-06-22 18:45:40 +08:00
clay
dc189aa726
fix : 修复新增分摊细节
2024-06-22 18:44:49 +08:00
eaa8b834bf
Merge pull request 'master' ( #380 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/380
2024-06-21 10:40:13 +00:00
82634ddf97
Merge pull request 'fix : 审批记录优化' ( #379 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/379
2024-06-21 10:40:00 +00:00
3f32683d69
fix : 审批记录优化
2024-06-21 18:39:45 +08:00
b32ced514b
Merge pull request 'master' ( #378 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/378
2024-06-21 10:36:16 +00:00
5fbef17b86
Merge pull request 'dj' ( #377 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/377
2024-06-21 10:35:54 +00:00
1cdd2cb02b
fix : 主次账号消息框展示、审批记录优化、头像框组件优化
2024-06-21 18:35:30 +08:00
2a80c8df21
fix : 修复项目归档开启/关闭上传文件二次确认
2024-06-21 17:17:35 +08:00
4bee8bf9e4
fix : 修复项目实施/归档上传附件显示,
2024-06-21 17:15:01 +08:00
78cf7e6857
Merge pull request 'master' ( #376 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/376
2024-06-21 07:31:47 +00:00
efe1be3929
Merge pull request 'dj' ( #375 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/375
2024-06-21 07:31:37 +00:00
bce9b2d8d2
fix : 修复导出表格宽度
2024-06-21 15:31:06 +08:00
b73b9aad4b
fix : 分摊汇总表格及小计导出
2024-06-21 15:22:22 +08:00
8128766e24
Merge pull request 'master' ( #374 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/374
2024-06-21 05:03:17 +00:00
8a9fffb3d0
Merge pull request 'fix : 移除输出log' ( #373 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/373
2024-06-21 05:03:07 +00:00
9b758d41d0
fix : 移除输出log
2024-06-21 13:02:55 +08:00
90a08f37f6
Merge pull request 'master' ( #372 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/372
2024-06-21 04:42:08 +00:00
9a3bfc784e
Merge pull request 'fix : 审批记录优化' ( #371 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/371
2024-06-21 04:41:58 +00:00
ddc305297f
fix : 审批记录优化
2024-06-21 12:41:43 +08:00
ad03a1ed2b
Merge pull request 'master' ( #370 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/370
2024-06-21 04:33:41 +00:00
853be5f9de
Merge pull request 'dj' ( #369 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/369
2024-06-21 04:33:31 +00:00
5977f13b91
fix : 修复人员选择框
2024-06-21 12:33:18 +08:00
3f26324747
fix : 修复研发人员选择框
2024-06-21 12:32:46 +08:00
141e965f95
fix : 修复研发人员选择框
2024-06-21 12:31:27 +08:00
e12dd9e5d7
Merge pull request 'dj' ( #367 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/367
2024-06-21 04:30:50 +00:00
d97ea2f19e
Merge remote-tracking branch 'origin/master'
2024-06-21 12:30:31 +08:00
e3664314d0
fix : 修复所属公司选择框细节
2024-06-21 12:30:19 +08:00
41b1bed81d
Merge pull request 'master' ( #366 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/366
2024-06-21 04:24:08 +00:00
bfc38d035f
Merge pull request 'dj' ( #365 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/365
2024-06-21 04:23:54 +00:00
cef8530a5b
fix : 固定所属公司选择条数为14则隐藏
2024-06-21 12:23:25 +08:00
a6476c359d
fix : 审批记录样式优化, 上传费用,新增分摊输入框宽度固定
2024-06-20 16:55:15 +08:00
57f27c2b84
fix : 修复专项资金/费用分摊,编辑,审批记录展示
2024-06-20 15:08:12 +08:00
4c8959e3c4
fix : 修复专项资金/费用分摊,编辑,审批记录展示
2024-06-20 14:39:24 +08:00
clay
bc882f375f
Merge pull request 'master' ( #364 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/364
2024-06-19 19:25:34 +00:00
clay
a1064f6111
Merge pull request 'fix : 修复分摊明细/汇总导出' ( #363 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/363
2024-06-19 19:25:23 +00:00
255dbe67e0
fix : 修复分摊明细/汇总导出
2024-06-20 03:24:58 +08:00
5d23a903fc
Merge pull request 'master' ( #362 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/362
2024-06-19 18:28:50 +00:00
994e474532
feat: 分摊明细异构表格数据对接 + 分摊明细异构表格excel导出
2024-06-20 02:27:42 +08:00
7fb30322b3
Merge pull request 'master' ( #361 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/361
2024-06-19 07:12:19 +00:00
f3e8e12a5a
fix : 右上角用户展示样式优化
2024-06-19 11:53:50 +08:00
4289ab2709
fix : 右上角用户展示样式优化
2024-06-19 11:52:07 +08:00
a9dfa26b0d
fix : 修改首页待办数量
2024-06-19 11:44:30 +08:00
lilinyuan
c0bfbbfe65
fix: user 暂存
2024-06-19 11:26:01 +08:00
lilinyuan
f812b4af4d
feat: 新增table获取数据总量方法
2024-06-19 11:25:50 +08:00
94bb4ce943
Merge pull request 'dj' ( #360 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/360
2024-06-18 19:07:21 +00:00
7ad99048f4
fix : 修改右上角用户样式
2024-06-19 03:07:06 +08:00
0eba2c45f5
fix : 修改右上角用户样式
2024-06-19 03:03:29 +08:00
6f33aa1114
fix : 修改用户切换样式
2024-06-19 02:56:00 +08:00
clay
4f8a27e518
Merge remote-tracking branch 'origin/master'
2024-06-19 01:26:31 +08:00
clay
59014f6367
feat : 用户账号切换
2024-06-19 01:26:24 +08:00
20825fee23
Merge pull request 'fix : 修改人员选择框细节' ( #359 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/359
2024-06-18 16:08:18 +00:00
bd1393d41c
fix : 修改人员选择框细节
2024-06-19 00:08:09 +08:00
a3ac29b28b
Merge pull request 'fix : 前置流程回显' ( #358 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/358
2024-06-18 16:03:27 +00:00
da49b51b3d
fix : 前置流程回显
2024-06-19 00:02:38 +08:00
fbd6c3695d
Merge pull request 'dj' ( #357 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/357
2024-06-18 15:55:54 +00:00
aa15e9b8d0
fix : 前置流程多选
2024-06-18 23:55:40 +08:00
91f21409f6
fix : 前置流程多选
2024-06-18 23:46:24 +08:00
820349877c
fix : 修复需求征集编辑时所属公司回显,项目阶段改成研发阶段,人员选择器主子账号颜色区分
2024-06-18 23:11:27 +08:00
clay
5410b6d248
feat : 菜单与公司选择组件修改
2024-06-18 22:24:50 +08:00
369647f64f
Merge pull request 'fix : 修复需求征集/汇总/费用台账页面搜索细节' ( #356 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/356
2024-06-18 14:19:02 +00:00
3745c9cb28
fix : 修复需求征集/汇总/费用台账页面搜索细节
2024-06-18 22:18:35 +08:00
45a6b6733f
Merge pull request 'fix : 修复列表左侧选择框,及正确json格式' ( #355 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/355
2024-06-18 13:27:22 +00:00
6ab1dc806e
fix : 修复列表左侧选择框,及正确json格式
2024-06-18 21:27:03 +08:00
a795fa5786
Merge pull request 'master' ( #354 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/354
2024-06-18 12:43:42 +00:00
a678420f4f
Merge pull request 'fix : 修改征集类型为字典、直接上报时详情专项资金回显、项目归档-需求征集文件回显、重大项目前置流程必填' ( #353 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/353
2024-06-18 12:43:17 +00:00
5100281c1f
fix : 修改征集类型为字典、直接上报时详情专项资金回显、项目归档-需求征集文件回显、重大项目前置流程必填
2024-06-18 20:43:02 +08:00
3a79c85033
Merge pull request 'fix : 修复所属公司选择框右侧的删除功能' ( #352 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/352
2024-06-18 08:45:40 +00:00
df513a91fe
fix : 修复所属公司选择框右侧的删除功能
2024-06-18 16:45:19 +08:00
wenhua
6fcb68d929
Merge pull request 'fix: 多标签页bug' ( #351 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/351
2024-06-18 08:10:35 +00:00
lilinyuan
506c794c5d
fix: 多标签页bug
2024-06-18 16:09:21 +08:00
9cf7396fb8
Merge pull request 'master' ( #350 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/350
2024-06-17 03:48:08 +00:00
1c908017bb
Merge pull request 'fix : 修复上传费用输入框垂直居中、台账时间搜索' ( #349 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/349
2024-06-17 03:40:03 +00:00
9cbe89007d
fix : 修复上传费用输入框垂直居中、台账时间搜索
2024-06-17 11:39:34 +08:00
891cebec90
Merge pull request 'master' ( #348 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/348
2024-06-17 03:22:45 +00:00
132ab60d0f
Merge pull request 'fix : 修复新增费用分摊输入框垂直居中' ( #347 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/347
2024-06-16 13:41:33 +00:00
0c36801e83
fix : 修复新增费用分摊输入框垂直居中
2024-06-16 21:41:20 +08:00
f187e7c5b1
Merge pull request 'fix : 修复费用分摊时间搜索' ( #346 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/346
2024-06-16 13:08:13 +00:00
b162bb8977
fix : 修复费用分摊时间搜索
2024-06-16 21:08:04 +08:00
2206e2aa21
Merge pull request 'master' ( #345 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/345
2024-06-16 12:35:37 +00:00
75664822e4
Merge pull request 'fix : 修复项目费用显示bug' ( #344 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/344
2024-06-16 12:35:12 +00:00
009d73ce86
fix : 修复项目费用显示bug
2024-06-16 20:34:46 +08:00
ba4e927ff5
Merge pull request 'master' ( #343 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/343
2024-06-16 11:50:40 +00:00
33a90e59f6
Merge pull request 'fix : 修改所属公司选择框bug' ( #342 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/342
2024-06-16 11:50:30 +00:00
63107ece02
fix : 修改所属公司选择框bug
2024-06-16 19:50:17 +08:00
a75c2dd0fa
Merge pull request 'fix : 流程图位置更换' ( #341 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/341
2024-06-16 11:36:30 +00:00
d1a8077eea
fix : 流程图位置更换
2024-06-16 19:34:08 +08:00
zhangkaihuai
a72a09008f
Merge remote-tracking branch 'origin/master'
2024-06-16 18:07:39 +08:00
fa366d18e5
Merge pull request 'master' ( #340 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/340
2024-06-16 10:07:34 +00:00
46e67f30a0
Merge pull request 'dj' ( #339 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/339
2024-06-16 10:07:18 +00:00
7ffb689927
fix : 修复所属公司选择框
2024-06-16 18:06:53 +08:00
zhangkaihuai
13e0b6401c
Merge remote-tracking branch 'origin/master'
2024-06-16 17:31:15 +08:00
79171758f5
fix : 修复需求汇总重新提交专项资金参数回传
2024-06-16 15:41:38 +08:00
61a999758e
fix : 修复默认矩阵审批
2024-06-15 18:02:32 +08:00
31ff2a4502
Merge pull request 'master' ( #338 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/338
2024-06-14 16:47:38 +00:00
f624b4d290
Merge pull request 'fix : 修复公司选择框全选功能' ( #337 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/337
2024-06-14 16:47:29 +00:00
9153c20902
fix : 修复公司选择框全选功能
2024-06-15 00:47:17 +08:00
4d312a8892
Merge pull request 'master' ( #336 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/336
2024-06-14 15:27:00 +00:00
5fdcf42336
Merge pull request 'fix : 修复阶段变更中抄送人员回显' ( #335 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/335
2024-06-14 15:26:51 +00:00
73313a1532
fix : 修复阶段变更中抄送人员回显
2024-06-14 23:26:38 +08:00
fc09c1db05
Merge pull request 'master' ( #334 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/334
2024-06-14 15:18:20 +00:00
21cfe73a13
Merge pull request 'fix : 修复新增需求征集所属公司选择弹框' ( #333 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/333
2024-06-14 15:18:10 +00:00
532ef440ce
fix : 修复新增需求征集所属公司选择弹框
2024-06-14 23:17:32 +08:00
62983eea10
Merge pull request 'master' ( #332 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/332
2024-06-14 06:02:16 +00:00
2ff0dbd2a4
Merge pull request 'fix : 修复项目实施台账字典问题' ( #331 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/331
2024-06-14 06:01:59 +00:00
58cbceb747
fix : 修复项目实施台账字典问题
2024-06-14 14:01:41 +08:00
a7f95e98aa
Merge pull request 'master' ( #330 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/330
2024-06-14 05:05:07 +00:00
49b64c177f
Merge pull request 'fix : 修复费用分摊复制功能、数字框默认值为null、项目归档显示是哪个流程的上传附件' ( #329 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/329
2024-06-14 05:04:56 +00:00
f240016e44
fix : 修复费用分摊复制功能、数字框默认值为null、项目归档显示是哪个流程的上传附件
2024-06-14 13:04:37 +08:00
zhangkaihuai
d3133a8860
Merge remote-tracking branch 'origin/master'
2024-06-11 21:19:00 +08:00
df4312e61d
Merge pull request 'master' ( #328 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/328
2024-06-11 13:14:34 +00:00
6d56c4702b
Merge pull request 'fix : 修复细节' ( #327 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/327
2024-06-11 13:14:24 +00:00
3db0f3bd5b
fix : 修复细节
2024-06-11 21:14:09 +08:00
65af3e7bfb
Merge pull request 'master' ( #326 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/326
2024-06-11 13:05:54 +00:00
363e2b983e
Merge pull request 'fix : 修复新增需求细节' ( #325 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/325
2024-06-11 13:05:46 +00:00
90a26f2e1e
fix : 修复新增需求细节
2024-06-11 21:05:31 +08:00
fe5c28dbf0
Merge pull request 'master' ( #324 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/324
2024-06-11 12:59:21 +00:00
f931c65b57
Merge pull request 'fix : 修复新增需求细节' ( #323 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/323
2024-06-11 12:59:11 +00:00
e64b7fe0ae
fix : 修复新增需求细节
2024-06-11 20:58:47 +08:00
5b78df27f5
Merge pull request 'master' ( #322 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/322
2024-06-11 12:56:47 +00:00
48e97ed275
Merge pull request 'dj' ( #321 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/321
2024-06-11 12:56:37 +00:00
a2977d0702
fix : 屏蔽导出修复角色权限
2024-06-11 20:56:22 +08:00
78ab1ddc45
fix : 屏蔽导出
2024-06-11 20:32:20 +08:00
7f73afa6b5
Merge pull request 'fix : 修复流程图切换功能和屏蔽导出' ( #320 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/320
2024-06-11 12:15:02 +00:00
208584c34b
fix : 修复流程图切换功能和屏蔽导出
2024-06-11 20:14:49 +08:00
f9cf478694
Merge pull request 'master' ( #319 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/319
2024-06-11 11:17:20 +00:00
40d2bef0ba
Merge pull request 'dj' ( #318 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/318
2024-06-11 11:16:58 +00:00
b425e709aa
fix : 修复流程图切换功能及修改"研发阶段"文字为项目阶段
2024-06-11 19:16:35 +08:00
3f7de153da
fix : 修复项目立项/验收前置流程展示及系统部分页面分页bug
2024-06-11 18:47:35 +08:00
7b67e71bd6
Merge pull request 'master' ( #317 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/317
2024-06-11 07:42:26 +00:00
99224392a3
Merge pull request 'dj' ( #316 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/316
2024-06-11 07:42:16 +00:00
ab83724056
fix : 修复详情页切换流程图渲染bug
2024-06-11 15:42:01 +08:00
2c5c694445
Merge pull request 'master' ( #315 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/315
2024-06-11 04:19:35 +00:00
e33a6d5c58
Merge pull request 'fix : 二级页面上加基础信息' ( #314 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/314
2024-06-11 04:19:21 +00:00
5e2f9df706
Merge remote-tracking branch 'origin/master'
2024-06-11 12:18:43 +08:00
1009cb7345
fix : 二级页面上加基础信息
2024-06-10 23:28:34 +08:00
e5f80ed017
Merge pull request 'dj' ( #313 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/313
2024-06-10 15:01:42 +00:00
050c5cf57a
fix : 列表按钮加权限
2024-06-10 23:01:28 +08:00
3e6c82dd19
fix : 修复列表页按钮固定右侧
2024-06-10 22:38:26 +08:00
15a2dda0fa
fix : 修复需求征集/汇总权限按钮
2024-06-10 22:36:03 +08:00
9c812af394
fix : 修复详情提交/重新提交功能
2024-06-10 22:34:51 +08:00
3379d851c6
Merge remote-tracking branch 'origin/master'
2024-06-10 22:34:27 +08:00
535d3f680b
fix : 优化直接上报时项目归档附件tab展示
2024-06-10 16:19:09 +08:00
2f2dabb82d
Merge pull request 'fix : 优化需求汇总详情页面' ( #312 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/312
2024-06-10 07:52:38 +00:00
b05d0ff42f
fix : 优化需求汇总详情页面
2024-06-10 15:50:26 +08:00
4649ad3abd
Merge pull request 'master' ( #311 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/311
2024-06-10 07:26:33 +00:00
4a749fc220
Merge pull request 'fix : 修复详情基本信息显示位置、项目验收、结项操作放在详情页面' ( #310 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/310
2024-06-10 07:26:03 +00:00
07c089ed29
fix : 修复详情基本信息显示位置、项目验收、结项操作放在详情页面
2024-06-10 15:25:28 +08:00
3483a32d55
Merge pull request 'fix : 修改阶段变更抄送人样式' ( #309 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/309
2024-06-09 16:44:41 +00:00
cb224ab437
fix : 修改阶段变更抄送人样式
2024-06-10 00:44:20 +08:00
d8b8c65dfb
Merge pull request 'fix : 修复提交按钮旁边的返回页面细节' ( #308 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/308
2024-06-09 16:25:25 +00:00
d3fe46f0bc
fix : 修复提交按钮旁边的返回页面细节
2024-06-10 00:25:00 +08:00
zhangkaihuai
1bfb34305f
Merge remote-tracking branch 'origin/master'
2024-06-09 23:50:14 +08:00
bf0cb73946
Merge remote-tracking branch 'origin/master'
2024-06-09 23:48:50 +08:00
992eb2b890
fix : 修复分摊金额显示bug
2024-06-09 23:48:42 +08:00
zhangkaihuai
eb8e772e66
Merge remote-tracking branch 'origin/master'
2024-06-09 22:37:31 +08:00
fb52f8b04e
Merge pull request 'fix : 修复需求上报接口' ( #307 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/307
2024-06-09 14:11:06 +00:00
53e461bc4d
fix : 修复需求上报接口
2024-06-09 22:10:52 +08:00
f251c08982
Merge pull request 'fix : 修复项目实施上传费用,查看分摊功能细节' ( #306 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/306
2024-06-09 14:03:31 +00:00
83ba497d73
fix : 修复项目实施上传费用,查看分摊功能细节
2024-06-09 22:02:37 +08:00
zhangkaihuai
c20fbcc356
Merge remote-tracking branch 'origin/master'
2024-06-09 21:33:49 +08:00
bb771b2f6d
Merge pull request 'dj' ( #305 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/305
2024-06-09 13:29:06 +00:00
zhangkaihuai
7fbd067e11
Merge remote-tracking branch 'origin/dj'
2024-06-09 20:59:19 +08:00
zhangkaihuai
008c474b76
Merge remote-tracking branch 'origin/master'
2024-06-09 20:58:09 +08:00
a88ae09628
fix : 修复项目实施阶段变更功能
2024-06-09 20:03:26 +08:00
b0eabd9c39
fix : 修复项目立项切换bug
2024-06-09 19:33:03 +08:00
adbd98f035
fix : 修复项目立项切换bug
2024-06-09 19:30:45 +08:00
f61adaf18b
Merge remote-tracking branch 'origin/master'
2024-06-09 19:19:15 +08:00
clay
d1c6b23aa4
feat : 需求变更详情修改
2024-06-09 19:19:02 +08:00
c3e006bba8
fix : 修复项目立项重新提交等操作替换到详情页面
2024-06-09 19:12:37 +08:00
812298acce
fix : 修复需求上报是否专项资金流程图显示
2024-06-09 19:00:43 +08:00
fd61fcc485
Merge pull request 'fix : 修复费用分摊详情研究人员显示' ( #304 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/304
2024-06-09 10:09:41 +00:00
60b7133939
fix : 修复费用分摊详情研究人员显示
2024-06-09 18:09:13 +08:00
8e46c27af8
Merge pull request 'dj' ( #303 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/303
2024-06-09 09:51:15 +00:00
4ed64339fa
fix : 金额格式化
2024-06-09 17:50:49 +08:00
zhangkaihuai
d6a9ecd944
Merge remote-tracking branch 'origin/dj'
2024-06-09 17:09:05 +08:00
cafb0ef5bf
Merge remote-tracking branch 'origin/master'
2024-06-09 15:06:29 +08:00
29b8bad394
fix : 格式化金额显示
2024-06-08 23:20:44 +08:00
9a862f8cce
feat : 修复需求汇总页面细节
2024-06-08 11:43:39 +08:00
91b2ead3d4
Merge pull request 'dj' ( #302 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/302
2024-06-07 16:05:41 +00:00
521e40cf3d
feat : 项目详情中立项/编辑页面demo
2024-06-08 00:05:28 +08:00
86ff3c2e94
fix : 修复附件校验问题
2024-06-08 00:04:33 +08:00
617a867965
fix : 修复查看分摊功能
2024-06-07 21:34:18 +08:00
b2e0983cf0
Merge pull request 'fix : 修改提交/重新提交功能文件传参问题' ( #301 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/301
2024-06-07 12:37:11 +00:00
27bc6ea89f
fix : 修改提交/重新提交功能文件传参问题
2024-06-07 20:36:54 +08:00
c2413fe8b2
Merge pull request 'fix : 修改专项资金新增的介绍输入框' ( #300 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/300
2024-06-07 11:47:55 +00:00
ee81e1bb23
fix : 修改专项资金新增的介绍输入框
2024-06-07 18:40:54 +08:00
a6a124d61a
Merge pull request 'fix : 修复需求上报bug' ( #299 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/299
2024-06-07 10:28:22 +00:00
1bc8f26724
fix : 修复需求上报bug
2024-06-07 18:28:10 +08:00
1c56ccae40
Merge pull request 'fix : 修复需求上报文件上传/删除问题' ( #298 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/298
2024-06-07 08:46:59 +00:00
42fea1853d
fix : 修复需求上报文件上传/删除问题
2024-06-07 16:46:44 +08:00
0eb0bcb0ef
Merge pull request 'fix : 修复专项资金显示情况' ( #297 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/297
2024-06-07 05:26:04 +00:00
9655c41492
fix : 修复专项资金显示情况
2024-06-07 13:24:17 +08:00
ec7cf224d3
Merge pull request 'fix : 修改需求上报页面细节' ( #296 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/296
2024-06-06 15:14:04 +00:00
35ecec13ad
fix : 修改需求上报页面细节
2024-06-06 23:13:10 +08:00
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
ac00d68350
Merge pull request 'master' ( #294 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/294
2024-06-06 14:21:42 +00: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
40c09c58d4
Merge pull request 'master' ( #292 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/292
2024-06-06 05:38:23 +00: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
a30638d693
Merge pull request 'master' ( #290 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/290
2024-06-05 18:02:01 +00: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
0f83224f28
Merge pull request 'master' ( #288 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/288
2024-06-05 14:57:23 +00: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
11a1f044f5
Merge pull request 'master' ( #286 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/286
2024-06-05 14:10:57 +00: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
7df8fbd46a
Merge pull request 'master' ( #283 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/283
2024-06-04 10:43:33 +00: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
d57af223cc
Merge pull request 'master' ( #281 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/281
2024-06-04 10:30:12 +00: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
a1925121d7
Merge pull request 'master' ( #277 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/277
2024-06-02 15:17:30 +00: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
e0ffef25bd
fix : 修复获取流程接口的提示框
2024-06-02 16:54:46 +08:00
419397fc00
Merge pull request 'fix : 修复文件列表表格高度' ( #271 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/271
2024-06-02 08:31:53 +00:00
9b45135a18
fix : 修复文件列表表格高度
2024-06-02 16:31:37 +08:00
f0eb28ab84
Merge pull request 'fix : 修复文件下载、专项资金新增、删除功能、流程新增细节优化' ( #270 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/270
2024-06-02 08:12:55 +00:00
c416424253
fix : 修复文件下载、专项资金新增、删除功能、流程新增细节优化
2024-06-02 16:12:40 +08:00
e9592920e7
Merge pull request 'fix : 修复首页查看跳转问题及简化代码' ( #269 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/269
2024-06-02 03:54:31 +00:00
c05322a2bf
fix : 修复首页查看跳转问题及简化代码
2024-06-02 11:54:19 +08:00
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
wenhua
4f4f1842a4
Merge pull request 'master' ( #267 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/267
2024-06-01 15:17:36 +00: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
1bc27897d8
Merge pull request 'master' ( #266 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/266
2024-06-01 14:54:47 +00: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
e5d03a07a3
Merge pull request 'master' ( #264 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/264
2024-06-01 14:51:57 +00: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
d6909fb449
Merge pull request 'fix : 字典为空死循环bug' ( #256 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/256
2024-05-31 03:24:03 +00:00
clay
5a1e1848cb
fix : 字典为空死循环bug
2024-05-31 11:23:34 +08:00
73978ca602
Merge pull request 'master' ( #255 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/255
2024-05-30 14:53:53 +00: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
ac4cdb1189
Merge pull request 'master' ( #253 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/253
2024-05-30 14:51:39 +00: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
b3e85e186e
Merge pull request 'master' ( #251 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/251
2024-05-30 14:34:28 +00: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
f0a09b2d0a
Merge pull request 'master' ( #250 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/250
2024-05-30 12:07:30 +00: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
501790677e
Merge pull request 'master' ( #248 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/248
2024-05-30 09:49:17 +00: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
94528cfa06
fix : 修复页面细节
2024-05-30 16:05:09 +08:00
2ab4eb1a7e
Merge remote-tracking branch 'origin/master'
2024-05-29 22:10:13 +08:00
04c1175cf8
fix : 修复提交/重新提交按钮显示
2024-05-29 21:34:37 +08:00
7a5fbd501e
Merge pull request 'fix : 修复费用分摊详情数据' ( #244 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/244
2024-05-29 12:53:39 +00:00
dd3f793ac2
fix : 修复费用分摊详情数据
2024-05-29 20:53:26 +08:00
dc153e459e
Merge pull request 'dj' ( #243 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/243
2024-05-28 15:56:48 +00:00
00ad1c3098
Merge remote-tracking branch 'origin/master'
2024-05-28 23:55:22 +08:00
6ac425f7de
fix : 修复需求上报下拉框数据
2024-05-28 23:54:05 +08:00
80ae6bdf7e
Merge pull request 'feat : 项目实施的阶段变更界面初始化' ( #242 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/242
2024-05-28 15:18:49 +00:00
9198837d65
feat : 项目实施的阶段变更界面初始化
2024-05-28 23:17:34 +08:00
4acba8bedc
Merge pull request 'fix : 修复费用管理功能细节' ( #241 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/241
2024-05-28 15:05:30 +00:00
7f40296f3b
fix : 修复费用管理功能细节
2024-05-28 23:05:10 +08:00
0ae84ba12e
Merge pull request 'fix : 修复项目实施附件接口' ( #240 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/240
2024-05-28 10:00:57 +00:00
be367ead6e
fix : 修复项目实施附件接口
2024-05-28 18:00:42 +08:00
335d8c1e72
Merge pull request 'dj' ( #239 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/239
2024-05-28 08:42:16 +00:00
dd406e4ba6
fix : 修复专项资金页面搜索功能
2024-05-28 16:42:05 +08:00
beb07edc73
fix : 修复专项资金页面搜索功能
2024-05-28 16:39:37 +08:00
0eb036e8a5
Merge pull request 'fix : 修复专项资金页面功能细节' ( #238 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/238
2024-05-28 08:36:15 +00:00
ba86f54369
fix : 修复专项资金页面功能细节
2024-05-28 16:36:03 +08:00
11544acbad
Merge pull request 'dj' ( #237 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/237
2024-05-28 04:05:49 +00:00
63e94af451
fix : 修复项目实施中功能细节
2024-05-28 12:05:31 +08:00
554c7d2be7
fix : 修复首页查看跳转
2024-05-27 23:10:34 +08:00
e3222e906d
Merge remote-tracking branch 'origin/master'
2024-05-27 22:45:42 +08:00
30a8ceb424
fix : 修复首页查看跳转
2024-05-27 22:38:15 +08:00
wenhua
700c08616f
Merge pull request 'fix: up detail, router, display for dont have role' ( #236 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/236
2024-05-27 14:34:31 +00:00
wenhua
304effe93c
fix: up detail, router, display for dont have role
2024-05-27 22:33:24 +08:00
28207004c7
Merge pull request 'master' ( #235 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/235
2024-05-27 13:41:13 +00:00
26931f4200
Merge pull request 'fix : 修复路由跳转' ( #234 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/234
2024-05-27 13:16:30 +00:00
e71c142ea9
fix : 修复路由跳转
2024-05-27 21:16:14 +08:00
7ebd897d57
Merge pull request 'fix : 修复步骤条样式' ( #233 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/233
2024-05-27 03:38:17 +00:00
0ec14cfd9b
fix : 修复步骤条样式
2024-05-27 11:37:59 +08:00
bef0c2d792
Merge pull request 'fix : 修复路由跳转' ( #232 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/232
2024-05-24 08:34:47 +00:00
08f66803a2
fix : 修复路由跳转
2024-05-24 16:34:17 +08:00
lilinyuan
6af7bf9d2f
fix: 修复问题
2024-05-24 16:10:15 +08:00
lilinyuan
9013d54add
fix: 去掉log
2024-05-24 14:26:29 +08:00
lilinyuan
fd722b5c82
Merge branch 'master' of http://git.feashow.cn/clay/mosr-web
2024-05-24 14:24:39 +08:00
lilinyuan
a8e56fe985
fix: 修改新增编辑等单页面路由层级
2024-05-24 14:24:36 +08:00
clay
4953e96415
feat : 需求征集表单权限测试
2024-05-24 10:44:24 +08:00
8c33aaa8a7
Merge pull request 'master' ( #229 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/229
2024-05-23 16:19:32 +00:00
5b85abd219
Merge pull request 'fix : 修复详情渲染细节' ( #228 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/228
2024-05-23 16:16:00 +00:00
7156e34fde
fix : 修复详情渲染细节
2024-05-24 00:12:53 +08:00
e903dd2994
Merge pull request 'fix : 修复权限按钮细节' ( #227 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/227
2024-05-23 15:43:22 +00:00
549e307b3e
fix : 修复权限按钮细节
2024-05-23 23:42:09 +08:00
390474ea24
Merge pull request 'fix : 修复页面细节' ( #226 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/226
2024-05-23 12:48:45 +00:00
43c9cb03d3
fix : 修复页面细节
2024-05-23 20:48:09 +08:00
clay
5eb7e34571
fix : 用户nickname查询
2024-05-23 20:29:24 +08:00
clay
d12fb8a12b
fix : 用户nickname查询
2024-05-23 20:28:46 +08:00
1991d7eada
Merge pull request 'fix : 修复页面细节' ( #225 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/225
2024-05-23 09:53:04 +00:00
31a12e566a
fix : 修复页面细节
2024-05-23 17:52:48 +08:00
5c8679d5f9
Merge pull request 'fix : 修复页面细节' ( #224 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/224
2024-05-23 09:39:12 +00:00
7e70c9271f
fix : 修复页面细节
2024-05-23 17:38:58 +08:00
6748685712
Merge pull request 'fix : 修复页面细节' ( #223 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/223
2024-05-23 08:44:19 +00:00
cd7f94e8f2
fix : 修复页面细节
2024-05-23 16:44:04 +08:00
clay
db8a96a664
feat : 需求征集index.vue
2024-05-23 15:53:33 +08:00
clay
17207b2c87
feat : 按钮全新啊demo
2024-05-23 15:48:31 +08:00
d6de4d5854
Merge pull request 'fix : 修复页面细节' ( #222 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/222
2024-05-23 07:37:20 +00:00
bcdafbc7cd
fix : 修复页面细节
2024-05-23 15:36:57 +08:00
clay
e9e5a0c785
feat : 修改菜单状态
2024-05-23 14:49:56 +08:00
clay
21f90e438c
fix : 修复细节
2024-05-23 10:00:21 +08:00
e1b9f3f220
Merge pull request 'fix : 修复人员选择框' ( #221 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/221
2024-05-22 15:53:21 +00:00
96d46e6480
fix : 修复人员选择框
2024-05-22 23:52:51 +08:00
9e5d07d7e5
Merge pull request 'master' ( #220 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/220
2024-05-20 16:22:59 +00:00
6ab0c206c4
Merge pull request 'fix : 修复细节' ( #219 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/219
2024-05-20 16:22:29 +00:00
a4255c3157
fix : 修复细节
2024-05-21 00:21:24 +08:00
39b1690c0a
Merge pull request 'fix : 修复流程图渲染问题' ( #218 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/218
2024-05-20 16:15:50 +00:00
9f4fe95e4d
fix : 修复流程图渲染问题
2024-05-21 00:14:53 +08:00
1635482e09
Merge pull request 'fix : 重新提交全流程初步完成' ( #217 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/217
2024-05-20 15:02:07 +00:00
3270aeef06
fix : 重新提交全流程初步完成
2024-05-20 23:01:53 +08:00
lilinyuan
6c80652416
feat: agree and reject
2024-05-20 22:18:17 +08:00
lilinyuan
c97091db4f
feat: 主流程详情组件基本完成
2024-05-20 22:03:53 +08:00
1c57cb277b
Merge pull request 'fix : 重新提交页面初始化' ( #216 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/216
2024-05-20 09:56:49 +00:00
e648faba69
fix : 重新提交页面初始化
2024-05-20 17:56:38 +08:00
a663b84fab
Merge pull request 'fix : 修复需求上报/详情下流程渲染' ( #215 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/215
2024-05-20 03:47:24 +00:00
f83ae8df51
fix : 修复所属公司及详情loading
2024-05-20 11:45:53 +08:00
1d772e1414
fix : 修复需求上报/详情下流程渲染
2024-05-20 11:05:29 +08:00
92e9468cb9
Merge pull request 'fix : 修复页面细节' ( #214 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/214
2024-05-19 16:59:19 +00:00
5c93eae4ce
fix : 修复页面细节
2024-05-20 00:58:48 +08:00
5d7b6bc59f
Merge pull request 'dj' ( #213 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/213
2024-05-19 16:45:20 +00:00
1825b6c871
fix : 修复页面细节
2024-05-20 00:44:37 +08:00
dee7fdacf2
Merge pull request 'dj' ( #212 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/212
2024-05-19 16:31:02 +00:00
dc7d90c349
Merge remote-tracking branch 'origin/master'
2024-05-20 00:29:46 +08:00
9661cdbb2b
fix : 修复页面细节功能及附件上传组件
2024-05-20 00:29:31 +08:00
wenhua
3a4f9927c9
feat: up detail
2024-05-19 23:07:32 +08:00
1f4389eb5e
fix : 修复项目申请/验收/结项功能
2024-05-19 20:39:54 +08:00
wenhua
4a90f4bc1e
合并冲突
2024-05-19 20:19:50 +08:00
wenhua
8155a4d160
feat: 需求上报详情
2024-05-19 20:17:55 +08:00
771a844552
Merge pull request 'fix : 修复页面' ( #211 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/211
2024-05-19 10:01:01 +00:00
08a609e2a8
fix : 修复页面
2024-05-19 18:00:48 +08:00
d16045a1b2
Merge pull request 'fix : 修复项目立项页面' ( #210 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/210
2024-05-19 08:40:20 +00:00
1fc0ae6ac0
fix : 修复项目立项页面
2024-05-19 16:40:05 +08:00
08f20bb171
Merge pull request 'fix : 修改细节' ( #209 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/209
2024-05-19 08:20:12 +00:00
5421145583
fix : 修改细节
2024-05-19 16:19:53 +08:00
b7a0dc2545
Merge pull request 'fix : 修改审批记录样式' ( #208 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/208
2024-05-19 07:27:32 +00:00
3bd6df74cc
fix : 修改审批记录样式
2024-05-19 15:27:22 +08:00
wenhua
190a1d6477
Merge branches 'master' and 'master' of http://git.feashow.cn/clay/mosr-web
2024-05-19 14:04:30 +08:00
wenhua
cb7f6e9919
feat: 详情组件, 实例文件
2024-05-19 14:04:28 +08:00
5ea20654cc
Merge pull request 'fix : 修复需求汇总详情功能' ( #207 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/207
2024-05-19 05:23:23 +00:00
670c8a5653
fix : 修复需求汇总详情功能
2024-05-19 13:23:10 +08:00
206a024f4b
Merge pull request 'fix : 修复需求汇总详情功能' ( #206 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/206
2024-05-19 05:18:22 +00:00
89d5c86d8b
fix : 修复需求汇总详情功能
2024-05-19 13:18:03 +08:00
397d5f0182
Merge pull request 'fix : 修复需求上报功能' ( #205 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/205
2024-05-19 04:31:09 +00:00
10bc019866
fix : 修复需求上报功能
2024-05-19 12:29:59 +08:00
62620b1dc5
Merge pull request 'fix : 修复页面细节' ( #204 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/204
2024-05-19 03:40:46 +00:00
ff68ce96af
fix : 修复页面细节
2024-05-19 11:40:37 +08:00
65d933c027
Merge pull request 'fix : 修复页面细节' ( #203 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/203
2024-05-19 03:26:53 +00:00
726c746a87
fix : 修复页面细节
2024-05-19 11:26:32 +08:00
c498a3de62
Merge pull request 'fix : 修复页面细节' ( #202 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/202
2024-05-19 03:14:26 +00:00
d432e54bc8
fix : 修复页面细节
2024-05-19 11:09:51 +08:00
5b68ee6846
Merge pull request 'feat : 需求上报界面初始化' ( #201 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/201
2024-05-18 18:04:09 +00:00
96e7ca1a67
feat : 需求上报界面初始化
2024-05-19 02:03:52 +08:00
9368ea24ab
Merge pull request 'dj' ( #200 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/200
2024-05-18 16:17:14 +00:00
c96cbf8415
fix : 修复细节
2024-05-19 00:16:40 +08:00
bab0421b6d
Merge pull request 'fix : 修复tooltip细节' ( #199 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/199
2024-05-18 15:05:04 +00:00
fccce985b6
Merge remote-tracking branch 'origin/master'
2024-05-18 23:05:01 +08:00
c675b1ec48
fix : 修复tooltip细节
2024-05-18 23:04:51 +08:00
02bda3c71f
Merge pull request 'fix : 修复附件上传组件bug' ( #198 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/198
2024-05-18 14:10:06 +00:00
b7ebd66729
fix : 修复附件上传组件bug
2024-05-18 22:08:08 +08:00
76c759c088
Merge pull request 'fix : 修复需求征集详情组件下载bug' ( #197 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/197
2024-05-18 12:59:52 +00:00
e4e7444aff
fix : 修复需求征集详情组件下载bug
2024-05-18 20:59:35 +08:00
a8f5f84b20
Merge pull request 'dj' ( #196 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/196
2024-05-18 12:52:32 +00:00
716d18122f
feat : 封装带有附件及其他文件上传的组件
2024-05-18 20:52:14 +08:00
2f19bb7bdc
Merge remote-tracking branch 'origin/master'
2024-05-18 19:56:54 +08:00
8f8d954bb6
Merge pull request 'feat : 文件下载组件删除功能' ( #195 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/195
2024-05-18 11:56:52 +00:00
0732acf8c7
feat : 文件下载组件删除功能
2024-05-18 19:54:58 +08:00
6540ac8991
Merge pull request 'fix : 替换文件下载方式' ( #194 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/194
2024-05-18 09:33:33 +00:00
6009885c09
fix : 替换文件下载方式
2024-05-18 17:32:58 +08:00
83a8fac0fb
Merge pull request 'dj' ( #193 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/193
2024-05-18 09:13:26 +00:00
0c070154e1
fix : 修复需求征集详情组件引用细节
2024-05-18 17:12:51 +08:00
32a3ab3001
Merge remote-tracking branch 'origin/master'
2024-05-18 16:56:28 +08:00
d0fe340f9d
Merge pull request 'feat : 新增需求征集组件' ( #192 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/192
2024-05-17 15:25:09 +00:00
92d2278dfd
Merge remote-tracking branch 'origin/master'
2024-05-17 23:24:52 +08:00
f5c6680c66
feat : 新增需求征集组件
2024-05-17 23:24:38 +08:00
b5e5a3f12a
Merge pull request 'feat : 项目归档页面初始化' ( #191 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/191
2024-05-17 13:27:15 +00:00
7869ff4e6a
feat : 项目归档页面初始化
2024-05-17 21:26:15 +08:00
45dc828332
Merge pull request 'master' ( #190 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/190
2024-05-17 12:55:50 +00:00
95f4610714
Merge pull request 'dj' ( #189 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/189
2024-05-17 12:55:39 +00:00
9754b62038
feat : 新增需求征集删除功能和文件下载功能
2024-05-17 20:53:49 +08:00
573fff84e4
Merge remote-tracking branch 'origin/master'
2024-05-17 19:35:49 +08:00
wenhua
26f5c2c9c5
Merge pull request 'fix: 调整权限按钮判断' ( #188 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/188
2024-05-16 02:05:20 +00:00
lilinyuan
1f1ff3a466
fix: 调整权限按钮判断
2024-05-16 10:04:31 +08:00
79f2032fde
feat : 项目归档和分摊页面初始化
2024-05-15 23:39:21 +08:00
wenhua
8ac192f8ba
Merge pull request 'fix: 修改table显示bug' ( #187 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/187
2024-05-15 08:36:42 +00:00
lilinyuan
f820c25892
fix: 修改table显示bug
2024-05-15 16:35:36 +08:00
wenhua
496109cc1a
Merge pull request 'master' ( #186 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/186
2024-05-15 08:01:16 +00:00
lilinyuan
a4cb59ff9a
fix: 修改权限按钮逻辑判断
2024-05-15 16:00:24 +08:00
a7b6b44a42
Merge pull request 'feat : 项目实施分页面初始化' ( #185 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/185
2024-05-15 06:20:09 +00:00
1f126592e1
feat : 项目实施分页面初始化
2024-05-15 14:19:36 +08:00
e08eccb46d
Merge pull request 'master' ( #184 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/184
2024-05-15 05:29:17 +00:00
0f914237bf
Merge pull request 'fix : 修复细节' ( #183 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/183
2024-05-15 05:29:07 +00:00
9a0f5b0e12
fix : 修复细节
2024-05-15 13:28:53 +08:00
df9debe453
Merge pull request 'master' ( #182 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/182
2024-05-15 05:25:29 +00:00
9f7e3778ad
Merge pull request 'fix : 修复细节' ( #181 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/181
2024-05-15 05:25:16 +00:00
01540a3144
fix : 修复细节
2024-05-15 13:24:44 +08:00
43433b3b02
Merge pull request 'master' ( #180 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/180
2024-05-15 01:58:49 +00:00
5e4e8d6389
Merge pull request 'fix : 修复需求征集新增功能' ( #179 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/179
2024-05-15 01:49:01 +00:00
08579c8aad
fix : 修复需求征集新增功能
2024-05-15 09:48:38 +08:00
5ae971e0ac
Merge pull request 'dj' ( #178 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/178
2024-05-14 16:27:50 +00:00
9ae0b7547c
feat : 项目立项详情页面初始化
2024-05-15 00:18:40 +08:00
b2369d1702
feat : 项目实施页面初始化
2024-05-15 00:17:18 +08:00
8b6c9a7d1e
Merge remote-tracking branch 'origin/master'
2024-05-14 23:53:02 +08:00
6097e74a9b
Merge pull request 'feat : 项目立项申请页面初始化' ( #177 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/177
2024-05-14 14:16:45 +00:00
11b794bf96
Merge remote-tracking branch 'origin/master'
2024-05-14 22:16:31 +08:00
2a72de08a4
feat : 项目立项申请页面初始化
2024-05-14 22:16:22 +08:00
1cec0b123c
Merge pull request 'master' ( #176 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/176
2024-05-14 13:32:40 +00:00
77fcdc240b
Merge pull request 'fix : 修复功能细节' ( #175 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/175
2024-05-14 13:32:27 +00:00
6d8dbaa8c4
fix : 修复功能细节
2024-05-14 21:32:10 +08:00
d7b004ae80
Merge pull request 'fix : 修复细节' ( #174 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/174
2024-05-14 13:07:27 +00:00
1f9a3603d8
fix : 修复细节
2024-05-14 21:07:17 +08:00
324862a61f
Merge pull request 'master' ( #173 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/173
2024-05-14 12:57:42 +00:00
b8b165c205
Merge pull request 'fix : 修复路由规范问题' ( #172 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/172
2024-05-14 12:56:36 +00:00
de2f566bd0
fix : 修复路由规范问题
2024-05-14 20:55:49 +08:00
38182da467
Merge pull request 'fix : 修复路由规范问题' ( #171 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/171
2024-05-14 12:50:05 +00:00
de0e0be953
fix : 修复路由规范问题
2024-05-14 20:49:46 +08:00
ef1acd65b7
Merge pull request 'fix : 修复路由规范问题' ( #170 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/170
2024-05-14 12:26:50 +00:00
27dcca6617
fix : 修复路由规范问题
2024-05-14 20:26:33 +08:00
2ad94511d0
Merge pull request 'dj' ( #169 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/169
2024-05-14 09:56:48 +00:00
bfdf2cf4a2
feat : 项目立项页面初始化
2024-05-14 17:56:36 +08:00
4f4ef2cfde
fix : 修复细节
2024-05-14 17:56:10 +08:00
aa76f82a74
Merge pull request 'master' ( #168 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/168
2024-05-14 09:14:42 +00:00
222ab1bec7
Merge pull request 'fix : 修复细节' ( #167 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/167
2024-05-14 09:14:30 +00:00
bead5edc86
fix : 修复细节
2024-05-14 17:11:59 +08:00
24fc98cf7b
Merge pull request 'master' ( #166 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/166
2024-05-13 16:11:51 +00:00
18caa0ee58
Merge pull request 'dj' ( #165 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/165
2024-05-13 16:11:21 +00:00
96d8f1e48a
Merge remote-tracking branch 'origin/master'
2024-05-14 00:09:46 +08:00
3bc24219ed
fix : 修复首页tag报错
2024-05-14 00:09:36 +08:00
e7a2753c06
Merge pull request 'master' ( #164 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/164
2024-05-13 16:03:58 +00:00
07d5380818
Merge pull request 'dj' ( #163 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/163
2024-05-13 16:03:34 +00:00
cd91dd3cad
fix : 修复首页卡死问题
2024-05-14 00:03:08 +08:00
edb235ff0d
Merge remote-tracking branch 'origin/master'
2024-05-13 23:30:20 +08:00
9ade24768e
fix : 优化样式
2024-05-13 23:30:07 +08:00
e753c27455
Merge pull request 'dj' ( #162 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/162
2024-05-13 15:04:01 +00:00
1684e49662
Merge remote-tracking branch 'origin/master'
2024-05-13 23:03:15 +08:00
42ea1dde8b
fix : 修复功能
2024-05-13 23:03:05 +08:00
wenhua
a7ae9df845
Merge pull request 'master' ( #161 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/161
2024-05-13 14:36:55 +00:00
wenhua
bb2a0ce177
Merge pull request 'xqhz' ( #160 ) from xqhz into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/160
2024-05-13 14:36:20 +00:00
wenhua
9da6e82763
Merge pull request 'master' ( #158 ) from master into xqhz
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/158
2024-05-13 14:31:08 +00:00
lilinyuan
31a88c232f
feat: 重新上传表格组件
2024-05-13 22:30:50 +08:00
1c00a040f0
Merge pull request 'dj' ( #159 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/159
2024-05-13 14:30:31 +00:00
lilinyuan
f46f95c4ad
fix: 删除该分支表格组件
2024-05-13 22:29:07 +08:00
9e8e3e4705
Merge remote-tracking branch 'origin/master'
2024-05-13 22:29:01 +08:00
f55059eed7
fix : 修复功能
2024-05-13 22:28:44 +08:00
lilinyuan
3bec5a6620
fix: 合并冲突
2024-05-13 22:27:35 +08:00
lilinyuan
ad3fa0e688
feat: 表格组件更新
2024-05-13 22:25:37 +08:00
lilinyuan
0041bbbfa8
Merge branch 'xqhz' of http://git.feashow.cn/clay/mosr-web into xqhz
2024-05-13 22:23:00 +08:00
lilinyuan
bdc9c244a4
feat: 新增组件列展示配置
2024-05-13 22:22:55 +08:00
clay
acc38adae1
feat : workflow编辑器 无用功能屏蔽
2024-05-13 22:15:58 +08:00
clay
f04459aba1
Merge pull request 'master' ( #156 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/156
2024-05-13 11:28:48 +00:00
clay
5911d0f6d2
feat : workflow编辑器 无用功能屏蔽
2024-05-13 19:28:16 +08:00
clay
66454b2023
Merge remote-tracking branch 'origin/master'
2024-05-13 17:41:27 +08:00
clay
8d51d68df1
feat : workflow编辑器 无用功能屏蔽
2024-05-13 17:41:17 +08:00
4000b0b8e9
Merge pull request 'master' ( #155 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/155
2024-05-12 16:29:09 +00:00
84a3981df3
Merge pull request 'fix : 修复编辑数据回显功能' ( #154 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/154
2024-05-12 16:28:56 +00:00
64981433bf
fix : 修复编辑数据回显功能
2024-05-13 00:27:53 +08:00
e5dfadb8c0
Merge pull request 'fix : 修复功能' ( #153 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/153
2024-05-12 15:38:17 +00:00
888c01efbf
fix : 修复功能
2024-05-12 23:38:04 +08:00
c206844e24
Merge pull request 'fix : 修复功能' ( #152 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/152
2024-05-12 15:29:21 +00:00
4070e15e63
fix : 修复功能
2024-05-12 23:28:47 +08:00
clay
2d23266e50
Merge pull request 'master' ( #151 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/151
2024-05-12 13:57:24 +00:00
92b9dd5e03
Merge pull request 'dd' ( #150 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/150
2024-05-12 13:57:00 +00:00
2d73580195
fix : 修复功能
2024-05-12 21:56:44 +08:00
3538813100
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/api/project-demand/index.js
# src/views/projectdemand/demandcollection/add.vue
2024-05-12 21:56:33 +08:00
71d78d9cca
fix : 修复功能
2024-05-12 21:53:08 +08:00
clay
14fa25b509
Merge remote-tracking branch 'origin/master'
2024-05-12 20:27:45 +08:00
clay
bd220ad5b1
feat : 重新提交
2024-05-12 20:27:38 +08:00
4a7cffde2e
Merge pull request 'fix : 修复功能' ( #148 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/148
2024-05-12 11:42:43 +00:00
b170d42263
fix : 修复功能
2024-05-12 19:42:24 +08:00
d0e517e7d9
Merge pull request 'dj' ( #147 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/147
2024-05-12 11:40:00 +00:00
55e0f28ebc
fix : 修复功能
2024-05-12 19:39:39 +08:00
250f6344f1
fix : 修复功能
2024-05-12 19:08:41 +08:00
abbb4551ad
Merge pull request 'fix : 修复功能' ( #146 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/146
2024-05-12 11:05:35 +00:00
6ae58eefaf
fix : 修复功能
2024-05-12 19:05:13 +08:00
9d63b64c91
Merge pull request 'fix : 修复上传文件功能' ( #145 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/145
2024-05-12 09:03:39 +00:00
324cc268b5
fix : 修复上传文件功能
2024-05-12 17:03:12 +08:00
d5c7da1328
Merge pull request 'fix : 修复上传文件功能' ( #144 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/144
2024-05-12 08:35:31 +00:00
13774dada9
fix : 修复上传文件功能
2024-05-12 16:34:10 +08:00
68cc3e7a12
Merge pull request 'fix : 修复编辑数据回显功能' ( #143 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/143
2024-05-12 07:48:30 +00:00
72a8572910
fix : 修复编辑数据回显功能
2024-05-12 15:47:14 +08:00
86ddbf2ffb
Merge pull request 'fix : 修复细节' ( #142 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/142
2024-05-12 07:35:54 +00:00
d139b016a2
fix : 修复细节
2024-05-12 15:35:40 +08:00
8bdafdd087
Merge pull request 'dj' ( #141 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/141
2024-05-12 07:16:14 +00:00
b4c91f3daf
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/views/workflow/process/nodes/Node.vue
2024-05-12 15:15:48 +08:00
clay
aaedb362b5
build : 按钮权限区分
2024-05-12 15:14:39 +08:00
548cab4cde
fix : 修复文件删除功能
2024-05-12 15:14:28 +08:00
876bd1f9f9
fix : 修复文件删除功能
2024-05-12 15:11:37 +08:00
eeab66d8fb
fix : 修复细节
2024-05-12 14:44:04 +08:00
clay
416fa2ed53
build : 流程演示
2024-05-12 14:23:34 +08:00
72210306b6
Merge pull request 'fix : 修复细节' ( #139 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/139
2024-05-12 06:00:10 +00:00
6fbcdc82ca
fix : 修复细节
2024-05-12 13:59:50 +08:00
8e671e959c
Merge pull request 'fix : 修复细节' ( #138 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/138
2024-05-12 05:06:10 +00:00
48e5d82acb
fix : 修复细节
2024-05-12 13:05:52 +08:00
wenhua
ce2752af9b
feat: 新增文件上传组件等
2024-05-12 01:29:49 +08:00
01021b640e
Merge pull request 'fix : 修复细节' ( #137 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/137
2024-05-11 15:23:20 +00:00
5e08db55fb
fix : 修复细节
2024-05-11 23:22:55 +08:00
7810de1327
Merge pull request 'fix : 首页待办列表' ( #136 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/136
2024-05-11 13:48:29 +00:00
b58dfcb566
fix : 首页待办列表
2024-05-11 21:48:16 +08:00
clay
44ed106775
build : 需求征集提交
2024-05-11 21:40:49 +08:00
a077e38fdc
Merge pull request 'fix : 修复页面' ( #135 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/135
2024-05-11 13:37:37 +00:00
9c6c494b80
fix : 修复页面
2024-05-11 21:37:15 +08:00
77301e09e4
Merge pull request 'fix : 修复详情页面' ( #134 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/134
2024-05-11 13:16:18 +00:00
a7d9391e9a
fix : 修复详情页面
2024-05-11 21:16:03 +08:00
af2667502a
Merge pull request 'fix : 对接需求征集详情接口' ( #133 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/133
2024-05-11 12:49:14 +00:00
eb061dd1a6
fix : 对接需求征集详情接口
2024-05-11 20:49:03 +08:00
clay
f0212046f3
build : 修改dm发布
2024-05-11 20:38:05 +08:00
5498337d3e
Merge pull request 'fix : 对接需求征集详情接口' ( #132 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/132
2024-05-11 10:06:40 +00:00
6c27a5f954
fix : 对接需求征集详情接口
2024-05-11 18:06:25 +08:00
615e0f85c7
Merge pull request 'dd' ( #131 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/131
2024-05-11 09:50:54 +00:00
04d0e9a7d2
fix : 修复需求征集列表细节
2024-05-11 17:50:35 +08:00
0cf56d875e
fix : 对接需求征集列表接口
2024-05-11 17:48:44 +08:00
779ebf093a
Merge pull request 'fix : 对接需求征集列表接口' ( #130 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/130
2024-05-11 09:41:04 +00:00
0d31b47a56
fix : 对接需求征集列表接口
2024-05-11 17:40:47 +08:00
clay
f7fddab0bd
Merge remote-tracking branch 'origin/master'
2024-05-11 15:59:40 +08:00
clay
9da9b763be
feat : 详情页修改
2024-05-11 15:59:25 +08:00
e935c870bf
Merge pull request 'fix : 修复细节' ( #129 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/129
2024-05-11 07:51:50 +00:00
c008aab0d3
fix : 修复细节
2024-05-11 15:51:19 +08:00
d9dce9e8e5
Merge pull request 'fix : 完善需求新增/详情页面' ( #128 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/128
2024-05-11 07:42:10 +00:00
e6a515f673
fix : 完善需求新增/详情页面
2024-05-11 15:41:56 +08:00
5ce118a149
Merge pull request 'fix : 完善需求新增页面' ( #127 ) from dd into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/127
2024-05-11 07:31:42 +00:00
452e2479e0
fix : 完善需求新增页面
2024-05-11 15:30:53 +08:00
clay
5c0e962626
feat : workflow前端内容检查
2024-05-11 15:10:43 +08:00
cf367951a5
Merge pull request 'fix : 完善页面' ( #123 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/123
2024-05-11 06:59:05 +00:00
dde77b1425
fix : 完善页面
2024-05-11 14:58:41 +08:00
wenhua
3ba7845893
feat: 新增需求上报部分页面内容
2024-05-11 00:14:25 +08:00
wenhua
a5822ca276
fix: 修改权限按钮bug
2024-05-11 00:14:03 +08:00
332d843dc2
Merge pull request 'fix : 完善详情页面细节' ( #122 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/122
2024-05-10 09:56:23 +00:00
fdca87d870
fix : 完善详情页面细节
2024-05-10 17:56:06 +08:00
99d90acebc
Merge pull request 'master' ( #121 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/121
2024-05-10 09:31:43 +00:00
1a211fec21
Merge pull request 'fix : 完善详情页面细节' ( #120 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/120
2024-05-10 09:31:01 +00:00
5710597454
fix : 完善详情页面细节
2024-05-10 17:30:29 +08:00
clay
81d0987a9a
feat : workflow适配
2024-05-10 15:14:11 +08:00
6b2a94453c
Merge pull request 'master' ( #119 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/119
2024-05-10 04:39:58 +00:00
1ee39bfa0c
Merge pull request 'dj' ( #118 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/118
2024-05-09 16:30:11 +00:00
371a55cfe1
fix : 完善页面细节
2024-05-10 00:29:07 +08:00
90de57698b
feat : 需求征集新增/编辑/详情页面初始化
2024-05-10 00:28:40 +08:00
bd679710e2
Merge pull request 'master' ( #117 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/117
2024-05-09 10:27:32 +00:00
858289ec0e
Merge pull request 'fix :完善首页界面' ( #116 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/116
2024-05-09 10:27:08 +00:00
bf6a683261
fix :完善首页界面
2024-05-09 18:26:40 +08:00
460dd793cf
Merge pull request 'dj' ( #115 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/115
2024-05-09 10:11:32 +00:00
be5150c7c4
feat: 初始化需求征集主页面
2024-05-09 18:11:11 +08:00
233f44990d
Merge pull request 'master' ( #114 ) from master into dj
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/114
2024-05-09 09:36:35 +00:00
wenhua
3403ca7ecb
Merge pull request 'xqhz' ( #113 ) from xqhz into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/113
2024-05-09 09:33:33 +00:00
lilinyuan
28b4637e01
feat: 初始化需求汇总主页面
2024-05-09 17:33:01 +08:00
lilinyuan
639caadc46
fix: 修复bug
2024-05-09 17:32:36 +08:00
lilinyuan
6557b5d2c8
fix: 修复bug
2024-05-09 17:32:21 +08:00
86610c07a8
Merge pull request 'master' ( #112 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/112
2024-05-09 09:18:40 +00:00
4f6b2dcc27
Merge pull request 'feat : 新增首页界面' ( #111 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/111
2024-05-09 09:17:30 +00:00
dcc6866211
feat : 新增首页界面
2024-05-09 17:16:39 +08:00
wenhua
0e0e1f9bb9
Merge pull request 'feat: 初始化项目需求目录及页面文件' ( #110 ) from master into xqhz
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/110
2024-05-09 08:19:28 +00:00
lilinyuan
0e0d206cc7
feat: 初始化项目需求目录及页面文件
2024-05-09 16:14:48 +08:00
wenhua
bfe24e1207
Merge pull request 'role' ( #109 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/109
2024-05-09 07:30:12 +00:00
lilinyuan
d2521765be
Merge branch 'role' of http://git.feashow.cn/clay/mosr-web into role
2024-05-09 15:29:05 +08:00
lilinyuan
5c1b66b03d
feat: 新增sidermenu首页项
2024-05-09 15:29:00 +08:00
clay
b336efa79c
Merge pull request 'feat : 测试sso单点登录之后的重定向路径4' ( #108 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/108
2024-04-29 03:50:07 +00:00
clay
2bb86ced15
feat : 测试sso单点登录之后的重定向路径4
2024-04-29 11:49:46 +08:00
clay
d010907d2b
Merge pull request 'feat : 测试sso单点登录之后的重定向路径3' ( #107 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/107
2024-04-29 03:28:30 +00:00
clay
929228974a
feat : 测试sso单点登录之后的重定向路径3
2024-04-29 11:27:56 +08:00
clay
894b656a82
Merge pull request 'feat : 测试sso单点登录之后的重定向路径' ( #106 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/106
2024-04-29 02:31:44 +00:00
clay
eee3c3852e
feat : 测试sso单点登录之后的重定向路径
2024-04-29 10:31:18 +08:00
clay
4b9ecb9360
Merge pull request 'feat : 测试sso单点登录之后的重定向路径' ( #105 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/105
2024-04-29 02:22:08 +00:00
clay
57bfb6f4a0
feat : 测试sso单点登录之后的重定向路径
2024-04-29 10:20:58 +08:00
clay
228fef7a9b
Merge pull request 'feat : 测试sso单点登录之后的重定向路径' ( #104 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/104
2024-04-29 02:11:08 +00:00
clay
5d3ab890f3
feat : 测试sso单点登录之后的重定向路径
2024-04-29 10:10:50 +08:00
clay
6a6a440428
Merge pull request 'master' ( #103 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/103
2024-04-29 02:04:25 +00:00
clay
3eecc3f4b9
Merge pull request 'role' ( #102 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/102
2024-04-29 02:04:03 +00:00
clay
29ea0d5fe4
feat : 测试sso单点登录之后的重定向路径
2024-04-29 10:03:46 +08:00
lilinyuan
8c1d2eeabe
feat: 新增登录重定向之前被拦截的页面
2024-04-29 09:58:18 +08:00
wenhua
ee9462769f
Merge pull request 'master' ( #101 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/101
2024-04-01 07:31:41 +00:00
wenhua
9217f019e5
Merge pull request 'fix: 按钮逻辑' ( #100 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/100
2024-04-01 07:31:24 +00:00
lilinyuan
24dfaac98a
fix: 按钮逻辑
2024-04-01 15:30:56 +08:00
wenhua
cf2f071f6d
Merge pull request 'master' ( #99 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/99
2024-04-01 07:09:01 +00:00
wenhua
26b50d6103
Merge pull request 'fix: 调整菜单权限按钮' ( #98 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/98
2024-04-01 07:08:40 +00:00
lilinyuan
b5acea2e47
fix: 调整菜单权限按钮
2024-04-01 15:02:09 +08:00
wenhua
18113da288
Merge pull request 'master' ( #97 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/97
2024-04-01 06:36:54 +00:00
wenhua
12053b81b9
Merge pull request 'role' ( #96 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/96
2024-04-01 06:36:33 +00:00
lilinyuan
39bc3011dd
fix: 去掉操作列悬浮
2024-04-01 14:36:02 +08:00
lilinyuan
6e42dd43f7
fix: 组件调整
2024-04-01 14:28:08 +08:00
lilinyuan
1b10b9aa2b
fix: 角色管理调整
2024-04-01 14:27:52 +08:00
lilinyuan
8964cbe4bd
fix: 注释install
2024-04-01 13:58:03 +08:00
wenhua
743f55c11d
Merge pull request 'master' ( #95 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/95
2024-04-01 05:49:16 +00:00
wenhua
360f0dd92d
Merge pull request 'fix: 修改依赖源地址' ( #94 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/94
2024-04-01 05:48:54 +00:00
lilinyuan
de971d224e
fix: 修改依赖源地址
2024-04-01 13:48:34 +08:00
wenhua
4009f05185
Merge pull request 'master' ( #93 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/93
2024-04-01 05:42:12 +00:00
wenhua
68c4ca5dc9
Merge pull request 'fix: 修改依赖源' ( #92 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/92
2024-04-01 05:41:49 +00:00
lilinyuan
5977480404
fix: 修改依赖源
2024-04-01 13:41:23 +08:00
wenhua
182572bfd1
Merge pull request 'master' ( #91 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/91
2024-04-01 03:28:44 +00:00
wenhua
8f922a8815
Merge pull request 'role' ( #90 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/90
2024-04-01 03:28:24 +00:00
lilinyuan
508e391823
feat: 恢复
2024-04-01 11:27:06 +08:00
lilinyuan
2560ed701f
fix: 暂时删除
2024-04-01 11:25:27 +08:00
lilinyuan
9123149565
feat: up dependencies
2024-04-01 11:23:51 +08:00
lilinyuan
f1e1def32c
feat: up dependencies
2024-04-01 11:20:55 +08:00
wenhua
5edd4ee722
Merge pull request 'master' ( #86 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/86
2024-04-01 03:00:53 +00:00
wenhua
c3e582ad33
Merge pull request 'feat: up' ( #85 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/85
2024-04-01 03:00:32 +00:00
lilinyuan
e787128011
feat: up
2024-04-01 11:00:10 +08:00
wenhua
497f1ad64e
Merge pull request 'master' ( #84 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/84
2024-04-01 02:21:19 +00:00
wenhua
fde73bd7b0
Merge pull request 'fix: 再试一次' ( #83 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/83
2024-04-01 02:20:57 +00:00
lilinyuan
90f6bd344e
fix: 再试一次
2024-04-01 10:20:32 +08:00
wenhua
ff632ef4cf
Merge pull request 'master' ( #82 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/82
2024-04-01 02:14:40 +00:00
wenhua
ef46911a5b
Merge pull request 'fix: 使用原始ui库' ( #81 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/81
2024-04-01 02:14:17 +00:00
lilinyuan
ffc5600b9b
fix: 使用原始ui库
2024-04-01 10:13:53 +08:00
wenhua
10d094a5b7
Merge pull request 'master' ( #79 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/79
2024-04-01 01:53:35 +00:00
wenhua
a3c4a79fd0
Merge pull request 'fix: 添加调试log' ( #78 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/78
2024-04-01 01:53:04 +00:00
lilinyuan
fbae33730d
fix: 添加调试log
2024-04-01 09:52:01 +08:00
wenhua
f395fa32c7
Merge pull request 'master' ( #77 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/77
2024-03-30 16:36:50 +00:00
wenhua
450d483f39
Merge pull request 'fix: 菜单分配父子联动' ( #76 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/76
2024-03-30 16:36:29 +00:00
lilinyuan
64c735eb74
fix: 菜单分配父子联动
2024-03-31 00:36:08 +08:00
wenhua
57153d3bc7
Merge pull request 'master' ( #75 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/75
2024-03-30 16:24:24 +00:00
wenhua
699c7ecc7d
Merge pull request 'fix: 同步退出登录后再登录不同权限账号时菜单不更新问题' ( #74 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/74
2024-03-30 16:24:00 +00:00
lilinyuan
ed0a5e1a7d
fix: 同步退出登录后再登录不同权限账号时菜单不更新问题
2024-03-31 00:23:31 +08:00
wenhua
5b3a6b6bf4
Merge pull request 'master' ( #73 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/73
2024-03-30 16:13:28 +00:00
wenhua
0ffbdbbcc7
Merge pull request 'fix: 修复角色分配菜单父子关联不生效的问题' ( #72 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/72
2024-03-30 16:13:08 +00:00
lilinyuan
7e0a065944
fix: 修复角色分配菜单父子关联不生效的问题
2024-03-31 00:12:35 +08:00
6fbf040107
Merge pull request 'master' ( #71 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/71
2024-03-30 14:59:49 +00:00
d784928d05
Merge pull request 'fix : 修改登录框宽度' ( #70 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/70
2024-03-30 14:59:26 +00:00
a005409d92
fix : 修改登录框宽度
2024-03-30 22:59:01 +08:00
6b81e35db0
Merge pull request 'master' ( #69 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/69
2024-03-29 14:59:14 +00:00
7b500e7ea1
Merge pull request 'fix : 修改登录界面样式' ( #68 ) from dj into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/68
2024-03-29 14:58:32 +00:00
e9acf99ccb
fix : 修改登录界面样式
2024-03-29 22:58:00 +08:00
clay
dd659cf135
build : 修改dm发布
2024-03-29 20:53:46 +08:00
clay
0c56e6a161
build : 修改dm发布
2024-03-29 20:50:06 +08:00
clay
bba369abaa
build : 修改dm发布
2024-03-29 20:47:49 +08:00
clay
fcff8c9cc4
build : 修改dm发布
2024-03-29 20:44:33 +08:00
clay
13d3428d7a
build : 环境区分
2024-03-29 18:22:23 +08:00
clay
97578316b8
Merge pull request 'master' ( #63 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/63
2024-03-29 10:10:54 +00:00
clay
99cf83a563
Merge remote-tracking branch 'origin/master'
2024-03-29 18:10:33 +08:00
clay
f98103c61f
build : 环境区分
2024-03-29 18:10:26 +08:00
wenhua
4c07528102
Merge pull request 'master' ( #62 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/62
2024-03-29 09:14:52 +00:00
wenhua
5986ab1eb4
Merge pull request 'fix: 生产环境禁用debugger' ( #61 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/61
2024-03-29 09:14:28 +00:00
lilinyuan
2282f1c834
fix: 生产环境禁用debugger
2024-03-29 17:14:04 +08:00
wenhua
065ef047a7
Merge pull request 'master' ( #59 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/59
2024-03-29 08:50:13 +00:00
wenhua
ecf3fecd40
Merge pull request 'fix: 调整删除按钮展示逻辑' ( #58 ) from uesr into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/58
2024-03-29 08:49:50 +00:00
wenhua
b5c5b9ec99
Merge pull request 'master' ( #57 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/57
2024-03-29 07:47:14 +00:00
wenhua
46a6745f17
Merge pull request 'role' ( #56 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/56
2024-03-29 07:46:43 +00:00
lilinyuan
d6ce782681
feat: 添加request
2024-03-29 15:45:14 +08:00
lilinyuan
aa3194dcc1
fix: 暂时删除request
2024-03-29 15:42:33 +08:00
lilinyuan
e418b588f6
fix: 修改request提示
2024-03-29 15:41:21 +08:00
lilinyuan
a5a2e099a2
fix: 修改请求报错提示
2024-03-29 15:34:34 +08:00
lilinyuan
19822a539c
fix: 修改tablecol显示bug
2024-03-29 15:34:17 +08:00
clay
fa56d63dbb
Merge remote-tracking branch 'origin/master'
2024-03-29 15:21:02 +08:00
clay
2ad0dbf8ab
feat : 403 权限校验
2024-03-29 15:20:52 +08:00
wenhua
76824a5c57
Merge pull request 'master' ( #53 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/53
2024-03-29 07:19:59 +00:00
wenhua
89b42dba2a
Merge pull request 'uesr' ( #52 ) from uesr into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/52
2024-03-29 07:19:39 +00:00
wenhua
75b0625dc4
Merge pull request 'master' ( #51 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/51
2024-03-29 06:32:25 +00:00
wenhua
c88be616fc
Merge pull request 'fix: 修复role新增编辑bug' ( #50 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/50
2024-03-29 06:32:08 +00:00
lilinyuan
0fc918b576
fix: 修复role新增编辑bug
2024-03-29 14:31:45 +08:00
wenhua
4585a4e49d
Merge pull request 'master' ( #49 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/49
2024-03-29 06:16:39 +00:00
wenhua
38b5e2d2af
Merge pull request 'role' ( #48 ) from role into master
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/48
2024-03-29 06:15:51 +00:00
lilinyuan
4c17bf7f6a
fix: 修改默认用户名为super
2024-03-29 14:15:23 +08:00
lilinyuan
878940c34b
fix: 固定role列表操作列
2024-03-29 14:15:04 +08:00
wenhua
eb5b27fdf8
Merge pull request 'master' ( #46 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/46
2024-03-29 06:07:55 +00:00
wenhua
e8ab5fc050
Merge pull request 'master' ( #44 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/44
2024-03-28 08:43:11 +00:00
wenhua
9df7674abc
Merge pull request 'master' ( #42 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/42
2024-03-28 01:34:34 +00:00
wenhua
21517a41a3
Merge pull request 'master' ( #40 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/40
2024-03-27 06:22:52 +00:00
wenhua
4449fcce60
Merge pull request 'master' ( #38 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/38
2024-03-26 08:32:54 +00:00
27c7b68595
Merge pull request 'master' ( #36 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/36
2024-03-26 07:03:41 +00:00
306f92f4e5
Merge pull request 'master' ( #34 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/34
2024-03-25 14:41:50 +00:00
51fe4e113b
Merge pull request 'master' ( #32 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/32
2024-03-25 14:39:51 +00:00
3bb0b9108c
Merge pull request 'master' ( #30 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/30
2024-03-25 12:42:35 +00:00
b8aff8512d
Merge pull request 'master' ( #28 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/28
2024-03-25 10:01:07 +00:00
6ec24f7431
Merge pull request 'master' ( #26 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/26
2024-03-25 09:09:50 +00:00
wenhua
d4373bc44f
Merge pull request 'master' ( #24 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/24
2024-03-25 02:57:52 +00:00
wenhua
d0c20d68eb
Merge pull request 'master' ( #22 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/22
2024-03-24 15:05:37 +00:00
wenhua
ad808d6fa6
Merge pull request 'master' ( #20 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/20
2024-03-20 06:11:28 +00:00
wenhua
ac92da76aa
Merge pull request 'master' ( #18 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/18
2024-03-19 09:15:28 +00:00
20c913f61f
Merge pull request 'master' ( #16 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/16
2024-03-18 07:43:36 +00:00
f25e74869b
Merge pull request 'master' ( #14 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/14
2024-03-18 07:25:56 +00:00
clay
09028a2041
Merge pull request 'feat : 添加表单设置页面' ( #12 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/12
2024-03-12 03:43:38 +00:00
0a9d2fbfc1
Merge pull request 'master' ( #10 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/10
2024-03-08 02:28:16 +00:00
901cf7fbc4
Merge pull request 'master' ( #8 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/8
2024-03-05 14:14:37 +00:00
bd9d0a43c2
Merge pull request 'master' ( #6 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/6
2024-03-05 13:55:11 +00:00
9eb481be57
Merge pull request 'master' ( #4 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/4
2024-03-05 12:49:36 +00:00
f568676a40
Merge pull request 'master' ( #2 ) from master into prod
...
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/2
2024-03-05 01:16:13 +00:00