Commit Graph
100 Commits
Author SHA1 Message Date
zhaokaiyao@91isoft.com 1d773d983b 预警发布日期查询与回显 2022-01-11 22:26:14 +08:00
zhaokaiyao@91isoft.com dae5bb6228 企标 :采用标准,引用标准手动查找 2022-01-05 11:52:40 +08:00
zhaokaiyao@91isoft.com 021af1806d Merge remote-tracking branch 'origin/develop' into develop 2021-12-30 17:46:29 +08:00
zhaokaiyao@91isoft.com 8849004b05 企标复选框权限 2021-12-30 17:46:23 +08:00
zhaokaiyao@91isoft.com 82675a1a21 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
2021-12-29 16:08:46 +08:00
zhaokaiyao@91isoft.com 757533548a 海外模块结构单元 2021-12-25 13:51:25 +08:00
zhaokaiyao@91isoft.com 4703d2d425 详情空白 2021-12-15 10:30:37 +08:00
zhaokaiyao@91isoft.com d10b591dde Merge remote-tracking branch 'origin/develop' into develop 2021-12-14 21:09:01 +08:00
zhaokaiyao@91isoft.com e4cad2948d 水印空隙 2021-12-14 18:05:00 +08:00
zhaokaiyao@91isoft.com 607489f99b Merge remote-tracking branch 'origin/develop' into develop 2021-12-06 18:04:25 +08:00
zhaokaiyao@91isoft.com 25ddff8630 commit 2021-12-06 17:04:17 +08:00
zhaokaiyao@91isoft.com 4cea49c4d6 Merge remote-tracking branch 'origin/develop' into develop 2021-12-06 16:51:06 +08:00
zhaokaiyao@91isoft.com 5bd211fc02 水印适配 pdf大小和分辨率大小 2021-12-06 16:50:53 +08:00
zhaokaiyao@91isoft.com 193a5dc341 Merge remote-tracking branch 'origin/develop' into develop 2021-12-05 18:15:34 +08:00
zhaokaiyao@91isoft.com 08b68a3887 水印适配 2021-12-05 18:15:28 +08:00
zhaokaiyao@91isoft.com ed271e9e1f Merge remote-tracking branch 'origin/develop' into develop 2021-12-03 16:18:01 +08:00
zhaokaiyao@91isoft.com bc4b4dca4c 流程第一步保存后文件不显示 2021-12-02 21:02:54 +08:00
zhaokaiyao@91isoft.com 9339df7bef Merge remote-tracking branch 'origin/develop' into develop 2021-12-02 20:45:14 +08:00
zhaokaiyao@91isoft.com 5f4d220976 Merge remote-tracking branch 'origin/develop' into develop 2021-12-02 18:23:20 +08:00
zhaokaiyao@91isoft.com d8c688bf5f 国内外企标 多选栏取消权限控制 2021-12-02 18:06:07 +08:00
zhaokaiyao@91isoft.com 80dccc7076 Merge remote-tracking branch 'origin/develop' into develop 2021-12-02 17:37:09 +08:00
zhaokaiyao@91isoft.com 92108b8b97 水印 2021-12-02 17:36:59 +08:00
zhaokaiyao@91isoft.com ade1cfd4f1 Merge remote-tracking branch 'origin/develop' into develop 2021-12-01 19:01:36 +08:00
zhaokaiyao@91isoft.com e3a5616fbd 模块结构单元死循环 2021-12-01 19:01:28 +08:00
zhaokaiyao@91isoft.com 6b5c134025 去掉详情标题 "标准详情"
去掉发布稿过长截取
2021-11-29 23:53:41 +08:00
zhaokaiyao@91isoft.com 75621949aa 国内收藏列宽50px 2021-11-29 23:23:57 +08:00
zhaokaiyao@91isoft.com e7f36da973 comment 2021-11-29 10:03:22 +08:00
zhaokaiyao@91isoft.com ce472690ba Merge remote-tracking branch 'origin/develop' into develop 2021-11-29 09:58:22 +08:00
zhaokaiyao@91isoft.com 368571c69d commit 2021-11-29 09:58:05 +08:00
zhaokaiyao@91isoft.com 3f6a7a5331 ssrq xcxssrq zccssrq 为空时报错 2021-11-28 18:55:46 +08:00
zhaokaiyao@91isoft.com 2bb2c98152 我司署名人 和 责任人选择污染
我司署名人 不可修改的节点显示问题
我司署名人带入下一流程消失问题
2021-11-28 18:28:37 +08:00
zhaokaiyao@91isoft.com 354ed85de4 去掉debugger 2021-11-28 17:09:46 +08:00
zhaokaiyao@91isoft.com 00a61eec5d 流程提交 2021-11-28 17:04:49 +08:00
zhaokaiyao@91isoft.com a5724fa8c2 Merge remote-tracking branch 'origin/develop' into develop 2021-11-28 17:03:50 +08:00
zhaokaiyao@91isoft.com 89d704b7ee 入库日期多选 2021-11-28 17:03:44 +08:00
zhaokaiyao@91isoft.com 753f1b5993 Merge remote-tracking branch 'origin/develop' into develop 2021-11-28 13:41:53 +08:00
zhaokaiyao@91isoft.com 14e5e0af80 流程模块结构单元 只能选址叶子节点 2021-11-28 13:41:47 +08:00
zhaokaiyao@91isoft.com 4b957dfe47 Merge remote-tracking branch 'origin/develop' into develop 2021-11-28 13:23:07 +08:00
zhaokaiyao@91isoft.com d4cb099d23 模块单元结构只能叶子节点多选, 关联模块vpps不用限制只能叶子节点,所以另起一个组件实现只能叶子节点多选功能 2021-11-28 13:22:56 +08:00
zhaokaiyao@91isoft.com d6222afeb9 Merge remote-tracking branch 'origin/develop' into develop 2021-11-28 10:57:32 +08:00
zhaokaiyao@91isoft.com 065aa38a18 批量删除 加载转圈 2021-11-28 10:57:23 +08:00
zhaokaiyao@91isoft.com 0a512fef2d Merge remote-tracking branch 'origin/develop' into develop 2021-11-27 23:39:34 +08:00
zhaokaiyao@91isoft.com 1b3bcf47b5 模块单元选择最后一个节点 2021-11-27 23:39:28 +08:00
zhaokaiyao@91isoft.com d0a90e642f Merge remote-tracking branch 'origin/develop' into develop 2021-11-26 20:11:18 +08:00
zhaokaiyao@91isoft.com da94221d15 模块单元结构 2021-11-26 20:10:56 +08:00
zhaokaiyao@91isoft.com 83685a3fd0 模块单元结构 2021-11-26 16:32:38 +08:00
zhaokaiyao@91isoft.com 2176ef673a Merge remote-tracking branch 'origin/develop' into develop 2021-11-26 14:53:46 +08:00
zhaokaiyao@91isoft.com 5463166666 流程vpps查找添加 :type="'truck'" 2021-11-26 14:53:39 +08:00
zhaokaiyao@91isoft.com b87502f4b6 Merge remote-tracking branch 'origin/develop' into develop 2021-11-25 18:05:57 +08:00
zhaokaiyao@91isoft.com 5c9154ee1c vpps查找select组件 2021-11-25 18:05:51 +08:00
zhaokaiyao@91isoft.com 2916c2abd3 Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 15:57:34 +08:00
zhaokaiyao@91isoft.com fc64506d52 代替标准手动查找 2021-11-22 15:57:27 +08:00
zhaokaiyao@91isoft.com 4c7f49876f 过程稿件 2021-11-22 15:56:46 +08:00
zhaokaiyao@91isoft.com e834074f26 Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 15:04:25 +08:00
zhaokaiyao@91isoft.com 244ca20a4f 查询,清空按钮 2021-11-22 15:04:17 +08:00
zhaokaiyao@91isoft.com f641592b2f Merge remote-tracking branch 'origin/develop' into develop 2021-11-21 16:03:45 +08:00
zhaokaiyao@91isoft.com 73acf4d792 详情关联条款,关联成功消息框 2021-11-21 16:03:26 +08:00
zhaokaiyao@91isoft.com 86cbdcc379 Merge remote-tracking branch 'origin/develop' into develop 2021-11-21 14:36:28 +08:00
zhaokaiyao@91isoft.com d72f7797cf 水印:字体偏大,分布不均,有时左边有,右边没有,有时左右很密,上下有,中间空;应适当缩小字帖,疏密有致,观感舒适。 2021-11-21 14:36:21 +08:00
zhaokaiyao@91isoft.com 1c0d4ff567 Merge remote-tracking branch 'origin/develop' into develop 2021-11-21 14:13:27 +08:00
zhaokaiyao@91isoft.com 204f507097 a. 标准入库--海外标准:英文名称输入左移第一列,与“中文名称在一列” 2021-11-21 14:13:21 +08:00
zhaokaiyao@91isoft.com fbcb858145 // 国内英文名称不必填 国外必填 2021-11-21 10:47:23 +08:00
zhaokaiyao@91isoft.com 7cc551e669 Merge remote-tracking branch 'origin/develop' into develop 2021-11-21 10:04:25 +08:00
zhaokaiyao@91isoft.com 4fc3e5ee4c 标准类别-标准号-标准年份顺序 2021-11-21 10:04:17 +08:00
zhaokaiyao@91isoft.com 69ae1edbeb Merge remote-tracking branch 'origin/develop' into develop 2021-11-19 17:53:00 +08:00
zhaokaiyao@91isoft.com 1f47637212 入库流程保存问题 2021-11-19 17:52:52 +08:00
zhaokaiyao@91isoft.com 2ea4885632 标准库和标准入库流程发布日期 改为不必填 2021-11-17 12:15:13 +08:00
zhaokaiyao@91isoft.com 6b115da603 国内标准,责任部门选择后没有进入选择框 2021-11-13 14:07:49 +08:00
zhaokaiyao@91isoft.com 3aa796d1eb 国内标准分页查询没有查询条件 2021-11-13 13:52:15 +08:00
zhaokaiyao@91isoft.com 8c0b09b4cc Merge remote-tracking branch 'origin/develop' into develop 2021-11-09 14:11:46 +08:00
zhaokaiyao@91isoft.com b02e87cbc0 "解读文件"改为"相关文件" 2021-11-09 14:11:41 +08:00
zhaokaiyao@91isoft.com c0e4bce100 Merge remote-tracking branch 'origin/develop' into develop 2021-11-09 10:58:55 +08:00
zhaokaiyao@91isoft.com 91c2ead95b 没有批量权限不显示勾选列 2021-11-09 10:58:31 +08:00
zhaokaiyao@91isoft.com 8194015a4d Merge remote-tracking branch 'origin/develop' into develop 2021-11-09 10:51:44 +08:00
zhaokaiyao@91isoft.com 4f8dc0069a 国内外,企业,政策表格权限操作,没有任意一个权限的不显示列,只有一个直接显示其按钮 2021-11-09 10:51:36 +08:00
zhaokaiyao@91isoft.com 74e05a2fe7 Merge remote-tracking branch 'origin/develop' into develop 2021-11-08 15:13:27 +08:00
zhaokaiyao@91isoft.com e6317f9a09 国内外权限按钮不存在则不显示对应组件 2021-11-08 15:13:20 +08:00
zhaokaiyao@91isoft.com b4c9475132 标准号,标准名称分开搜索 2021-11-07 14:52:34 +08:00
zhaokaiyao@91isoft.com d4f27605d5 Merge remote-tracking branch 'origin/develop' into develop 2021-11-07 14:20:26 +08:00
zhaokaiyao@91isoft.com e038d6ab48 申请人修改文件后 赋值到提交的表单变量 2021-11-07 14:14:23 +08:00
zhaokaiyao@91isoft.com f26ccc4e7f Merge remote-tracking branch 'origin/develop' into develop 2021-10-29 17:50:11 +08:00
zhaokaiyao@91isoft.com 5e2951a533 入库流程关联文件-多文件上传 2021-10-29 17:50:04 +08:00
zhaokaiyao@91isoft.com 2119620fd4 标准入库整个流程实现多个文件 2021-10-27 09:53:19 +08:00
zhaokaiyao@91isoft.com b5789a9b97 Merge remote-tracking branch 'origin/develop' into develop 2021-10-27 09:51:41 +08:00
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