Commit Graph
100 Commits
Author SHA1 Message Date
super_liu 7ac4976e53 Merge branch 'develop' into FOTON 2022-03-07 19:58:27 +08:00
super_liu 35b7e06c7b Merge remote-tracking branch 'origin/develop' into develop 2022-03-07 14:51:13 +08:00
super_liu f5b48aa1ac feat: There is no way the, 暂时注释掉催办 2022-03-07 14:50:58 +08:00
super_liu 7899f2c91e Merge remote-tracking branch 'origin/develop' into develop 2022-03-07 11:25:46 +08:00
super_liu 9d306b013e feat: There is no way the, 起草人选择状态,只可以现行有效和废止 2022-03-07 11:25:27 +08:00
super_liu da85c742d1 Merge remote-tracking branch 'origin/develop' into develop 2022-03-07 10:47:54 +08:00
super_liu e70e6cedec feat: There is no way the, 废止 节点更新 2022-03-07 10:47:38 +08:00
super_liu 6754eb1192 Merge branch 'develop' into FOTON 2022-03-06 17:09:56 +08:00
super_liu de9136e899 Merge remote-tracking branch 'origin/develop' into develop 2022-03-04 17:15:06 +08:00
super_liu a0761b85cf feat: There is no way the, 技术 产品 优化 2022-03-04 17:14:55 +08:00
super_liu 1eb700cba9 feat: There is no way the, 当年制定、当年修定才加X (代替企标编号 必填) 2022-03-04 10:54:42 +08:00
super_liu e81322ddcc feat: There is no way the, 高级经理节点 其他问题驳回 修改俩个节点评分回显接口参数 2022-03-04 09:37:06 +08:00
super_liu dc925ae245 feat: There is no way the, 2022-03-04 09:26:59 +08:00
super_liu d8ff28d31a Merge remote-tracking branch 'origin/develop' into develop 2022-03-04 09:00:34 +08:00
super_liu 7104baa445 feat: There is no way the, 2022-03-04 08:59:30 +08:00
super_liu dcb537992b Merge branch 'develop' into FOTON 2022-03-03 16:51:13 +08:00
super_liu 2216a7155d feat: There is no way the, 2022-03-03 16:47:06 +08:00
super_liu 5bfe05beb7 Merge branch 'develop' into FOTON 2022-03-03 15:45:54 +08:00
super_liu 23bda279d7 Merge remote-tracking branch 'origin/develop' into develop 2022-03-03 15:43:47 +08:00
super_liu 503eb6e52b feat: There is no way the, 修改 2022-03-03 15:43:38 +08:00
super_liu 1ff81f14c1 feat: There is no way the, 评分公式其中一部分改成 (法规工程师➕法规主管)➗2✖️0.3 2022-03-03 14:33:11 +08:00
super_liu 2f589a82c8 Merge remote-tracking branch 'origin/develop' into develop 2022-03-03 09:56:28 +08:00
super_liu 23d2f21f48 feat: There is no way the, 国内外标准详情 被代替标准号 加 跳转 2022-03-03 09:56:09 +08:00
super_liu 88bff9ed10 Merge branch 'develop' into FOTON 2022-03-02 19:48:10 +08:00
super_liu 8c2f7a9a35 feat: There is no way the, 2022-03-02 17:16:36 +08:00
super_liu 999cd3d990 Merge remote-tracking branch 'origin/develop' into develop 2022-03-02 17:04:12 +08:00
super_liu 4b81c0a3be feat: There is no way the, 技术 产品 待办跳转 2022-03-02 17:03:57 +08:00
super_liu 8638559c80 Merge remote-tracking branch 'origin/develop' into develop 2022-03-02 16:46:01 +08:00
super_liu dfe3b3b314 feat: There is no way the, 企标 新复审 、技术、产品标准 节点名称修改 2022-03-02 16:45:39 +08:00
super_liu f20087bd41 feat: There is no way the, 2022-03-02 14:37:48 +08:00
super_liu bd97e67178 Merge remote-tracking branch 'origin/develop' into develop 2022-03-02 14:36:59 +08:00
super_liu 4ec5907eda feat: There is no way the, 海外结构树 菜单查询 2022-03-02 14:36:44 +08:00
super_liu f250b019e5 feat: There is no way the, 流程页面修改节点名称和 节点角色名称提示 2022-03-02 14:02:45 +08:00
super_liu f2fd143dea feat: There is no way the, 流程页面修改节点名称和 节点角色名称提示 2022-03-02 13:51:36 +08:00
super_liu df847ea765 Merge remote-tracking branch 'origin/develop' into develop 2022-03-02 10:46:40 +08:00
super_liu 271133c105 feat: There is no way the, 添加计划库带入字段 体系结构 2022-03-02 10:46:21 +08:00
super_liu f66ed6a146 feat: There is no way the, 企标计划及立项 体系结构 添加逻辑 只可选择二级及以下 2022-03-02 10:04:08 +08:00
super_liu 8742bcb4c8 Merge remote-tracking branch 'origin/develop' into develop 2022-03-01 14:59:26 +08:00
super_liu de4406a4c2 feat: There is no way the, 产品标准 - 标准状态 改名称 制修订类型 2022-03-01 14:59:06 +08:00
super_liu 4c4c7932ca feat: There is no way the, 企标高级检索 备案日期 多条件查询 2022-03-01 14:08:00 +08:00
super_liu cc92aa180c Merge remote-tracking branch 'origin/develop' into develop 2022-03-01 13:29:35 +08:00
super_liu e6878e9117 feat: There is no way the, 水印深0.1 2022-03-01 13:29:18 +08:00
super_liu a3b4d8ee7d feat: There is no way the, 删除123 企标详情 加逻辑 企标 关联属性数据不存在 报错问题 2022-03-01 10:41:28 +08:00
super_liu 5ad5d8f4d6 feat: There is no way the, 草稿ID 判断参数是否存在 2022-03-01 09:53:09 +08:00
super_liu 7c905c9da3 Merge branch 'develop' into FOTON 2022-02-24 17:13:29 +08:00
super_liu 79f74c0316 Merge branch 'develop' into FOTON
# Conflicts:
#	src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
2022-02-24 15:32:57 +08:00
super_liu 5f47bbca6f Merge remote-tracking branch 'origin/develop' into develop 2022-02-24 15:21:24 +08:00
super_liu 5ab370d1c1 feat: There is no way the, 2022-02-24 15:16:07 +08:00
super_liu 0201099004 feat: There is no way the, 企标产品标准 - 会签征求意见 创建条款 一半 预览 一半 表单属性填写 2022-02-24 10:41:30 +08:00
super_liu 735695b24c Merge remote-tracking branch 'origin/develop' into develop 2022-02-24 10:20:21 +08:00
super_liu 85e3ae1244 feat: There is no way the, 企标技术标准 会签意见 创建条款 加载文档添加loading 2022-02-24 10:19:59 +08:00
super_liu c2ecc5e4f9 feat: There is no way the, 2022-02-23 18:00:42 +08:00
super_liu c0cfb2b501 Merge remote-tracking branch 'origin/develop' into develop 2022-02-23 17:52:06 +08:00
super_liu 37551bd6a6 feat: There is no way the, 会签征求意见 创建条款方式 改成 右侧滑出 一半文档预览 一半表单属性填写 2022-02-23 17:51:56 +08:00
super_liu 64691793f6 Merge branch 'develop' into FOTON 2022-02-22 19:24:29 +08:00
super_liu dca2128501 feat: There is no way the, 企标复审选复审计划 可再次选择 2022-02-22 17:39:17 +08:00
super_liu bcae46a62e feat: There is no way the, 企标复审计划数据 标题 添加数据描述 2022-02-22 17:27:26 +08:00
super_liu 1b223f1291 Merge remote-tracking branch 'origin/develop' into develop 2022-02-22 17:17:55 +08:00
super_liu f34a05564b feat: There is no way the, 2022-02-22 17:17:47 +08:00
super_liu 427384ad77 feat: There is no way the, 企标库 权限树结构 相关模块修改 2022-02-22 17:17:13 +08:00
super_liu 32768ff683 Merge remote-tracking branch 'origin/develop' into develop 2022-02-21 17:45:40 +08:00
super_liu 51d2c8c0e0 feat: There is no way the, buss tree auth 2022-02-21 17:45:33 +08:00
super_liu 1c63566ad0 Merge remote-tracking branch 'origin/develop' into develop 2022-02-21 12:34:49 +08:00
super_liu 202d2264ed feat: There is no way the, 注掉 技术系列 国内逻辑 2022-02-21 12:34:33 +08:00
super_liu 25bb05b4b5 Merge remote-tracking branch 'origin/develop' into develop 2022-02-18 17:49:49 +08:00
super_liu ad738073a5 feat: There is no way the, 角色标准数据权限体系优化 国内标准左侧树 加入技术体系 待完成 2022-02-18 17:48:47 +08:00
super_liu 6db9e1c2f9 Merge branch 'develop' into FOTON 2022-02-18 13:19:53 +08:00
super_liu 640538afdc feat: There is no way the, 2022-02-18 13:16:51 +08:00
super_liu cd7bf72b46 Merge branch 'develop' into FOTON 2022-02-18 13:14:15 +08:00
super_liu 404ed23040 feat: There is no way the, 2022-02-18 13:13:32 +08:00
super_liu e66a5b0e37 Merge branch 'develop' into FOTON 2022-02-18 12:58:49 +08:00
super_liu 2c70e570d0 feat: There is no way the, 2022-02-18 12:57:37 +08:00
super_liu e3f7d9d2ec Merge branch 'develop' into FOTON 2022-02-18 12:39:56 +08:00
super_liu bb39766947 feat: There is no way the, 2022-02-18 12:39:01 +08:00
super_liu 21ebf68bcc Merge remote-tracking branch 'origin/develop' into develop 2022-02-18 12:24:18 +08:00
super_liu 4132c7b845 feat: There is no way the, 2022-02-18 12:23:23 +08:00
super_liu bc5a1f37d9 Merge branch 'develop' into FOTON 2022-02-18 10:23:19 +08:00
super_liu 03a26c05cd Merge remote-tracking branch 'origin/develop' into develop 2022-02-18 10:00:54 +08:00
super_liu 053c9d0064 feat: There is no way the, 修改通用流程名称逻辑 独立判断 添加新复审流程名称+节点信息 2022-02-18 10:00:27 +08:00
super_liu 093a5c37ba feat:new 2022-02-18 02:26:41 +08:00
super_liu 8a2a6cfc8d Merge branch 'develop' into FOTON
# Conflicts:
#	src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
#	src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
2022-02-17 20:39:23 +08:00
super_liu 51abb761f5 Merge remote-tracking branch 'origin/develop' into develop 2022-02-17 17:24:40 +08:00
super_liu 9cac2db68f feat: There is no way the, 2022-02-17 17:24:13 +08:00
super_liu 5d3771daf4 feat: There is no way the, 2022-02-17 16:53:08 +08:00
super_liu 7682a19ecc Merge remote-tracking branch 'origin/develop' into develop 2022-02-17 16:39:18 +08:00
super_liu 0536d94fa8 feat: There is no way the, 产品标准流程 添加截止日期 2022-02-17 16:38:58 +08:00
super_liu cad426b0b8 Merge remote-tracking branch 'origin/develop' into develop 2022-02-17 16:24:06 +08:00
super_liu 61328f48b8 feat: There is no way the, 新复审 2022-02-17 16:23:34 +08:00
super_liu b8f5de3721 Merge remote-tracking branch 'origin/develop' into develop 2022-02-16 18:01:50 +08:00
super_liu 954e7748ef feat: There is no way the, 复审2 2022-02-16 18:00:35 +08:00
super_liu 01c5f13d37 feat: There is no way the, 复审新 2022-02-15 15:55:21 +08:00
super_liu a2e50a629d feat: There is no way the, 2022-02-15 14:43:19 +08:00
super_liu bd376981e3 Merge remote-tracking branch 'origin/develop' into develop 2022-02-15 11:29:22 +08:00
super_liu 324ae1bdd5 feat: There is no way the, 修改立项单在线编辑 接口 传参 2022-02-15 11:29:15 +08:00
super_liu 9c4cff5fc7 Merge remote-tracking branch 'origin/develop' into develop 2022-02-15 10:19:42 +08:00
super_liu 8139087fde feat: There is no way the, 发起 对接人 多人 2022-02-15 10:19:34 +08:00
super_liu 5d073b024f feat: There is no way the, 2022-02-14 08:31:26 +08:00
super_liu d14c4efede Merge remote-tracking branch 'origin/develop' into develop 2022-02-11 17:15:10 +08:00
super_liu 5845addb96 feat: There is no way the, 2022-02-11 17:14:27 +08:00
super_liu 296c62f5a9 Merge remote-tracking branch 'origin/develop' into develop 2022-02-10 20:41:41 +08:00