Commit Graph
2212 Commits
Author SHA1 Message Date
yanyizhou 8413c73d4e 我司署名人改成公司下所有员工,支持多选 2021-11-27 11:50:55 +08:00
yanyizhou 806a78bd61 Merge remote-tracking branch 'origin/develop' into develop 2021-11-27 11:34:22 +08:00
yanyizhou a9663b2a3b 代码格式化,没有做任何改动,现在的代码看着太乱了 2021-11-27 11:34:17 +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
yanyizhou 87814496cc 国内海外企标的操作只有收藏,删除和编辑单拎出来 2021-11-26 18:00:54 +08:00
yanyizhou d5d59cac1f Merge remote-tracking branch 'origin/develop' into develop 2021-11-26 16:45:57 +08:00
yanyizhou 0f6c3229a5 三大库详情的收藏按钮 2021-11-26 16:45:51 +08:00
宋伟佳 57d5237f98 commit 2021-11-26 16:33:30 +08:00
zhaokaiyao@91isoft.com 83685a3fd0 模块单元结构 2021-11-26 16:32:38 +08:00
宋伟佳 7c1f913851 合规评估 2021-11-26 16:29:15 +08:00
宋伟佳 3236a0b8fc commit 2021-11-26 15:58:21 +08:00
宋伟佳 1e69ab4faf 标准合规评估带入标准 2021-11-26 15:15:57 +08:00
zhutianqi 9c05c6fd5d Merge remote-tracking branch 'origin/develop' into develop 2021-11-26 14:54:12 +08:00
zhutianqi c3414f0687 commit 2021-11-26 14:54:06 +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
shenyanpei 15c3a460f0 工作组数据统计修改 2021-11-26 14:47:16 +08:00
shenyanpei 997e25565f 工作组数据统计修改 2021-11-26 14:29:18 +08:00
yanyizhou 784261d742 Merge remote-tracking branch 'origin/develop' into develop 2021-11-26 10:40:12 +08:00
yanyizhou 3280b73396 预警底下的留白去掉 2021-11-26 10:40:06 +08:00
shenyanpei 5ddab141a3 修改新增编辑样式 2021-11-26 10:23:04 +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
zhutianqi 515a814454 Merge remote-tracking branch 'origin/develop' into develop 2021-11-25 17:55:54 +08:00
zhutianqi 6912e556b5 commit 2021-11-25 17:55:42 +08:00
shenyanpei 8c39dbaea1 去除console.log 2021-11-25 17:20:16 +08:00
宋伟佳 e8a6555488 未符合项编辑 2021-11-25 17:03:09 +08:00
zhutianqi 2159af8893 Merge remote-tracking branch 'origin/develop' into develop 2021-11-25 16:02:16 +08:00
zhutianqi 9f4ef0f318 commit 2021-11-25 16:01:53 +08:00
Superman_Main 5fbb74a677 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
2021-11-25 15:19:34 +08:00
Superman_Main 504bf89f61 feat: There is no way the, 2021-11-25 15:14:34 +08:00
shenyanpei 577d506c34 未符合项新增 2021-11-25 14:49:09 +08:00
yanyizhou 841c17731e Merge remote-tracking branch 'origin/develop' into develop 2021-11-25 09:53:46 +08:00
yanyizhou 4d2f60e40b commit(z) 2021-11-25 09:53:38 +08:00
shenyanpei 23a4ab1568 weifuhe 2021-11-25 09:50:08 +08:00
zhutianqi 887da9512c Merge remote-tracking branch 'origin/develop' into develop 2021-11-24 17:50:57 +08:00
zhutianqi be4d57198c commit 2021-11-24 17:50:33 +08:00
yanyizhou b0015f0a17 标准预警功能完全完毕plus 2021-11-24 17:48:47 +08:00
yanyizhou 24b9f52096 Merge remote-tracking branch 'origin/develop' into develop 2021-11-24 17:47:22 +08:00
yanyizhou de3c244bac 标准预警功能完全完毕plus 2021-11-24 17:47:17 +08:00
zhutianqi b089e7e2c9 Merge remote-tracking branch 'origin/develop' into develop 2021-11-24 17:45:44 +08:00
zhutianqi 4ba17ddbcd commit 2021-11-24 17:45:39 +08:00
yanyizhou a754b3d165 标准预警功能完全完毕 2021-11-24 17:33:04 +08:00
yanyizhou 85c851703a Merge remote-tracking branch 'origin/develop' into develop 2021-11-24 17:21:03 +08:00
yanyizhou a3d0749a74 标准预警功能完毕(还差一点日期显示有点问题) 2021-11-24 17:20:58 +08:00
zhutianqi 368aad27a7 commit 2021-11-24 16:09:20 +08:00
zhutianqi 005367809b Merge remote-tracking branch 'origin/develop' into develop 2021-11-24 15:35:39 +08:00
zhutianqi 9ae061cc00 commit 2021-11-24 15:35:33 +08:00
shenyanpei 091d12ebb0 weifuhe 2021-11-24 14:23:25 +08:00