Commit Graph

Select branches

Hide Pull Requests

dev_20230829_change

dev_20231201_feizhi

master

Mono Color

• bad537f1ff Merge remote-tracking branch 'origin/develop' into develop Mr.Z 2021-08-27 14:44:31 +08:00
• add1b5831e 标准预警标准号跳页 Mr.Z 2021-08-27 14:44:09 +08:00
• 98c40803d8 标准解读显示拆分内容 shenyanpei 2021-08-27 14:43:27 +08:00
• 79af2c523b 项目评估-项目 流程的第6步的批量编辑功能 yanyizhou 2021-08-27 14:05:12 +08:00
• 90e992639f Merge branch 'develop' into 'test' 王夏晖 2021-08-27 03:00:31 +00:00
• ffc4860110 Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-08-27 10:48:00 +08:00
• 6c95afef25 拆分编辑中已完成和编辑中都能编辑 yanyizhou 2021-08-27 10:47:40 +08:00
• e5f81a9bc2 Merge branch 'develop' into 'test' 王夏晖 2021-08-27 01:47:31 +00:00
• 50528d1545 commit zhutianqi 2021-08-27 09:26:03 +08:00
• a3a987dc58 Merge branch 'develop' into 'test' 王夏晖 2021-08-27 01:07:32 +00:00
• d5aaea4c10 Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-08-27 08:56:03 +08:00
• 83a0fd7c96 commit zhutianqi 2021-08-27 08:55:52 +08:00
• 44d528dd23 标准拆分编辑删除的修改 Mr.Z 2021-08-26 21:14:55 +08:00
• 0837818745 未符合项整改查看 shenyanpei 2021-08-26 16:44:21 +08:00
• 3f3408599c Merge branch 'develop' into 'test' 王夏晖 2021-08-26 07:15:50 +00:00
• 801555fc0b 链接管理--新增一条链接，名称过长，首页该链接的名称会换行 yanyizhou 2021-08-26 15:14:08 +08:00
• 5fdda11f91 Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-08-26 14:37:36 +08:00
• 1f8829c06a 项目评估流程2 批量分发责任人step5 uname=>userName yanyizhou 2021-08-26 14:37:27 +08:00
• 98a08f62b6 未符合项结束的跳转，待办中心的跳转 shenyanpei 2021-08-26 14:25:33 +08:00
• d7d5068f4f 标准征求意见流程历史数据页面展示 宋伟佳 2021-08-26 13:50:19 +08:00
• cb55ba06f8 Merge branch 'develop' into 'test' 王夏晖 2021-08-26 05:40:44 +00:00
• 6a0dd76bbe 修改bug 宋伟佳 2021-08-26 13:39:22 +08:00
• c31ca44cec Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-08-26 10:57:25 +08:00
• c045b29ba3 feat: There is no way the super_liu 2021-08-26 10:56:47 +08:00
• 5d888a7cf6 项目评估流程2 批量分发责任人step5 yanyizhou 2021-08-26 10:24:28 +08:00
• d6e1249f45 Merge branch 'develop' into 'test' 王夏晖 2021-08-26 01:01:18 +00:00
• 76c6ea8e1c 未符合项跳转 shenyanpei 2021-08-25 17:57:00 +08:00
• 9540ec372b 未符合项整改库分页bug修复 Mr.Z 2021-08-25 17:36:16 +08:00
• c9423dee48 Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-08-25 15:25:52 +08:00
• f4d9b34d7b feat: There is no way the delResourceById super_liu 2021-08-25 15:25:33 +08:00
• d53d5c89ea 清单流程修改bug 宋伟佳 2021-08-25 14:49:54 +08:00
• 671b562bb3 Merge remote-tracking branch 'origin/develop' into develop zhaokaiyao@91isoft.com 2021-08-25 14:30:32 +08:00
• ba948f297a 入库流程-标准发布日期改为必填 zhaokaiyao@91isoft.com 2021-08-25 14:30:23 +08:00
• 6b89c5f430 feat: There is no way the buss super_liu 2021-08-25 10:55:51 +08:00
• c26b78acda Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-08-25 10:07:15 +08:00
• d6f7c8492a feat: There is no way the es testStatus super_liu 2021-08-25 10:07:02 +08:00
• 753542b4d7 标准调研历史数据页面 宋伟佳 2021-08-25 10:03:11 +08:00
• f0b9717eef Merge branch 'develop' into 'test' 王夏晖 2021-08-25 01:17:53 +00:00
• 2a945201c2 commit zhutianqi 2021-08-24 20:13:37 +08:00
• 3bdafc9d3d Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-08-24 17:38:26 +08:00
• 7f8c5737bc commit zhutianqi 2021-08-24 17:38:20 +08:00
• ac2c00ba4f Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-08-24 17:34:03 +08:00
• b062e5d80c feat: There is no way the ES BUSS super_liu 2021-08-24 17:32:23 +08:00
• 429ce079ca Merge branch 'develop' into 'test' 王夏晖 2021-08-24 08:22:28 +00:00
• 65508e1d32 Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-08-24 15:40:57 +08:00
• 197c403ede 零部件编号申请的按钮图标更新 yanyizhou 2021-08-24 15:40:42 +08:00
• 707cf898a2 标准清单传输文件id，修改未符合项新增分页 shenyanpei 2021-08-24 15:34:26 +08:00
• 08a863a097 标准征求意见--申请人发起流程步骤提交按钮没有loading，可以通过点击多次提交按钮提交多次 这个问题在草稿和新建流程都存在 现已解决 yanyizhou 2021-08-24 15:32:57 +08:00
• 87d3adfb01 Merge branch 'develop' into 'test' 王夏晖 2021-08-24 07:16:34 +00:00
• a09a32a940 标准征求意见第一步提交按钮loading效果不佳 yanyizhou 2021-08-24 14:43:51 +08:00
• d8af383364 标准属性编辑自定义禁用取消 yanyizhou 2021-08-24 14:35:47 +08:00
• 294bacdaf8 Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-08-24 14:11:12 +08:00
• f56839b8b1 commit zhutianqi 2021-08-24 14:11:05 +08:00
• a9b107a81d 修改bug 宋伟佳 2021-08-24 14:06:49 +08:00
• ad23e66e38 Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-08-24 13:41:09 +08:00
• 818c3f4d5a feat: There is no way the super_liu 2021-08-24 13:40:42 +08:00
• 0fff28c672 Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-08-24 11:15:56 +08:00
• 1a6b5bef25 标准拆分-新拆分的文件，点击查看，进入详情页面，编辑按钮置灰不可编辑，应该可以编辑 yanyizhou 2021-08-24 11:15:45 +08:00
• 1b519291d8 车型项目库分页bug修复 Mr.Z 2021-08-24 10:51:08 +08:00
• 29ffc482e7 Merge branch 'develop' into 'test' 王夏晖 2021-08-24 01:04:31 +00:00
• 4e3dff9ece feat: There is no way the super_liu 2021-08-23 17:50:47 +08:00
• c1ac951e43 Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-08-23 17:49:39 +08:00
• e87f39d83b feat: There is no way the advanced query super_liu 2021-08-23 17:49:28 +08:00
• b9388d5c77 Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-08-23 15:52:33 +08:00
• 5164456f61 项目评估结果tab页下的查看页面，点击查询按钮，提示程序异常 yanyizhou 2021-08-23 15:52:17 +08:00
• da4f7a545c 车型项目库调取数据bug修改~~ Mr.Z 2021-08-23 15:51:58 +08:00
• 672374e17d Merge remote-tracking branch 'origin/develop' into develop zhaokaiyao@91isoft.com 2021-08-23 15:40:15 +08:00
• 93f9c65625 标准详情,添加ocr按钮 zhaokaiyao@91isoft.com 2021-08-23 15:40:06 +08:00
• 9f3b88e759 Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-08-23 15:32:25 +08:00
• 71f11798ba 清单车型类别修改数据库存的中文bug yanyizhou 2021-08-23 15:31:57 +08:00
• ff51ca8e3e Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-08-23 14:44:35 +08:00
• f1c2cf6a66 feat: There is no way the BUSS super_liu 2021-08-23 14:44:12 +08:00
• c1bc5a6508 清单车型类别不为空校验 yanyizhou 2021-08-23 14:15:53 +08:00
• 784c87f036 Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-08-23 11:26:30 +08:00
• c5002e58e5 commit yanyizhou 2021-08-23 11:26:10 +08:00
• 99c3f9752d Merge remote-tracking branch 'origin/develop' into develop zhaokaiyao@91isoft.com 2021-08-21 23:32:21 +08:00
• 91c23c9c6d 国外标准更新时,同时更新了标准清单 zhaokaiyao@91isoft.com 2021-08-21 23:32:14 +08:00
• 213245b209 Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-08-20 18:13:12 +08:00
• a7cfe741a4 feat: There is no way the super_liu 2021-08-20 18:13:04 +08:00
• 41fdef80bb Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-08-20 17:49:53 +08:00
• acdb91ef02 commit zhutianqi 2021-08-20 17:49:18 +08:00
• 832e3a7738 Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-08-20 17:37:53 +08:00
• 61cd8f71cc feat: There is no way the BUSS super_liu 2021-08-20 17:37:40 +08:00
• 05fc5466f2 修改清单的提示 yanyizhou 2021-08-20 10:09:34 +08:00
• 4d7e95ed64 修改清单的提示 yanyizhou 2021-08-20 10:02:43 +08:00
• 47237dc917 修改清单的提示 yanyizhou 2021-08-20 09:54:00 +08:00
• d1fd8405f9 修改bug yanyizhou 2021-08-19 22:55:35 +08:00
• bb4fc26161 修改bug 宋伟佳 2021-08-19 18:04:34 +08:00
• f98386a366 Merge branch 'develop' into 'test' 王夏晖 2021-08-19 09:18:25 +00:00
• 9107e06b43 Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-08-19 16:22:52 +08:00
• 8029354f9c 标准法规清单的数据加载动画 yanyizhou 2021-08-19 16:22:46 +08:00
• 6195d17afc 未符合项整改库分页bug修复 Mr.Z 2021-08-19 15:55:21 +08:00
• a47a00abb4 Merge remote-tracking branch 'origin/develop' into develop zhutianqi 2021-08-19 15:50:06 +08:00
• 1c5ecac0d4 commit zhutianqi 2021-08-19 15:49:50 +08:00
• 7b1d4bd883 查看分解单新车型实施日期回显 Mr.Z 2021-08-19 15:43:24 +08:00
• 814a7c267c Merge branch 'develop' into 'test' 王夏晖 2021-08-19 06:52:34 +00:00
• 99aac7d0da 分解单分页回显以及分页 Mr.Z 2021-08-19 14:50:54 +08:00
• 22a1823691 标准法规清单-国家/地区清单中的 每个国家或者地区只能建立一次清单，需做限制 yanyizhou 2021-08-19 13:39:58 +08:00
• 6b35f041bc Merge branch 'develop' into 'test' 王夏晖 2021-08-19 01:12:03 +00:00
• a573125a5e Merge remote-tracking branch 'origin/develop' into develop yanyizhou 2021-08-18 21:56:53 +08:00