FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,561 Commits 3 Branches 0 Tags
73cb52770ee3d155b8bc08b2521076386d7d87f1
Commit Graph
1561 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
wangxiahui@91isoft.com 73cb52770e 首页log长度 2021-10-18 15:45:48 +08:00
宋伟佳 ecd1b4c1dc commit 2021-10-18 14:08:52 +08:00
宋伟佳 12941aa7ac commit 2021-10-18 13:28:15 +08:00
宋伟佳 08b4de67d8 commit 2021-10-17 19:57:52 +08:00
宋伟佳 d2fe41b41b commit 2021-10-17 14:38:37 +08:00
宋伟佳 3b7075f14f commit 2021-10-17 11:32:14 +08:00
宋伟佳 079db318a5 commit 2021-10-16 14:04:57 +08:00
宋伟佳 b493818454 commit 2021-10-16 10:41:21 +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
zhutianqi 1968fd8b0a Merge remote-tracking branch 'origin/develop' into develop 2021-10-15 10:53:29 +08:00
zhutianqi fd7ef4eb9f commit 2021-10-15 10:53:22 +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
zhutianqi 5e9e82c910 Merge remote-tracking branch 'origin/develop' into develop 2021-10-14 14:22:29 +08:00
zhutianqi a5b6748732 commit 2021-10-14 14:22:22 +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
super_liu 15a6f6c9a9 Merge remote-tracking branch 'origin/develop' into develop 2021-10-12 16:32:27 +08:00
super_liu 67073864ca feat: There is no way the to home2 2021-10-12 16:32:08 +08:00
zhutianqi aac560e2d3 commit 2021-10-12 14:26:11 +08:00
zhutianqi 344df35614 commit 2021-10-12 10:06:09 +08:00
super_liu a683c60276 Merge branch 'develop_idm' into 'develop' 
Develop idm

See merge request LAWS/laws-system-front-FOTON!174
 2021-10-11 18:10:25 +08:00
super_liu b0ac11edf4 feat: There is no way the idm and oa 2021-10-11 17:54:22 +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
zhutianqi dd3bad1a91 Merge remote-tracking branch 'origin/develop' into develop 2021-10-11 16:10:33 +08:00
zhutianqi 718a2b923b commit 2021-10-11 16:10:00 +08:00
zhaokaiyao@91isoft.com a105a3e6fc 入库流程->标准体系弹出框->无法取消 同上一个提交 2021-10-11 11:10:44 +08:00
zhaokaiyao@91isoft.com 637b3e1bb4 标准详情->关联模块 弹出框无法取消问题 同上一个问题 2021-10-09 17:33:22 +08:00
zhaokaiyao@91isoft.com 353cbbcfd5 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-10-09 17:23:15 +08:00
zhaokaiyao@91isoft.com ebeed11b5a 入库流程->模块结构选择框问题 2021-10-09 17:23:02 +08:00