FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,568 Commits 3 Branches 0 Tags
ace65ede29df160c3cac09c70af76270d5572166
Commit Graph
1568 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhaokaiyao@91isoft.com 6d3c0449dc 海外标准->编辑页->文本状态可编辑 2021-09-04 14:33:44 +08:00
宋伟佳 69436a7ea1 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-09-04 14:20:58 +08:00
宋伟佳 c4d7fdaeb9 项目清单确认流程数据显示 2021-09-04 14:20:53 +08:00
王夏晖 2b492e2e66 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!124
 2021-09-04 11:34:02 +08:00
yanyizhou b3875f85a9 企业标准库--编辑页面的代替企标编号的手动查找页面,1.文本状态没回显，标准状态改成文本状态 {2.数据来源只能是企业标准--(已改)} 2021-09-04 10:07:00 +08:00
yanyizhou abdef11637 Merge remote-tracking branch 'origin/develop' into develop 2021-09-03 20:32:07 +08:00
yanyizhou 8efe4c5a81 国内外标准法规--编辑页面的手动查找查找的标准的文本状态显示不对，且把标准状态改成文本状态 2021-09-03 20:31:57 +08:00
yanyizhou 40a34adca4 机构管理--加筛选条件：姓名和邮箱 2021-09-03 17:24:21 +08:00
宋伟佳 1dabab9fd4 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-09-03 16:37:19 +08:00
宋伟佳 f81aff8d57 流程提交bug 2021-09-03 16:37:09 +08:00
王夏晖 41b798c02e Merge branch 'develop' into 'test' 
Develop

See merge request !119
 2021-09-03 08:13:41 +00:00
wangxiahui@91isoft.com 93a0ca58c1 海外标准法规必填项 2021-09-03 16:09:25 +08:00
zhaokaiyao@91isoft.com 493c3f5323 企标禁止选择数据来源 2021-09-03 15:48:46 +08:00
zhaokaiyao@91isoft.com d25118f6aa 禁止上传图片 2021-09-03 15:39:42 +08:00
zhaokaiyao@91isoft.com 8c08a9399f Merge remote-tracking branch 'origin/develop' into develop 2021-09-03 13:53:36 +08:00
zhaokaiyao@91isoft.com 877bd29a99 企标编号可编辑 2021-09-03 13:53:30 +08:00
王夏晖 2ad071bf50 Merge branch 'develop' into 'test' 
企业标准库列表样式

See merge request !118
 2021-09-03 03:33:16 +00:00
shenyanpei dd9ceb0357 企业标准库列表样式 2021-09-03 11:22:17 +08:00
zhaokaiyao@91isoft.com 658788b0cf 企标详情文本状态叹号 2021-09-03 11:08:29 +08:00
zhaokaiyao@91isoft.com 99ba4248b1 企标编号可标记 2021-09-03 11:06:05 +08:00
王夏晖 c0946c8aa3 Merge branch 'develop' into 'test' 
Develop

See merge request !117
 2021-09-03 02:42:14 +00:00
wangxiahui@91isoft.com c0cdb86200 改样式 2021-09-03 10:39:48 +08:00
Mr.Z 61464742bd 标准预警bug修复~ 2021-09-03 10:33:45 +08:00
wangxiahui@91isoft.com 47da0d589e 修改字段 2021-09-03 10:12:50 +08:00
王夏晖 2800ace636 Merge branch 'develop' into 'test' 
Develop

See merge request !116
 2021-09-03 01:11:52 +00:00
shenyanpei 08237cbf1f 清单版本 2021-09-02 18:02:48 +08:00
zhaokaiyao@91isoft.com cb9513fb45 commit 2021-09-02 16:51:24 +08:00
shenyanpei ef96c620dc 未符合项回退问题 2021-09-02 16:17:00 +08:00
宋伟佳 bb2e4b92b0 分页查询bug修复 2021-09-02 15:51:10 +08:00
宋伟佳 ab9cd62bbe Merge remote-tracking branch 'origin/develop' into develop 2021-09-02 15:26:44 +08:00
宋伟佳 d3e1198915 修改分页bug 2021-09-02 15:26:23 +08:00
super_liu b78175c8be feat: There is no way the 2021-09-02 15:25:13 +08:00
super_liu 405faefc2f Merge remote-tracking branch 'origin/develop' into develop 2021-09-02 15:20:43 +08:00
super_liu f197165cbb feat: There is no way the Transfer and withdrawal 2021-09-02 15:20:34 +08:00
yanyizhou cbf2ebab7f 流程中心 标准清单发布/更新流程 第一步 分页查询（+） 2021-09-02 15:09:28 +08:00
yanyizhou 254cacd4fe Merge remote-tracking branch 'origin/develop' into develop 2021-09-02 13:55:56 +08:00
yanyizhou 46afe87fea 修复 标准合规评估结果 技术评估结果 查看 分页搜索功能bug 2021-09-02 13:55:50 +08:00
宋伟佳 7ae9e262e8 项目清单确认流程第二步保存 2021-09-02 10:17:37 +08:00
yanyizhou c9334b231d Merge remote-tracking branch 'origin/develop' into develop 2021-09-02 09:29:44 +08:00
王夏晖 8378ece942 Merge branch 'develop' into 'test' 
Develop

See merge request !115
 2021-09-02 01:06:40 +00:00
宋伟佳 1c15592d6c 项目清单确认流程修改bug 2021-09-01 17:51:08 +08:00
zhutianqi 4bce323022 Merge remote-tracking branch 'origin/develop' into develop 2021-09-01 17:18:43 +08:00
zhutianqi 378ca60789 commit 2021-09-01 17:18:36 +08:00
zhaokaiyao@91isoft.com 240679cd35 Merge remote-tracking branch 'origin/develop' into develop 2021-09-01 17:08:15 +08:00
zhaokaiyao@91isoft.com 161ec20bc3 OCR 2021-09-01 17:08:08 +08:00
yanyizhou db34dcd791 更改多个项目或清单选择问题 修复ref相同导致的bug 2021-09-01 16:45:21 +08:00
yanyizhou 5d9bb87aa7 更改多个项目或清单选择问题 2021-09-01 16:25:15 +08:00
王夏晖 29335c3506 Merge branch 'develop' into 'test' 
Develop

See merge request !114
 2021-09-01 08:23:43 +00:00
yanyizhou 1df56128e8 Merge remote-tracking branch 'origin/develop' into develop 2021-09-01 16:05:12 +08:00
yanyizhou ab4bc4f3a5 项目清单确认流程 更改多个项目或清单选择问题 2021-09-01 16:05:06 +08:00