Commit Graph
164 Commits
Author SHA1 Message Date
Superman_Main eee8a2e8e5 Merge branch 'develop' into FOTON 2021-11-24 12:06:40 +08:00
宋伟佳 5c057b6e86 commit 2021-11-24 09:34:04 +08:00
Superman_Main ae4a1d9e3c Merge branch 'develop' into FOTON 2021-11-22 22:27:56 +08:00
zhutianqi 7178058e6c Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 18:01:03 +08:00
zhutianqi 12ed48f629 commit 2021-11-22 18:00:52 +08:00
宋伟佳 33b439b60b commit 2021-11-22 17:15:16 +08:00
Superman_Main 366d1769f8 Merge branch 'develop' into FOTON
# Conflicts:
#	src/components/navMenu/index.vue
2021-11-22 16:30:33 +08:00
zhaokaiyao@91isoft.com fc64506d52 代替标准手动查找 2021-11-22 15:57:27 +08:00
zhaokaiyao@91isoft.com e834074f26 Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 15:04:25 +08:00
zhaokaiyao@91isoft.com 244ca20a4f 查询,清空按钮 2021-11-22 15:04:17 +08:00
宋伟佳 39a76c67f2 commit 2021-11-22 14:51:24 +08:00
zhutianqi e6d32a70d4 Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 11:02:24 +08:00
zhutianqi d617908297 commit 2021-11-22 11:02:18 +08:00
shenyanpei 9f86ad6f5b 菜单栏高度 2021-11-22 10:39:13 +08:00
Superman_Main 3b2499c3f3 Merge branch 'develop' into FOTON 2021-11-22 10:01:43 +08:00
zhutianqi 057bd0aafc commit 2021-11-22 09:58:18 +08:00
Superman_Main 09ab35e1b2 Merge branch 'develop' into FOTON 2021-11-22 09:52:17 +08:00
zhutianqi a71989e27c commit 2021-11-22 09:43:24 +08:00
Superman_Main 4e0f398ad7 feat:FOTON release 2021-11-22 09:41:51 +08:00
shenyanpei c21b849657 页面样式修改,工作组统计 2021-11-21 16:56:47 +08:00
yanyizhou 65499086da Merge remote-tracking branch 'origin/develop' into develop 2021-11-21 16:05:31 +08:00
yanyizhou 99e7c9774d 且增加模糊筛选(输入首字段,跳出相关选项,供选择) 2021-11-21 16:05:24 +08:00
zhutianqi f4e39d5ac2 commit 2021-11-21 15:33:04 +08:00
zhutianqi 16741310cf commit 2021-11-19 15:18:10 +08:00
zhutianqi 3d2d0e7112 commit 2021-11-18 17:18:19 +08:00
zhutianqi f193baa948 commit 2021-11-18 16:55:34 +08:00
zhutianqi e67bec4f4e Merge remote-tracking branch 'origin/develop' into develop 2021-11-14 16:09:34 +08:00
zhutianqi 6ecf657da7 commit 2021-11-14 16:09:16 +08:00
shenyanpei 1cdddd5374 工作组样式修改 2021-11-13 15:13:47 +08:00
shenyanpei 4f01fbeebc 标准化活动日历 2021-11-11 15:54:28 +08:00
宋伟佳 ee4a9f08ba commit 2021-11-10 18:00:51 +08:00
宋伟佳 7aedc5c410 commit 2021-11-10 09:32:14 +08:00
zhutianqi d3d92ef4cd Merge remote-tracking branch 'origin/develop' into develop 2021-11-08 18:02:13 +08:00
zhutianqi 5f849fa11b commit 2021-11-08 18:02:05 +08:00
shenyanpei c8bfc7c051 选择人框查询条件 2021-11-08 14:48:06 +08:00
zhutianqi 211e45e4eb commit 2021-11-08 14:09:55 +08:00
yanyizhou 0eae69039f 光速选人 2021-11-05 13:54:46 +08:00
zhutianqi 9e848f0fdd commit 2021-11-04 17:54:43 +08:00
zhutianqi bb292f1c0a commit 2021-11-04 11:18:12 +08:00
super_liu 83a154103c feat: There is no way the,Laws 2021-11-03 15:46:22 +08:00
yanyizhou 9d0ba2373b Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/processCenter/pages/newProcess/index.vue
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
2021-11-03 10:02:59 +08:00
yanyizhou 5b9848e2bc 政策征求意见流程 和 重点认证标准/政策合规性项目审查流程 2021-11-03 09:57:46 +08:00
zhutianqi b3f92b8d7c commit 2021-11-02 14:02:25 +08:00
super_liu 6579b7d166 feat: There is no way the 2021-10-30 00:52:07 +08:00
zhutianqi a0f1fdc2f1 commit 2021-10-25 13:15:06 +08:00
yanyizhou 9cdc77656c 左侧菜单栏收缩放到右侧 2021-10-22 14:16:21 +08:00
shenyanpei 142953fe50 将国内海外编辑页面改为树形选择 2021-10-21 11:30:35 +08:00
宋伟佳 3a6ae671c2 commit 2021-10-20 19:52:51 +08:00
zhutianqi d0b7851c43 commit 2021-10-19 13:53:21 +08:00
宋伟佳 08b4de67d8 commit 2021-10-17 19:57:52 +08:00