Commit Graph
3240 Commits
Author SHA1 Message Date
zhutianqi a790511e97 commit 2021-12-31 09:58:56 +08:00
zhutianqi d21423f5e9 Merge remote-tracking branch 'origin/develop' into develop 2021-12-30 18:08:24 +08:00
zhutianqi a8e2bc9a3c commit 2021-12-30 18:08:19 +08:00
shenyanpei a8467d916e 注释国内、海外、企标右侧菜单按钮 2021-12-30 18:00:14 +08:00
zhutianqi bb64874a2e Merge remote-tracking branch 'origin/develop' into develop 2021-12-30 17:48:29 +08:00
zhutianqi 0bbe1a0b5d commit 2021-12-30 17:48:23 +08:00
zhaokaiyao@91isoft.com 021af1806d Merge remote-tracking branch 'origin/develop' into develop 2021-12-30 17:46:29 +08:00
zhaokaiyao@91isoft.com 8849004b05 企标复选框权限 2021-12-30 17:46:23 +08:00
shenyanpei aa9bf64879 标准调研选人 2021-12-30 17:42:13 +08:00
shenyanpei 642f431c44 标准解读批量编辑问题 2021-12-30 17:34:54 +08:00
shenyanpei 14fb222460 标准解读批量编辑问题 2021-12-30 17:34:23 +08:00
super_liu 4d0d9c76e9 Merge remote-tracking branch 'origin/develop' into develop 2021-12-30 16:45:03 +08:00
super_liu cd9a47e60d feat: There is no way the, 2021-12-30 16:44:40 +08:00
zhutianqi b79ca92f03 commit 2021-12-30 16:27:30 +08:00
zhutianqi 0d7227249f Merge remote-tracking branch 'origin/develop' into develop 2021-12-30 16:12:02 +08:00
zhutianqi 00e584a968 commit 2021-12-30 16:11:57 +08:00
shenyanpei 33e9f9ec1b Merge remote-tracking branch 'origin/develop' into develop 2021-12-30 16:00:41 +08:00
shenyanpei cd0549f8e2 详情页样式 2021-12-30 16:00:26 +08:00
super_liu 34e3a6ca1b feat: There is no way the, 2021-12-30 16:00:01 +08:00
super_liu e8b4b7f9ea feat: There is no way the, 2021-12-30 14:46:03 +08:00
super_liu a7b42522bc Merge remote-tracking branch 'origin/develop' into develop 2021-12-30 14:07:52 +08:00
宋伟佳 7859b42fe3 标准合规评估bug 2021-12-30 14:04:24 +08:00
super_liu 49a2f05902 Merge remote-tracking branch 'origin/develop' into develop 2021-12-30 14:03:20 +08:00
super_liu 3081c03577 here is no way the,buss node 7 reject 2021-12-30 14:03:01 +08:00
zhutianqi 8431792082 commit 2021-12-30 10:53:11 +08:00
宋伟佳 3f7af8fc63 企标制修订流程修改 2021-12-29 20:42:26 +08:00
yanyizhou 80f74d0fca 海外标准 - 高级查询 - 日期范围查询和多选查询 2021-12-29 20:06:10 +08:00
yanyizhou 38d78f0f06 Merge remote-tracking branch 'origin/develop' into develop 2021-12-29 20:01:55 +08:00
yanyizhou 382f34cf28 国内标准 - 高级查询 - 日期范围查询和多选查询 2021-12-29 20:01:48 +08:00
super_liu 715f9579e0 Merge remote-tracking branch 'origin/develop' into develop 2021-12-29 18:26:54 +08:00
super_liu 550a73e499 feat: There is no way the,buss hh process 2021-12-29 18:26:35 +08:00
zhutianqi 7d9c34e444 Merge remote-tracking branch 'origin/develop' into develop 2021-12-29 17:49:58 +08:00
zhutianqi f704f6d8e8 commit 2021-12-29 17:49:52 +08:00
super_liu 7f2111bc46 Merge remote-tracking branch 'origin/develop' into develop 2021-12-29 17:41:24 +08:00
super_liu 4a48ca8e40 feat: There is no way the,buss plan 2021-12-29 17:41:16 +08:00
宋伟佳 16c9c664b0 企标制修订计划管控 2021-12-29 17:01:58 +08:00
yanyizhou 553ed28b8f Merge remote-tracking branch 'origin/develop' into develop 2021-12-29 16:35:00 +08:00
yanyizhou ab3e0db922 海外标准 - 编辑 - 1.海外标准列表上方的“编辑”,设置“中文名称”“英文名称”非必填(否则无法单独修改后提交修改);
2.此“编辑”页面“标准性质”删除
2021-12-29 16:34:54 +08:00
super_liu 19890c2559 feat: There is no way the,buss process name 2021-12-29 16:21:29 +08:00
zhutianqi 7018c2b4e9 Merge remote-tracking branch 'origin/develop' into develop 2021-12-29 16:10:56 +08:00
zhutianqi 6cfb2f8bc0 commit 2021-12-29 16:10:51 +08:00
zhaokaiyao@91isoft.com 82675a1a21 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
2021-12-29 16:08:46 +08:00
shenyanpei c5a23d5057 海外编辑模块变型号无法选择 2021-12-29 15:58:42 +08:00
super_liu d13e51804a Merge remote-tracking branch 'origin/develop' into develop 2021-12-29 15:43:41 +08:00
super_liu 1c79bafd89 feat: There is no way the,buss plan 2021-12-29 15:43:27 +08:00
zhutianqi 612dd12fad commit 2021-12-29 15:34:39 +08:00
zhutianqi 1079cec652 Merge remote-tracking branch 'origin/develop' into develop 2021-12-29 15:33:29 +08:00
zhutianqi 76e94d83ac commit 2021-12-29 15:33:24 +08:00
super_liu cbcccac08e Merge remote-tracking branch 'origin/develop' into develop 2021-12-29 15:20:35 +08:00
super_liu aa6736e652 feat: There is no way the,buss plan 2021-12-29 15:19:42 +08:00