Commit Graph

399 Commits

Author SHA1 Message Date
clay
604fad9009 Merge pull request 'master' (#230) from master into dm
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/230
2024-05-24 07:54:17 +00: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
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
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