Commit Graph
1832 Commits
Author SHA1 Message Date
宋伟佳 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
宋伟佳 9fa4cce190 commit 2021-10-18 19:56:13 +08:00
宋伟佳 ecd1b4c1dc commit 2021-10-18 14:08:52 +08:00
宋伟佳 12941aa7ac commit 2021-10-18 13:28:15 +08:00
宋伟佳 3b7075f14f commit 2021-10-17 11:32:14 +08:00
宋伟佳 079db318a5 commit 2021-10-16 14:04:57 +08:00
宋伟佳 cbd6b630dc commit 2021-10-16 10:33:14 +08:00
宋伟佳 9229392fcf commit 2021-10-16 09:33:58 +08:00
宋伟佳 7142b4f322 commit 2021-10-15 15:00:48 +08:00
wangxiahui@91isoft.com 5bf7aa515b 项目清单注掉多余权限 2021-10-15 10:29:05 +08:00
yanyizhou 78814cebf2 Merge remote-tracking branch 'origin/develop' into develop 2021-10-14 15:53:12 +08:00
yanyizhou e5b4a65e8e 国外标准法规修改提交后收藏无法同步的问题 2021-10-14 15:53:06 +08:00
shenyanpei 33d711071c 需修改表单分页,图标样式 2021-10-14 15:33:44 +08:00
zhutianqi 9af1f4320b Merge remote-tracking branch 'origin/develop' into develop 2021-10-14 14:56:47 +08:00
zhutianqi 24afd1f144 commit 2021-10-14 14:56:25 +08:00
super_liu 08bbc9a6ad Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
2021-10-14 14:46:33 +08:00
super_liu 9394110a24 feat: There is no way the oa 2021-10-14 14:45:03 +08:00
wangxiahui@91isoft.com 68e3980645 项目清单确认流程 注掉多余按钮 2021-10-14 10:33:03 +08:00
宋伟佳 23837b645e commit 2021-10-13 21:47:58 +08:00
zhaokaiyao@91isoft.com 70dd56ec58 Merge remote-tracking branch 'origin/develop' into develop 2021-10-13 18:42:33 +08:00
zhaokaiyao@91isoft.com a686c7f0d6 入库流程/标准编辑 树形选择 关闭问题 2021-10-13 18:42:24 +08:00
super_liu e5da6e0b27 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
2021-10-13 17:58:37 +08:00
super_liu 8d60c72e84 feat: There is no way the oa add endTime 2021-10-13 17:57:48 +08:00
宋伟佳 8cb45eae57 清单确认流程按钮更改 2021-10-13 16:28:14 +08:00
zhutianqi c35c73701b commit 2021-10-13 16:00:56 +08:00
zhaokaiyao@91isoft.com 1931714e05 Merge remote-tracking branch 'origin/develop' into develop 2021-10-13 11:20:55 +08:00
zhaokaiyao@91isoft.com df2d5ecc93 标准入库,文件第一次提交 2021-10-13 11:20:45 +08:00
zhutianqi 344df35614 commit 2021-10-12 10:06:09 +08:00
super_liu b3bf5aad01 Merge branch 'develop' into develop_idm 2021-10-11 17:49:49 +08:00
super_liu 19089f562f feat: There is no way the idm and oa 2021-10-11 17:48:17 +08:00
zhaokaiyao@91isoft.com d2a2b6ad74 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-10-11 16:53:25 +08:00
zhaokaiyao@91isoft.com d4c312d982 标准入库流程1->添加文件名出现undefined 2021-10-11 16:53:15 +08:00
zhutianqi dddb7b613e commit 2021-10-11 16:14:27 +08:00