FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,725 Commits 3 Branches 0 Tags
8a0d7e5ebfe667aefc1e3746c5cd5b49302b2ffb
Commit Graph
1725 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhutianqi 8a0d7e5ebf commit 2021-10-27 17:58:00 +08:00
zhutianqi 916279f7ae Merge remote-tracking branch 'origin/develop' into develop 2021-10-27 09:51:58 +08:00
zhutianqi f8349d8ce1 commit 2021-10-27 09:51:53 +08:00
王夏晖 6034249cf9 Merge branch 'test' into 'develop' 
# Conflicts:
#   src/sysConfig/index.js
 2021-10-27 09:31:47 +08:00
zhutianqi ce13aed18c Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
 2021-10-26 17:58:28 +08:00
zhutianqi 53eeb5cc56 commit 2021-10-26 17:57:58 +08:00
shenyanpei 8a8832496a 外部标准化协会入会流程 2021-10-26 17:26:57 +08:00
宋伟佳 3f7500be6e commit 2021-10-26 17:23:36 +08:00
宋伟佳 1f10184ee4 commit 2021-10-26 16:46:45 +08:00
zhutianqi 311c2b1ebc Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/pages/processCenter/pages/newProcess/index.vue
 2021-10-26 16:36:17 +08:00
zhutianqi 7acba6aaaa commit 2021-10-26 16:34:07 +08:00
宋伟佳 28f1da75dc commit 2021-10-26 09:34:54 +08:00
zhutianqi 37702f435f Merge remote-tracking branch 'origin/develop' into develop 2021-10-25 17:56:13 +08:00
zhutianqi 5942ba86b3 commit 2021-10-25 17:56:06 +08:00
宋伟佳 7b8a33e0da 外部署名推荐审批流程 2021-10-25 17:47:28 +08:00
super_liu 185ce228ed Merge remote-tracking branch 'origin/develop' into develop 2021-10-25 14:07:28 +08:00
super_liu e36796d3e5 feat: There is no way the 2021-10-25 14:07:12 +08:00
zhutianqi a0f1fdc2f1 commit 2021-10-25 13:15:06 +08:00
yanyizhou 249bc99138 Merge remote-tracking branch 'origin/develop' into develop 2021-10-22 18:00:16 +08:00
yanyizhou 9a0e1a82a2 展开基础信息折叠动画 2021-10-22 18:00:11 +08:00
super_liu 2dce246427 feat: There is no way the, TO optimize the query 2021-10-22 17:08:45 +08:00
super_liu b0f07ed40e feat: There is no way the, TO optimize the query 2021-10-22 16:01:43 +08:00
super_liu 341e78ea8d feat: There is no way the test conf 2021-10-22 15:16:56 +08:00
super_liu d79c7858e5 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!193
 2021-10-22 14:30:00 +08:00
super_liu b91e57419b Merge branch 'test' into 'develop' 
# Conflicts:
#   src/sysConfig/index.js
 2021-10-22 14:29:41 +08:00
yanyizhou 22f2bfbf35 Merge remote-tracking branch 'origin/develop' into develop 2021-10-22 14:17:21 +08:00
yanyizhou 9cdc77656c 左侧菜单栏收缩放到右侧 2021-10-22 14:16:21 +08:00
宋伟佳 ec3b397e65 commit 2021-10-21 14:57:24 +08:00
yanyizhou 858f215e53 Merge remote-tracking branch 'origin/develop' into develop 2021-10-21 14:39:06 +08:00
yanyizhou 37b01f7229 标准法规清单-新增-导出 程序异常 2021-10-21 14:38:59 +08:00
shenyanpei 142953fe50 将国内海外编辑页面改为树形选择 2021-10-21 11:30:35 +08:00
yanyizhou 9fbe5c0e1c 标准清单发布/更新流程 添加重复的标准后 添加弹窗显示暂无数据 点击清空 数据回来了 应该一直有数据 2021-10-21 10:39:14 +08:00
zhutianqi bed01d4afb commit 2021-10-21 09:33:35 +08:00
宋伟佳 0da8c7b44d commit 2021-10-20 20:54:44 +08:00
宋伟佳 3a6ae671c2 commit 2021-10-20 19:52:51 +08:00
宋伟佳 e60082120d commit 2021-10-20 16:09:18 +08:00
zhutianqi 553308b9ec Merge remote-tracking branch 'origin/develop' into develop 2021-10-20 15:44:47 +08:00
zhutianqi 56cf5790eb commit 2021-10-20 15:44:40 +08:00
宋伟佳 e8d4037ac9 commit 2021-10-20 15:26:12 +08:00
宋伟佳 4d16218c1a commit 2021-10-20 15:02:45 +08:00
宋伟佳 8758a6d473 commit 2021-10-20 14:35:09 +08:00
宋伟佳 2adcd40297 更改权限 2021-10-20 14:10:31 +08:00
宋伟佳 4b05158c70 commit 2021-10-19 18:07:15 +08:00
zhaokaiyao@91isoft.com 988da73120 Merge remote-tracking branch 'origin/develop' into develop 2021-10-19 16:05:51 +08:00
zhaokaiyao@91isoft.com 4d5c43d75b 海外标准详情预览权限 2021-10-19 16:05:44 +08:00
zhutianqi 0c2082cc78 Merge remote-tracking branch 'origin/develop' into develop 2021-10-19 13:53:39 +08:00
zhutianqi d0b7851c43 commit 2021-10-19 13:53:21 +08:00
super_liu a98a01b91e feat: There is no way the 2021-10-19 09:08:12 +08:00
super_liu 0413a1adec Merge remote-tracking branch 'origin/develop' into develop 2021-10-19 09:03:01 +08:00
super_liu e36c3f092b feat: There is no way the ie 8-11 2021-10-19 09:02:22 +08:00