Commit Graph
1553 Commits
Author SHA1 Message Date
zhaokaiyao@91isoft.com 4c65fb97d4 根据标准id查询存在分解单的文本类型 2021-12-28 19:41:37 +08:00
zhaokaiyao@91isoft.com cdffdad6ad 标准导出字典转换 2021-12-27 16:07:29 +08:00
zhaokaiyao@91isoft.com 057ce691d6 标准导出字典转换 2021-12-25 13:40:41 +08:00
zhaokaiyao@91isoft.com ea777f2c3e Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-24 15:23:04 +08:00
zhaokaiyao@91isoft.com d9996eeac2 预警性能 不使用转列改为使用正则 2021-12-24 15:22:37 +08:00
yuezhihang 1115c81244 未符合项查询 2021-12-24 11:12:04 +08:00
yuezhihang c29a0070df Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-24 09:50:03 +08:00
yuezhihang 93d6af7d66 会议信息修改bug修复 2021-12-24 09:49:52 +08:00
yuezhihang b33c643622 未符合项基础模块-->历史数据查询失效bug修复 2021-12-24 09:49:21 +08:00
super_liu 60c4957bcb Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!319
2021-12-23 22:03:17 +08:00
zhaokaiyao@91isoft.com 2bd9e7f323 查询总数 2021-12-23 16:11:36 +08:00
yuezhihang d1cf56c660 标准比对导出表格和标准比对导出图片 2021-12-23 15:05:32 +08:00
zhaokaiyao@91isoft.com 5c0756fcbf 注释 2021-12-23 14:23:38 +08:00
yuezhihang cb471942cb 标准比对导出bug修复 + 法规清单查询修复 2021-12-23 14:20:25 +08:00
zhaokaiyao@91isoft.com d412036280 资料中心添加字段 dataExplain 2021-12-23 14:02:53 +08:00
yuezhihang ce45170582 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-23 10:45:59 +08:00
yuezhihang dcd7ec0bd8 国家地区清单 才拿xccssrqgj 其他拿xccssrq 2021-12-23 10:45:51 +08:00
zhaokaiyao@91isoft.com c9e08a1fb5 国内外日期查询 总数错误 2021-12-22 20:34:40 +08:00
王夏晖 7d6a2be540 Merge branch 'develop_1' into 'develop_master'
Develop 1

See merge request LiuChao/foton-slrs-system-rest!314
2021-12-22 19:24:29 +08:00
王夏晖 d99b9cfc7c Merge branch 'develop_3' into 'develop_master'
国内外标准代替标准号查询

See merge request LiuChao/foton-slrs-system-rest!313
2021-12-22 19:23:48 +08:00
yanyizhou 59319f0a27 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-12-22 17:59:20 +08:00
yanyizhou dd8d2e2151 分解单编辑功能 2021-12-22 17:59:07 +08:00
zhaokaiyao@91isoft.com 6df2b5a7d3 国内外标准代替标准号查询 2021-12-22 17:50:23 +08:00
yuezhihang b0b6a6f391 会议信息修改bug修复 2021-12-22 16:24:10 +08:00
yanyizhou f8c9ab1d55 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-12-22 15:09:05 +08:00
yuezhihang 5f5051bd2f 未符合项bug修复 --->新增支持查询责任部门 2021-12-22 14:03:11 +08:00
yuezhihang 8c72debb05 责任部门导出和日历修改 bug修复 2021-12-22 11:09:20 +08:00
yuezhihang 5e1df05c6b Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-21 20:42:18 +08:00
yuezhihang 22cc39c0e2 标准化活动参会入会 2021-12-21 20:42:06 +08:00
super_liu 223008e42b Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!310
2021-12-21 17:21:08 +08:00
super_liu 8b225fbb14 feat: There is no way the, 2021-12-21 17:01:48 +08:00
super_liu 8ef5e27843 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!308
2021-12-21 14:41:06 +08:00
super_liu 382f42b8e5 feat: There is no way the, 2021-12-21 14:39:06 +08:00
yuezhihang 1d2fcd4a27 项目清单查询 2021-12-21 14:13:44 +08:00
yuezhihang 3880e0c68f 标准维度选数据出现全空数据的问题 2021-12-21 11:05:26 +08:00
yuezhihang caed5e20a3 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-21 10:13:01 +08:00
yuezhihang d05f5eb388 法规清单人名回显问题 2021-12-21 10:12:55 +08:00
王夏晖 999f277c13 Merge branch 'develop_3' into 'develop_master'
预警

See merge request LiuChao/foton-slrs-system-rest!304
2021-12-20 20:28:58 +08:00
zhaokaiyao@91isoft.com 1432bdb520 预警 2021-12-20 20:26:51 +08:00
yuezhihang e8b84b3088 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-20 18:04:02 +08:00
yuezhihang 9d365878a0 标准维度流程 2021-12-20 18:03:51 +08:00
王夏晖 28e5923544 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!299
2021-12-20 17:02:18 +08:00
zhaokaiyao@91isoft.com ab3e3374b8 企标评价空指针 2021-12-20 15:42:30 +08:00
yuezhihang 09e7e2ffee 标准查询没有total问题修复 2021-12-20 13:51:57 +08:00
super_liu 545e5bba72 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!298
2021-12-18 13:56:14 +08:00
super_liu 57b19f5c79 feat: There is no way the, iphone 2021-12-18 13:55:17 +08:00
super_liu e114b10ac5 feat: There is no way the, del only callback code 2021-12-17 16:46:07 +08:00
yuezhihang ce40aed7cb 企标制修订计划模块 2021-12-17 16:24:40 +08:00
zhaokaiyao@91isoft.com 20877855aa 国内外 发布日期查询 2021-12-17 16:11:37 +08:00
zhaokaiyao@91isoft.com e491589af9 为符合项导出的excel 忽略productId 2021-12-17 15:12:58 +08:00