Merge branch 'master' into release-20170915

components/supplier/details.vue

@@ -276,7 +276,7 @@
   }
 </script>
 
-<style type="text/scss" lang="scss" scoped>
+<style type="text/scss" lang="scss">
 .details_info{
   background: #fff;
   .el-dialog{

components/supplier/resource.vue

@@ -357,7 +357,7 @@
   }
 </script>
 
-<style type="text/scss" lang="scss" scoped>
+<style type="text/scss" lang="scss">
 .resource_info{
   background: #ecf1f1;
   .el-dialog{