Commit Graph

Select branches

Hide Pull Requests

dev_20230829_change

dev_20231201_feizhi

master

Mono Color

• 6d3c0449dc 海外标准->编辑页->文本状态可编辑 zhaokaiyao@91isoft.com 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' 王夏晖 2021-09-04 11:34:02 +08:00
• b3875f85a9 企业标准库--编辑页面的代替企标编号的手动查找页面,1.文本状态没回显，标准状态改成文本状态 {2.数据来源只能是企业标准--(已改)} yanyizhou 2021-09-04 10:07:00 +08:00
• abdef11637 Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-09-03 20:32:07 +08:00
• 8efe4c5a81 国内外标准法规--编辑页面的手动查找查找的标准的文本状态显示不对，且把标准状态改成文本状态 yanyizhou 2021-09-03 20:31:57 +08:00
• 40a34adca4 机构管理--加筛选条件：姓名和邮箱 yanyizhou 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' 王夏晖 2021-09-03 08:13:41 +00:00
• 93a0ca58c1 海外标准法规必填项 wangxiahui@91isoft.com 2021-09-03 16:09:25 +08:00
• 493c3f5323 企标禁止选择数据来源 zhaokaiyao@91isoft.com 2021-09-03 15:48:46 +08:00
• d25118f6aa 禁止上传图片 zhaokaiyao@91isoft.com 2021-09-03 15:39:42 +08:00
• 8c08a9399f Merge remote-tracking branch 'origin/develop' into develop zhaokaiyao@91isoft.com 2021-09-03 13:53:36 +08:00
• 877bd29a99 企标编号可编辑 zhaokaiyao@91isoft.com 2021-09-03 13:53:30 +08:00
• 2ad071bf50 Merge branch 'develop' into 'test' 王夏晖 2021-09-03 03:33:16 +00:00
• dd9ceb0357 企业标准库列表样式 shenyanpei 2021-09-03 11:22:17 +08:00
• 658788b0cf 企标详情文本状态叹号 zhaokaiyao@91isoft.com 2021-09-03 11:08:29 +08:00
• 99ba4248b1 企标编号可标记 zhaokaiyao@91isoft.com 2021-09-03 11:06:05 +08:00
• c0946c8aa3 Merge branch 'develop' into 'test' 王夏晖 2021-09-03 02:42:14 +00:00
• c0cdb86200 改样式 wangxiahui@91isoft.com 2021-09-03 10:39:48 +08:00
• 61464742bd 标准预警bug修复~ Mr.Z 2021-09-03 10:33:45 +08:00
• 47da0d589e 修改字段 wangxiahui@91isoft.com 2021-09-03 10:12:50 +08:00
• 2800ace636 Merge branch 'develop' into 'test' 王夏晖 2021-09-03 01:11:52 +00:00
• 08237cbf1f 清单版本 shenyanpei 2021-09-02 18:02:48 +08:00
• cb9513fb45 commit zhaokaiyao@91isoft.com 2021-09-02 16:51:24 +08:00
• ef96c620dc 未符合项回退问题 shenyanpei 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
• b78175c8be feat: There is no way the super_liu 2021-09-02 15:25:13 +08:00
• 405faefc2f Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-09-02 15:20:43 +08:00
• f197165cbb feat: There is no way the Transfer and withdrawal super_liu 2021-09-02 15:20:34 +08:00
• cbf2ebab7f 流程中心 标准清单发布/更新流程 第一步 分页查询（+） yanyizhou 2021-09-02 15:09:28 +08:00
• 254cacd4fe Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-09-02 13:55:56 +08:00
• 46afe87fea 修复 标准合规评估结果 技术评估结果 查看 分页搜索功能bug yanyizhou 2021-09-02 13:55:50 +08:00
• 7ae9e262e8 项目清单确认流程第二步保存 宋伟佳 2021-09-02 10:17:37 +08:00
• c9334b231d Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-09-02 09:29:44 +08:00
• 8378ece942 Merge branch 'develop' into 'test' 王夏晖 2021-09-02 01:06:40 +00:00
• 1c15592d6c 项目清单确认流程修改bug 宋伟佳 2021-09-01 17:51:08 +08:00
• 4bce323022 Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-09-01 17:18:43 +08:00
• 378ca60789 commit zhutianqi 2021-09-01 17:18:36 +08:00
• 240679cd35 Merge remote-tracking branch 'origin/develop' into develop zhaokaiyao@91isoft.com 2021-09-01 17:08:15 +08:00
• 161ec20bc3 OCR zhaokaiyao@91isoft.com 2021-09-01 17:08:08 +08:00
• db34dcd791 更改多个项目或清单选择问题 修复ref相同导致的bug yanyizhou 2021-09-01 16:45:21 +08:00
• 5d9bb87aa7 更改多个项目或清单选择问题 yanyizhou 2021-09-01 16:25:15 +08:00
• 29335c3506 Merge branch 'develop' into 'test' 王夏晖 2021-09-01 08:23:43 +00:00
• 1df56128e8 Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-09-01 16:05:12 +08:00
• ab4bc4f3a5 项目清单确认流程 更改多个项目或清单选择问题 yanyizhou 2021-09-01 16:05:06 +08:00
• e28621a77d 标准预警 shenyanpei 2021-09-01 15:37:05 +08:00
• c0a0c591ae 未符合项流程修改 shenyanpei 2021-09-01 15:31:44 +08:00
• 0f4c0c3fab 未符合项整改 历史数据 查看的模态框的宽度变窄 yanyizhou 2021-09-01 14:23:43 +08:00
• 359a5762bd Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-09-01 10:31:35 +08:00
• 8fb8546e18 标准入库流程--选择国内或者海外的 第一步和第四步的手动查找的文本状态回显不对，且把标准状态改成文本状态 yanyizhou 2021-09-01 10:31:25 +08:00
• af5c40f250 项目清单确认流程--第二步，添加页面的标准的实施日期和文本状态没回显 yanyizhou 2021-09-01 10:30:55 +08:00
• 33fd2d7f32 Merge branch 'develop' into 'test' 王夏晖 2021-09-01 01:11:39 +00:00
• 52cfcdb6d4 标准预警初步修改~ Mr.Z 2021-08-31 16:42:52 +08:00
• 5bcb99828b Merge branch 'develop' into 'test' 王夏晖 2021-08-31 08:23:14 +00:00
• 510811ede8 项目清单确认流程修改（+） yanyizhou 2021-08-31 16:01:07 +08:00
• b6812e7843 Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-08-31 15:44:12 +08:00
• 81dd2bf5fc 国内外标准法规--编辑页面的手动查找查找的标准的文本状态显示不对，且把标准状态改成文本状态 yanyizhou 2021-08-31 15:43:54 +08:00
• d5cd0bec9e 项目清单确认流程开发完成 宋伟佳 2021-08-31 15:26:20 +08:00
• 7002d1cc5b 项目清单确认流程修改bug及修改 宋伟佳 2021-08-31 15:18:03 +08:00
• 99e83526af Merge branch 'develop' into 'test' 王夏晖 2021-08-31 01:06:25 +00:00
• b050ca4f4f Merge remote-tracking branch 'origin/develop' into develop 宋伟佳 2021-08-30 18:00:11 +08:00
• 7a34acb06c 项目清单确认流程 宋伟佳 2021-08-30 17:59:33 +08:00
• cf0d87cad8 Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-08-30 17:58:45 +08:00
• bde3d83e69 commit zhutianqi 2021-08-30 17:58:34 +08:00
• 2918c418a2 Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-08-30 17:57:13 +08:00
• 12371449b8 标准预警--加筛选条件 yanyizhou 2021-08-30 17:56:59 +08:00
• 997dde4de9 Merge branch 'develop' into 'test' 王夏晖 2021-08-30 09:44:44 +00:00
• 9e729793e3 菜单配置 shenyanpei 2021-08-30 16:48:21 +08:00
• a3bb271e87 Merge remote-tracking branch 'origin/develop' into develop zhaokaiyao@91isoft.com 2021-08-30 16:37:21 +08:00
• e5b432cdb7 国外法规普通查询清空按钮 zhaokaiyao@91isoft.com 2021-08-30 16:36:52 +08:00
• 55ccd5183c Merge branch 'develop' into 'test' 王夏晖 2021-08-30 07:45:37 +00:00
• ebe387e932 角色配置修改菜单，车库按钮注释 shenyanpei 2021-08-30 15:32:16 +08:00
• 59171f9543 Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-08-30 15:25:12 +08:00
• 3b36ebdc79 标准合规评估结果--技术评估结果 查看里面的查询条件更改为标准号/标准名称和具体章条 yanyizhou 2021-08-30 15:25:06 +08:00
• a708438b6f commit zhutianqi 2021-08-30 13:56:40 +08:00
• b6d2684516 Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-08-30 13:32:30 +08:00
• 5b179e16c4 commit zhutianqi 2021-08-30 13:32:17 +08:00
• 040df77e78 Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-08-30 12:12:27 +08:00
• 3a2291bf8f feat: There is no way the super_liu 2021-08-30 12:11:55 +08:00
• 594a3bcfa3 Merge remote-tracking branch 'origin/develop' into develop zhaokaiyao@91isoft.com 2021-08-30 10:52:04 +08:00
• e25fd03d19 Merge branch 'develop' into 'test' 王夏晖 2021-08-30 01:08:03 +00:00
• 820b215771 国内外标准详情 分解单日期格式和清空 zhaokaiyao@91isoft.com 2021-08-29 19:16:04 +08:00
• f19f93d521 标准征求意见流程历史数据页面展示 宋伟佳 2021-08-27 18:21:04 +08:00
• e654ae1b1e Merge branch 'develop' into 'test' 王夏晖 2021-08-27 08:34:55 +00:00
• a17c9dfc8d 国外标准-getAreaList-FOREIGN_STAND zhaokaiyao@91isoft.com 2021-08-27 16:16:51 +08:00
• d590867541 Merge branch 'develop' into 'test' 王夏晖 2021-08-27 08:07:02 +00:00
• 246b5ecdaf Merge remote-tracking branch 'origin/develop' into develop zhaokaiyao@91isoft.com 2021-08-27 16:06:06 +08:00
• d82917fb08 国内标准-getAreaList-INLAND_STAND zhaokaiyao@91isoft.com 2021-08-27 16:05:59 +08:00
• 84bb7c36ed 属性自定义 shenyanpei 2021-08-27 16:04:10 +08:00
• e7d2f7e1d2 Merge remote-tracking branch 'origin/develop' into develop zhaokaiyao@91isoft.com 2021-08-27 15:55:58 +08:00
• 83f0c0ec83 feat: There is no way the super_liu 2021-08-27 15:31:26 +08:00
• 9f325623fd Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-08-27 15:07:13 +08:00
• dac4796046 feat: There is no way the super_liu 2021-08-27 15:07:01 +08:00
• 9fe99b1e12 Merge branch 'develop' into 'test' 王夏晖 2021-08-27 06:57:26 +00:00
• 9ab2466e74 企业标准库文本状态颜色 zhaokaiyao@91isoft.com 2021-08-27 14:48:01 +08:00