 zhutianqi
|
c7aebd4698
|
commit
|
2021-07-22 14:23:23 +08:00 |
|
|
zhutianqi
|
130e8c9fa5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-22 13:59:31 +08:00 |
|
|
zhutianqi
|
a7ac33f6ed
|
commit
|
2021-07-22 13:59:21 +08:00 |
|
|
yangzijiao
|
5a053ad174
|
菜单管理权限
|
2021-07-22 13:40:19 +08:00 |
|
|
yangzijiao
|
c3d67b6f24
|
Merge remote-tracking branch 'origin/develop' into develop-1
|
2021-07-22 13:35:25 +08:00 |
|
|
yangzijiao
|
36e5704827
|
角色管理按钮权限
|
2021-07-22 13:35:16 +08:00 |
|
|
liuhuaizhi
|
f0c8036a15
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-22 13:22:50 +08:00 |
|
|
liuhuaizhi
|
6823af0eaa
|
fix(45716 车型项目库，查看页面，开始时间，完成时间吗，应该只显示年月日 ):
|
2021-07-22 13:22:41 +08:00 |
|
|
super_liu
|
b41cd111c8
|
feat: 企业标准库模块
|
2021-07-22 10:39:52 +08:00 |
|
|
super_liu
|
ba35661aa8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-22 10:26:17 +08:00 |
|
|
yuezhihang
|
6858f5c5b6
|
待办界面流程对象对应
|
2021-07-22 10:13:51 +08:00 |
|
|
super_liu
|
23917e989a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-22 10:11:32 +08:00 |
|
|
super_liu
|
add0f76364
|
feat: 标准库 入库流程 修改属性字段存储类型
|
2021-07-22 10:11:08 +08:00 |
|
|
fanlin
|
7144830d04
|
bug:分页问题
|
2021-07-22 09:25:53 +08:00 |
|
|
fanlin
|
27d4e7c151
|
bug:入库流程--发起页面，把被引用标准这个字段去掉
|
2021-07-22 09:00:12 +08:00 |
|
|
宋伟佳
|
b2c2c09b0e
|
Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop
|
2021-07-21 21:01:12 +08:00 |
|
|
宋伟佳
|
9a0ca53e4a
|
评估流程2
|
2021-07-21 21:01:07 +08:00 |
|
|
super_liu
|
c1c23c001c
|
feat: 标准库 统一组织结构树组件
|
2021-07-21 19:12:54 +08:00 |
|
|
宋伟佳
|
9230484aa9
|
Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop
|
2021-07-21 18:37:21 +08:00 |
|
|
宋伟佳
|
6aaa35c260
|
修复bug
|
2021-07-21 18:37:15 +08:00 |
|
|
fanlin
|
e64bb44564
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-07-21 16:59:33 +08:00 |
|
|
宋伟佳
|
ceb38f14df
|
add git test
|
2021-07-21 16:47:34 +08:00 |
|
|
宋伟佳
|
eab7dc54f6
|
Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop
|
2021-07-21 16:39:52 +08:00 |
|
|
宋伟佳
|
2c988a3f76
|
修复bug
|
2021-07-21 16:39:46 +08:00 |
|
|
fanlin
|
1460149cdf
|
bug
|
2021-07-21 16:35:21 +08:00 |
|
|
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 |
|
|
fanlin
|
e02b43658a
|
bug:国内、外标准法规点击收藏数据进去到我的收藏中
|
2021-07-21 15:12:40 +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 |
|