FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
302 Commits 3 Branches 0 Tags
23fe93d991841bab3feab73300a003c18146f041
Commit Graph
113 Commits
Author SHA1 Message Date
super_liu 23fe93d991 Merge remote-tracking branch 'origin/develop' into develop 2021-07-15 18:37:03 +08:00
super_liu 04ec966f28 feat: 标准库入库流程 添加未实现功能 2021-07-15 18:36:44 +08:00
shen_yan_pu 49c6a49bef 修改按钮权限id 2021-07-15 17:49:07 +08:00
宋伟佳 e71a959714 Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-15 16:38:01 +08:00
宋伟佳 9190568fc8 评估流程 2021-07-15 16:37:55 +08:00
zhutianqi d936597828 Merge remote-tracking branch 'origin/develop' into develop 2021-07-15 15:19:32 +08:00
zhutianqi 3cbb0111a0 commit 2021-07-15 15:19:22 +08:00
super_liu adafbb2df9 Merge remote-tracking branch 'origin/develop' into develop 2021-07-15 09:10:36 +08:00
super_liu 3f3dd1ea35 feat: 标准库 2021-07-15 09:09:50 +08:00
宋伟佳 5c46f8a86b Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-14 21:02:16 +08:00
宋伟佳 9be9f1664d 评估流程 2021-07-14 21:02:11 +08:00
zhutianqi de627ca1db Merge remote-tracking branch 'origin/develop' into develop 2021-07-14 18:00:41 +08:00
zhutianqi 61f7f1342b commit 2021-07-14 18:00:35 +08:00
宋伟佳 4c338c36f9 Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-14 17:15:55 +08:00
宋伟佳 8b4e61300d 修复bug 2021-07-14 17:15:50 +08:00
shen_yan_pu b2e04ae8ca 未符合项整改流程第二步添加查询 2021-07-14 16:14:57 +08:00
zhutianqi cff0bbca8d Merge remote-tracking branch 'origin/develop' into develop 2021-07-14 14:20:00 +08:00
zhutianqi 7ec73c26e9 commit 2021-07-14 14:19:48 +08:00
宋伟佳 024a30d8d5 Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-14 13:48:11 +08:00
宋伟佳 c70d436e0f 评估流程 2021-07-14 13:48:06 +08:00
zhutianqi b6c4774489 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/pages/localTool/standAutoSplit/index.vue
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
 2021-07-13 17:55:59 +08:00
zhutianqi 7fbea78a8a commit 2021-07-13 17:54:39 +08:00
super_liu 4b4c7b7da8 Merge remote-tracking branch 'origin/develop' into develop 2021-07-13 16:14:12 +08:00
super_liu f2f643a588 feat: 标准入库 文件信息功能完善 2021-07-13 16:13:55 +08:00
shen_yan_pu 75bccd61eb 未符合项整改流程 2021-07-13 15:36:29 +08:00
super_liu b6c147848c Merge remote-tracking branch 'origin/develop' into develop 2021-07-13 14:23:03 +08:00
super_liu 3164d7dc49 feat: 标准库 添加 企业标准库关联 2021-07-13 14:22:51 +08:00
宋伟佳 493339fd7f Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-13 10:29:06 +08:00
宋伟佳 301a415765 评估流程及权限 2021-07-13 10:29:00 +08:00
super_liu f5d20984db feat: 迁移代码标准库分页url替换 标准详情对应字段修改 2021-07-12 18:08:23 +08:00
super_liu 1ab0345cce feat: 标准库 编辑对应属性字段 体系树结构 流程 2021-07-11 15:47:50 +08:00
super_liu 2ae9d80a16 Merge remote-tracking branch 'origin/develop' into develop 2021-07-09 18:16:10 +08:00
super_liu 74e83d6111 feat: 标准库 编辑对应属性字段 体系树结构 2021-07-09 18:14:50 +08:00
zhutianqi 15c1867e83 Merge remote-tracking branch 'origin/develop' into develop 2021-07-09 17:27:11 +08:00
zhutianqi a5f2bff546 commit 2021-07-09 17:27:05 +08:00
宋伟佳 47da77630b 评估流程 2021-07-09 16:21:45 +08:00
宋伟佳 db8cd5ec3c Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-09 10:07:23 +08:00
宋伟佳 9317c2f287 评估流程 2021-07-09 10:07:15 +08:00
zhutianqi 57a02d5333 commit 2021-07-09 10:06:14 +08:00
宋伟佳 6aba9c3cd5 合并冲突 2021-07-08 21:10:45 +08:00
宋伟佳 7c7ef0c56c 评估流程 2021-07-08 21:08:08 +08:00
zhutianqi eaab0d5016 Merge remote-tracking branch 'origin/develop' into develop 2021-07-08 17:31:27 +08:00
zhutianqi edf0a1ad03 commit 2021-07-08 17:31:21 +08:00
宋伟佳 ea9a271c1a Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-08 17:04:24 +08:00
宋伟佳 b117f49a63 commit 2021-07-08 17:04:20 +08:00
shen_yan_pu 5595dbf3dc 未符合项整改流程 2021-07-08 16:55:02 +08:00
shen_yan_pu 70f0dffef0 未符合项整改流程 2021-07-08 16:32:35 +08:00
宋伟佳 51ac4e8453 commit 2021-07-08 14:48:43 +08:00
宋伟佳 1e2e86d264 合并冲突 2021-07-08 14:48:31 +08:00
宋伟佳 1a0242fea6 commit 2021-07-08 14:41:49 +08:00