Commit Graph

Select branches

Hide Pull Requests

dev_20230829_change

dev_20231201_feizhi

master

Mono Color

• 263484545b Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-30 13:28:20 +08:00
• bb0069f373 Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-07-30 11:30:21 +08:00
• 21e4742aa7 commit zhutianqi 2021-07-30 11:30:07 +08:00
• c4b41fe1f0 bug fanlin 2021-07-30 10:42:55 +08:00
• 41eac6574e Merge remote-tracking branch 'origin/develop' into develop liuhuaizhi 2021-07-30 09:53:00 +08:00
• d49bfb8732 回显问题修改 liuhuaizhi 2021-07-30 09:52:50 +08:00
• 8ef38aac28 bug: 文件上传回显问题 fanlin 2021-07-30 09:42:48 +08:00
• 9452b224e7 Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-07-30 00:48:09 +08:00
• 7d00bbfa51 feat: 国内外标准 反向标准显示逻辑 super_liu 2021-07-30 00:47:40 +08:00
• e7e80b9a06 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 宋伟佳 2021-07-29 17:01:29 +08:00
• 2bbf4875ff 修复bug 宋伟佳 2021-07-29 17:01:25 +08:00
• 9cff5a5070 标准清单数据列表清空按钮，新增、编辑页的删除 shen_yan_pu 2021-07-29 16:59:48 +08:00
• 94954879fc Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-29 15:35:33 +08:00
• 760f7bbfbc bug：标准入库流程--我司署名人与配置管理配置的不一致 fanlin 2021-07-29 15:35:12 +08:00
• 5a918970fa commit zhutianqi 2021-07-29 15:32:37 +08:00
• 77825748b4 bug： 标准入库流程--申请人修订页面去掉圈住的字段，发起页面和修订页面缺少部分代替标准号字段 fanlin 2021-07-29 15:29:59 +08:00
• f92621427a Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-07-29 15:22:42 +08:00
• d62f69ed7e commit zhutianqi 2021-07-29 15:22:24 +08:00
• abe054b2c0 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 宋伟佳 2021-07-29 15:03:36 +08:00
• 6e334ed07d 标准法规清单bug 宋伟佳 2021-07-29 15:03:30 +08:00
• 846df5c761 Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-29 14:16:56 +08:00
• 7697871cf9 bug： 46129 国内外标准库，左侧树状图查询占位提示应改为：输入树状图体系 fanlin 2021-07-29 14:16:48 +08:00
• b8444b728d 标准清单数据新增、编辑页的删除 shen_yan_pu 2021-07-29 10:50:01 +08:00
• 4b42e510db Merge remote-tracking branch 'origin/develop' into develop yuezhihang 2021-07-29 10:15:59 +08:00
• 75594d8959 项目维度流程 yuezhihang 2021-07-29 10:15:53 +08:00
• 05772f64dd Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-29 10:00:19 +08:00
• c872b0edb1 bug: 上传上去文件以后清空以便于下次重新上传 fanlin 2021-07-29 09:44:27 +08:00
• 7262a6d204 标准清单数据列表清空按钮，新增、编辑页的删除 shen_yan_pu 2021-07-29 09:21:36 +08:00
• 5123e51408 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 宋伟佳 2021-07-28 18:18:56 +08:00
• e960aa5cdf 修复bug 宋伟佳 2021-07-28 18:18:51 +08:00
• 021f77f0ed Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-28 17:44:43 +08:00
• 209e772c09 bug入库新增上传了附件，在编辑时，再次上传了一个附件，提交后，查看详情页面，附件为空 fanlin 2021-07-28 17:44:35 +08:00
• b0b3d81dd6 Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-07-28 17:33:22 +08:00
• 08a34ef8ae feat: 国内外标准库 懒加载组件 解决冲突样式 super_liu 2021-07-28 17:33:06 +08:00
• 4a9814337b Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-07-28 17:25:46 +08:00
• 9e20156e5b commit zhutianqi 2021-07-28 17:25:36 +08:00
• c532794d64 Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-28 16:12:23 +08:00
• 4b80c2768b bug：圈住的地方缺少一个上传附件进度条 fanlin 2021-07-28 16:12:17 +08:00
• c73fdaaef7 Merge remote-tracking branch 'origin/develop' into develop liuhuaizhi 2021-07-28 16:00:06 +08:00
• 8a2e6ced5d 车型项目库 项目编号修改完毕 liuhuaizhi 2021-07-28 15:59:48 +08:00
• 7dd33233d2 bug: 标准入库流程--圈住的字段应该是支持多选的且父子之间不联动 fanlin 2021-07-28 15:22:14 +08:00
• 8e6b027c10 bug： 标准入库流程--带入一条标准，采标程度、采标编号没回显 fanlin 2021-07-28 14:58:51 +08:00
• 92f11f7f23 bug： 国内标准法规--查看页面 把日期的悬浮窗提示取消吧 fanlin 2021-07-28 14:46:57 +08:00
• 60d777bc4b Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-28 14:19:07 +08:00
• 2c5a02d214 bug: 国内国外指定字段改成多选 fanlin 2021-07-28 14:19:01 +08:00
• 1419e7fc11 Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-07-28 11:40:15 +08:00
• 25288f61a8 feat: 国内外标准库详情 super_liu 2021-07-28 11:39:59 +08:00
• a86bd1f948 Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-28 11:30:33 +08:00
• 305b6da760 bug: 我的收藏 取消收藏 fanlin 2021-07-28 11:30:23 +08:00
• e01a9a0ee5 Merge remote-tracking branch 'origin/develop' into develop liuhuaizhi 2021-07-28 11:26:48 +08:00
• 27ee237039 标准号展示 liuhuaizhi 2021-07-28 11:26:36 +08:00
• 68f79d8883 标准清单数据列表,未符合项接口调用顺序 shen_yan_pu 2021-07-28 10:54:07 +08:00
• 34c23d0337 Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-07-28 10:28:54 +08:00
• 567cb4905e feat: 国外标准库 详情 super_liu 2021-07-28 10:28:36 +08:00
• 61f227c037 Merge remote-tracking branch 'origin/develop' into develop yuezhihang 2021-07-27 21:16:15 +08:00
• d1b37660ff 合规评估流程-项目维度 yuezhihang 2021-07-27 21:16:09 +08:00
• 7d0d552b5d Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 宋伟佳 2021-07-27 21:14:37 +08:00
• 50ee88f7c2 修复bug 宋伟佳 2021-07-27 21:14:32 +08:00
• 6e707c4660 未符合项流程 shen_yan_pu 2021-07-27 19:51:15 +08:00
• 9534774e19 未符合项流程节点 shen_yan_pu 2021-07-27 19:38:03 +08:00
• 51e37b012a Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 宋伟佳 2021-07-27 19:35:00 +08:00
• 156a0e5899 未符合项整改bug 宋伟佳 2021-07-27 19:34:55 +08:00
• e07a6a1dd6 feat: 标准库 ORB super_liu 2021-07-27 19:28:04 +08:00
• 5f22311768 feat: hhh super_liu 2021-07-27 19:02:45 +08:00
• 9d9219bd62 Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-07-27 18:27:12 +08:00
• 6b03c59949 feat: 国内外标准库 super_liu 2021-07-27 18:27:04 +08:00
• 6383fb7f70 标准清单数据列表查询 shen_yan_pu 2021-07-27 18:13:41 +08:00
• 44ee835b19 Merge remote-tracking branch 'origin/develop' into develop yangzijiao 2021-07-27 18:02:08 +08:00
• c104bd7be3 编辑列表跳转详情页 yangzijiao 2021-07-27 18:02:00 +08:00
• 4659b4779a Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-27 17:53:03 +08:00
• 4a1fa5d0ff bug fanlin 2021-07-27 17:52:57 +08:00
• a54fdcc61a 标准清单数据新增、编辑页的编辑 shen_yan_pu 2021-07-27 17:49:33 +08:00
• 8a9ae8627e Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-07-27 17:37:29 +08:00
• 922cca3676 commit zhutianqi 2021-07-27 17:37:13 +08:00
• 9e49e612d9 bug: 国内标准编辑接口下的收藏接口传参修改 fanlin 2021-07-27 17:32:23 +08:00
• b669b0dc71 bug 海外标准法规搜索条件 fanlin 2021-07-27 17:20:20 +08:00
• 420bdc1938 Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-27 17:06:10 +08:00
• f305f29261 bug fanlin 2021-07-27 17:06:01 +08:00
• 22825dacec Merge remote-tracking branch 'origin/develop' into develop zqx0221 2021-07-27 17:04:40 +08:00
• 734d45821c fix: 标准合规评估结果--项目评估结果-查询问题 zqx0221 2021-07-27 17:04:22 +08:00
• eb907967f0 Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-27 16:56:30 +08:00
• 9a67cf3613 bug： 标准入库流程--选择人员的组织架构，需加检索，参考期望 fanlin 2021-07-27 16:56:22 +08:00
• 8ff5f85189 Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-07-27 16:16:03 +08:00
• f3f4620cfd commit zhutianqi 2021-07-27 16:15:58 +08:00
• 48228efda9 Merge remote-tracking branch 'origin/develop' into develop zqx0221 2021-07-27 16:07:36 +08:00
• 43913fc598 fix: 标准合规评估结果--项目评估结果-数据回显+滚动条 zqx0221 2021-07-27 16:07:23 +08:00
• 8b960b384e Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-07-27 15:49:51 +08:00
• 2eca268fd0 commit zhutianqi 2021-07-27 15:49:45 +08:00
• 23c6e90950 Merge remote-tracking branch 'origin/develop' into develop zqx0221 2021-07-27 15:39:18 +08:00
• a8bb78c23a Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-27 15:38:42 +08:00
• 9baf7dc117 bug：标准入库流程--流程中心---已发流程查看入库流程的流程数据，文件显示乱码，去掉相关流程、被引用标准、参会记录字段，圈住的字段没回显 fanlin 2021-07-27 15:38:37 +08:00
• 9c27738b08 fix:链接管理 删除链接二次弹框 zqx0221 2021-07-27 15:37:40 +08:00
• 8bf58763b9 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 宋伟佳 2021-07-27 14:53:09 +08:00
• 7657b7ed6a 修复bug 宋伟佳 2021-07-27 14:53:01 +08:00
• 7d284ac758 Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-07-27 14:39:29 +08:00
• 4f37dc341f feat: 国内外标准库 左侧树 我的收藏 super_liu 2021-07-27 14:39:01 +08:00
• 0a64aa2f6b Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-27 14:38:29 +08:00
• 4e921d67e5 bug fanlin 2021-07-27 14:38:23 +08:00
• c5ab1264c3 标准清单数据列表高级查询 shen_yan_pu 2021-07-27 14:23:59 +08:00
• 4d00117149 Merge remote-tracking branch 'origin/develop' into develop fanlin 2021-07-27 14:04:24 +08:00