Commit Graph
100 Commits
Author SHA1 Message Date
zhaokaiyao@91isoft.com a5ef6d3625 带入标准,勘误件无法显示.switch没写break(@_@;) 2021-10-26 17:21:36 +08:00
zhaokaiyao@91isoft.com 988da73120 Merge remote-tracking branch 'origin/develop' into develop 2021-10-19 16:05:51 +08:00
zhaokaiyao@91isoft.com 4d5c43d75b 海外标准详情预览权限 2021-10-19 16:05:44 +08:00
zhaokaiyao@91isoft.com 70dd56ec58 Merge remote-tracking branch 'origin/develop' into develop 2021-10-13 18:42:33 +08:00
zhaokaiyao@91isoft.com a686c7f0d6 入库流程/标准编辑 树形选择 关闭问题 2021-10-13 18:42:24 +08:00
zhaokaiyao@91isoft.com 1931714e05 Merge remote-tracking branch 'origin/develop' into develop 2021-10-13 11:20:55 +08:00
zhaokaiyao@91isoft.com df2d5ecc93 标准入库,文件第一次提交 2021-10-13 11:20:45 +08:00
zhaokaiyao@91isoft.com d2a2b6ad74 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-10-11 16:53:25 +08:00
zhaokaiyao@91isoft.com d4c312d982 标准入库流程1->添加文件名出现undefined 2021-10-11 16:53:15 +08:00
zhaokaiyao@91isoft.com a105a3e6fc 入库流程->标准体系弹出框->无法取消 同上一个提交 2021-10-11 11:10:44 +08:00
zhaokaiyao@91isoft.com 637b3e1bb4 标准详情->关联模块 弹出框无法取消问题 同上一个问题 2021-10-09 17:33:22 +08:00
zhaokaiyao@91isoft.com 353cbbcfd5 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-10-09 17:23:15 +08:00
zhaokaiyao@91isoft.com ebeed11b5a 入库流程->模块结构选择框问题 2021-10-09 17:23:02 +08:00
zhaokaiyao@91isoft.com 16d2a9ab9e Merge remote-tracking branch 'origin/develop' into develop 2021-09-29 17:19:48 +08:00
zhaokaiyao@91isoft.com d9ff2f9cca 关联条款,未选择条款时不执行提交 2021-09-29 17:19:38 +08:00
zhaokaiyao@91isoft.com 332ad90625 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-09-29 16:19:52 +08:00
zhaokaiyao@91isoft.com a1fff94099 机构管理数据为null 2021-09-29 16:19:39 +08:00
zhaokaiyao@91isoft.com 5dd1ab5b7a 搜索后点击属性菜单依然显示搜索条件的数据 2021-09-29 11:12:46 +08:00
zhaokaiyao@91isoft.com 02094accf3 Merge remote-tracking branch 'origin/develop' into develop 2021-09-28 17:19:48 +08:00
zhaokaiyao@91isoft.com c2a4bfe61d 标准拆分->编辑后 2021-09-28 17:18:48 +08:00
zhaokaiyao@91isoft.com 23f6532ff8 Merge remote-tracking branch 'origin/develop' into develop 2021-09-27 21:40:52 +08:00
zhaokaiyao@91isoft.com 6ef0954ab6 配置管理 表格宽度 2021-09-27 21:40:46 +08:00
zhaokaiyao@91isoft.com 76c459b896 Merge remote-tracking branch 'origin/develop' into develop 2021-09-27 11:51:26 +08:00
zhaokaiyao@91isoft.com f81ab35af5 详情 相关流程 2021-09-27 11:51:20 +08:00
zhaokaiyao@91isoft.com 3357d049c8 标准入库 2021-09-26 15:47:39 +08:00
zhaokaiyao@91isoft.com 18b21893c0 Merge remote-tracking branch 'origin/develop' into develop 2021-09-26 10:21:03 +08:00
zhaokaiyao@91isoft.com c6d4363b7a 国内标准 搜索后排序 2021-09-26 10:20:57 +08:00
zhaokaiyao@91isoft.com fbb7b08686 Merge remote-tracking branch 'origin/develop' into develop 2021-09-23 17:48:13 +08:00
zhaokaiyao@91isoft.com 817dfec330 标准入库 v-if 和 v-show 2021-09-23 17:48:08 +08:00
zhaokaiyao@91isoft.com 7e051c212d Merge remote-tracking branch 'origin/develop' into develop 2021-09-23 16:28:37 +08:00
zhaokaiyao@91isoft.com 51ec7dcede 切换清空表单 2021-09-23 16:28:31 +08:00
zhaokaiyao@91isoft.com f25aaca1c4 Merge remote-tracking branch 'origin/develop' into develop 2021-09-23 15:49:15 +08:00
zhaokaiyao@91isoft.com cf6ca0d3e9 国内外标准详情 border 2021-09-23 15:49:10 +08:00
zhaokaiyao@91isoft.com 90ead01086 标准详情 收藏 2021-09-23 15:37:59 +08:00
zhaokaiyao@91isoft.com 8aa051fd16 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/details/otherStandardDetails/index.vue
2021-09-23 15:35:01 +08:00
zhaokaiyao@91isoft.com 28649dcade 标准详情 收藏 过长省略 2021-09-23 15:28:20 +08:00
zhaokaiyao@91isoft.com bc59cfef7d 标准详情收藏 2021-09-23 13:50:17 +08:00
zhaokaiyao@91isoft.com 2423bef139 Merge remote-tracking branch 'origin/develop' into develop 2021-09-23 11:20:20 +08:00
zhaokaiyao@91isoft.com d942bcf29e 搜索中心 国外标准跳转 2021-09-23 11:20:15 +08:00
zhaokaiyao@91isoft.com f391df84ae Merge remote-tracking branch 'origin/develop' into develop 2021-09-23 10:46:31 +08:00
zhaokaiyao@91isoft.com a07d22f12e 解决入库流程 提交单验证失败后不能选择国家/地区 2021-09-23 10:46:24 +08:00
zhaokaiyao@91isoft.com 43368e9617 Merge remote-tracking branch 'origin/develop' into develop 2021-09-23 09:49:52 +08:00
zhaokaiyao@91isoft.com 16c470132a 标准详情 中英文名称 企标详情border 2021-09-23 09:49:34 +08:00
zhaokaiyao@91isoft.com 1e8df2a950 关联条款->查询 2021-09-23 08:39:00 +08:00
zhaokaiyao@91isoft.com 9bc5acba9c Merge remote-tracking branch 'origin/develop' into develop 2021-09-22 17:18:18 +08:00
zhaokaiyao@91isoft.com 7326ea519a 关联条款按钮 2021-09-22 17:18:09 +08:00
zhaokaiyao@91isoft.com 00a9fc5666 标准入库,经理人审批通过 2021-09-22 10:01:09 +08:00
zhaokaiyao@91isoft.com be9b84abe2 Merge remote-tracking branch 'origin/develop' into develop 2021-09-17 17:05:00 +08:00
zhaokaiyao@91isoft.com 7b1c80d46e 标准表格宽度 2021-09-17 17:04:53 +08:00
zhaokaiyao@91isoft.com 18d0c7d822 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/home1/components/release/index.vue
2021-09-17 16:33:04 +08:00
zhaokaiyao@91isoft.com 77f068cbd5 首页标准发布 2021-09-16 19:26:13 +08:00
zhaokaiyao@91isoft.com 50d7bc4a61 Merge remote-tracking branch 'origin/develop' into develop 2021-09-15 17:59:34 +08:00
zhaokaiyao@91isoft.com 20e25c7e05 标准详情,已被分解的的文本才有分解单按钮 2021-09-15 17:59:28 +08:00
zhaokaiyao@91isoft.com b44f476c39 Merge remote-tracking branch 'origin/develop' into develop 2021-09-15 10:10:46 +08:00
zhaokaiyao@91isoft.com 349c637e3a 国内外详情->标准分解单->符合性状态->状态为是否 2021-09-15 10:10:33 +08:00
zhaokaiyao@91isoft.com 790e767d4f Merge remote-tracking branch 'origin/develop' into develop 2021-09-15 09:45:03 +08:00
zhaokaiyao@91isoft.com 23b26a5b23 国内外标准库->表格->列宽 2021-09-15 09:44:56 +08:00
zhaokaiyao@91isoft.com a9b18b12f9 commit 2021-09-13 15:40:26 +08:00
zhaokaiyao@91isoft.com 7a95bc164f Merge remote-tracking branch 'origin/develop' into develop 2021-09-13 15:19:35 +08:00
zhaokaiyao@91isoft.com 802da164f3 企标英文名称查询 2021-09-13 15:19:28 +08:00
zhaokaiyao@91isoft.com cca3f4bebe Merge remote-tracking branch 'origin/develop' into develop 2021-09-09 19:32:07 +08:00
zhaokaiyao@91isoft.com a8d22ab480 海外标准,新增体系,编辑体系 2021-09-09 19:31:57 +08:00
zhaokaiyao@91isoft.com 66a941bd0d Merge remote-tracking branch 'origin/develop' into develop 2021-09-08 20:05:24 +08:00
zhaokaiyao@91isoft.com 7b048117f3 海外标准号+类别 暂时使用 2021-09-08 20:05:17 +08:00
zhaokaiyao@91isoft.com 7f76a8314a Merge remote-tracking branch 'origin/develop' into develop 2021-09-08 17:27:54 +08:00
zhaokaiyao@91isoft.com 987f442c64 国内外详情->文本状态->叹号 2021-09-08 17:27:47 +08:00
zhaokaiyao@91isoft.com b13961e1d8 Merge remote-tracking branch 'origin/develop' into develop 2021-09-07 14:29:30 +08:00
zhaokaiyao@91isoft.com 303836eac5 企标编号字体颜色 2021-09-07 14:27:42 +08:00
zhaokaiyao@91isoft.com 168d5da192 复审日期转换为字符串的格式 2021-09-04 16:39:21 +08:00
zhaokaiyao@91isoft.com ce88c8cf9e 文本状态一直提示不能为空 2021-09-04 15:26:37 +08:00
zhaokaiyao@91isoft.com 19215f3897 企标实施日期 2021-09-04 14:35:22 +08:00
zhaokaiyao@91isoft.com 6e28b2f3c5 Merge remote-tracking branch 'origin/develop' into develop 2021-09-04 14:33:48 +08:00
zhaokaiyao@91isoft.com 6d3c0449dc 海外标准->编辑页->文本状态可编辑 2021-09-04 14:33:44 +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
zhaokaiyao@91isoft.com 658788b0cf 企标详情文本状态叹号 2021-09-03 11:08:29 +08:00
zhaokaiyao@91isoft.com 99ba4248b1 企标编号可标记 2021-09-03 11:06:05 +08:00
zhaokaiyao@91isoft.com cb9513fb45 commit 2021-09-02 16:51:24 +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
zhaokaiyao@91isoft.com a3bb271e87 Merge remote-tracking branch 'origin/develop' into develop 2021-08-30 16:37:21 +08:00
zhaokaiyao@91isoft.com e5b432cdb7 国外法规普通查询清空按钮 2021-08-30 16:36:52 +08:00
zhaokaiyao@91isoft.com 594a3bcfa3 Merge remote-tracking branch 'origin/develop' into develop 2021-08-30 10:52:04 +08:00
zhaokaiyao@91isoft.com 820b215771 国内外标准详情 分解单日期格式和清空 2021-08-29 19:16:04 +08:00
zhaokaiyao@91isoft.com a17c9dfc8d 国外标准-getAreaList-FOREIGN_STAND 2021-08-27 16:16:51 +08:00
zhaokaiyao@91isoft.com 246b5ecdaf Merge remote-tracking branch 'origin/develop' into develop 2021-08-27 16:06:06 +08:00
zhaokaiyao@91isoft.com d82917fb08 国内标准-getAreaList-INLAND_STAND 2021-08-27 16:05:59 +08:00
zhaokaiyao@91isoft.com e7d2f7e1d2 Merge remote-tracking branch 'origin/develop' into develop 2021-08-27 15:55:58 +08:00
zhaokaiyao@91isoft.com 9ab2466e74 企业标准库文本状态颜色 2021-08-27 14:48:01 +08:00
zhaokaiyao@91isoft.com 671b562bb3 Merge remote-tracking branch 'origin/develop' into develop 2021-08-25 14:30:32 +08:00
zhaokaiyao@91isoft.com ba948f297a 入库流程-标准发布日期改为必填 2021-08-25 14:30:23 +08:00
zhaokaiyao@91isoft.com 672374e17d Merge remote-tracking branch 'origin/develop' into develop 2021-08-23 15:40:15 +08:00
zhaokaiyao@91isoft.com 93f9c65625 标准详情,添加ocr按钮 2021-08-23 15:40:06 +08:00
zhaokaiyao@91isoft.com 99c3f9752d Merge remote-tracking branch 'origin/develop' into develop 2021-08-21 23:32:21 +08:00
zhaokaiyao@91isoft.com 91c23c9c6d 国外标准更新时,同时更新了标准清单 2021-08-21 23:32:14 +08:00
zhaokaiyao@91isoft.com 0220cf0147 Merge remote-tracking branch 'origin/develop' into develop 2021-08-18 13:14:34 +08:00
zhaokaiyao@91isoft.com 366dfbb509 入库流程 国家/地区多选 2021-08-18 13:13:59 +08:00
zhaokaiyao@91isoft.com 3a303eaa45 Merge remote-tracking branch 'origin/develop' into develop 2021-08-17 16:16:16 +08:00