 shen_yan_pu
|
b0c198e6df
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-21 16:28:43 +08:00 |
|
|
shen_yan_pu
|
a9c7a5b4d2
|
国家清单新增编辑
|
2021-07-21 16:28:32 +08:00 |
|
|
zhutianqi
|
63ef41fe8d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-21 16:27:05 +08:00 |
|
|
zhutianqi
|
bbb2102fb1
|
commit
|
2021-07-21 16:26:58 +08:00 |
|
|
yuezhihang
|
cf30193ceb
|
回显字段！！！！
|
2021-07-21 16:25:17 +08:00 |
|
|
宋伟佳
|
4c4541cd63
|
Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop
|
2021-07-21 15:46:53 +08:00 |
|
|
宋伟佳
|
e220e9c1f4
|
评估及未符合bug
|
2021-07-21 15:46:24 +08:00 |
|
|
yangzijiao
|
c274b139e9
|
Merge remote-tracking branch 'origin/develop' into develop-1
|
2021-07-21 13:56:40 +08:00 |
|
|
yangzijiao
|
59fee2f224
|
标准法规清单字段更改
|
2021-07-21 13:56:18 +08:00 |
|
|
liuhuaizhi
|
1d7c837dcd
|
fix:
5677 车型项目库--查看页面 添加按钮改成调取按钮，
点击【调取】进入，该页面需要加检索条件（参考期望），选择一个标准点击添加，查看页面没有数据
|
2021-07-21 13:40:00 +08:00 |
|
|
liuhuaizhi
|
927d34b146
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-21 13:23:54 +08:00 |
|
|
liuhuaizhi
|
1d296d876a
|
fix:
5677 车型项目库--查看页面 添加按钮改成调取按钮，
点击【调取】进入，该页面需要加检索条件（参考期望），选择一个标准点击添加，查看页面没有数据
|
2021-07-21 13:23:45 +08:00 |
|
|
yangzijiao
|
2af2a634c9
|
Merge remote-tracking branch 'origin/develop' into develop-1
|
2021-07-21 13:22:17 +08:00 |
|
|
zhutianqi
|
5f91f150a2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-21 11:21:41 +08:00 |
|
|
zhutianqi
|
fc5070ac81
|
commit
|
2021-07-21 11:21:22 +08:00 |
|
|
shen_yan_pu
|
58c00b6c72
|
调整新增字段，上传可以下载
|
2021-07-21 11:13:30 +08:00 |
|
|
yangzijiao
|
78a4160bc9
|
Merge branch 'develop-1' of D:\yuedi\laws-system-front-FOTON with conflicts.
|
2021-07-21 10:39:42 +08:00 |
|
|
宋伟佳
|
3673d37a8d
|
Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop
|
2021-07-21 10:36:25 +08:00 |
|
|
宋伟佳
|
70b4528a94
|
评估流程
|
2021-07-21 10:36:14 +08:00 |
|
|
yangzijiao
|
db975d3ea2
|
项目清单回显、按钮对齐
|
2021-07-21 10:25:06 +08:00 |
|
|
fanlin
|
47cdcbc1ae
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-20 18:03:03 +08:00 |
|
|
zhutianqi
|
128fd88956
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-20 18:00:18 +08:00 |
|
|
zhutianqi
|
1bf09d7ee9
|
commit
|
2021-07-20 18:00:11 +08:00 |
|
|
fanlin
|
28a889fc2f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-20 18:00:09 +08:00 |
|
|
fanlin
|
e69f39f4f0
|
bug: 把文本状态右侧的叹号去掉
|
2021-07-20 17:59:28 +08:00 |
|
|
fanlin
|
8df229c9b4
|
bug: 标准入库流程 责任人会签节点点击保存没反应
|
2021-07-20 17:57:06 +08:00 |
|
|
宋伟佳
|
b879288e24
|
Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop
|
2021-07-20 17:47:49 +08:00 |
|
|
宋伟佳
|
7da4bb7893
|
评估流程
|
2021-07-20 17:47:43 +08:00 |
|
|
fanlin
|
ab8db62e76
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-20 16:48:27 +08:00 |
|
|
fanlin
|
48db1ea810
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-20 16:45:33 +08:00 |
|
|
super_liu
|
6fd217e047
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-20 16:45:10 +08:00 |
|
|
super_liu
|
7040dbe706
|
feat: 标准库
|
2021-07-20 16:41:42 +08:00 |
|
|
fanlin
|
55ed51632e
|
bug: 修改国内/外标准法规bug
|
2021-07-20 16:40:25 +08:00 |
|
|
shen_yan_pu
|
6b2edd514e
|
页面列表的字段回显
|
2021-07-20 16:37:28 +08:00 |
|
|
宋伟佳
|
317294fdc0
|
Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop
|
2021-07-20 13:45:02 +08:00 |
|
|
宋伟佳
|
91b9606885
|
评估流程
|
2021-07-20 13:44:48 +08:00 |
|
|
yangzijiao
|
baffa64eac
|
Merge remote-tracking branch 'origin/develop' into develop-1
|
2021-07-20 13:24:57 +08:00 |
|
|
yangzijiao
|
d680b991b0
|
角色管理、标准内容自动识别、标准清单
|
2021-07-20 13:24:20 +08:00 |
|
|
shen_yan_pu
|
c3eb458337
|
标准清单的下载回显，上传，导出
|
2021-07-20 11:17:33 +08:00 |
|
|
shen_yan_pu
|
cabe3cf6c1
|
去除断点
|
2021-07-20 10:20:44 +08:00 |
|
|
zqx0221
|
35c002df6e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-20 09:51:45 +08:00 |
|
|
shen_yan_pu
|
6f391017fe
|
去除更新时间排序
|
2021-07-20 09:19:08 +08:00 |
|
|
fanlin
|
62e0264386
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-19 17:53:40 +08:00 |
|
|
yangzijiao
|
7a7dbc1149
|
标准法规清单编辑字数限制
|
2021-07-19 17:47:06 +08:00 |
|
|
fanlin
|
ac42ca0d4a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-19 17:47:05 +08:00 |
|
|
yangzijiao
|
02b2f9fe24
|
Merge remote-tracking branch 'origin/develop' into develop-1
|
2021-07-19 17:41:02 +08:00 |
|
|
yangzijiao
|
945f73bbe2
|
标准法规清单新增编辑字数限制
|
2021-07-19 17:40:52 +08:00 |
|
|
fanlin
|
a3e01f170f
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
|
2021-07-19 17:39:52 +08:00 |
|
|
宋伟佳
|
9e315314bc
|
Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop
|
2021-07-19 17:23:53 +08:00 |
|
|
宋伟佳
|
fddba323f3
|
项目评估流程
|
2021-07-19 17:23:46 +08:00 |
|