Merge remote-tracking branch 'origin/dev' into dev

src/views/basic/printTemplate/basicPrintTemplate.vue

@@ -330,7 +330,7 @@ export default {
 }
 </style>
 
-<style scope lang="scss">
+<style  lang="scss">
 .avue-form__group {
   .no-print {
     display: flex;
@@ -352,13 +352,22 @@ export default {
 :deep(.el-form-item__label){
   width:auto !important;
 }
-.avue-form__row{
-    max-width:300px;
-}
 .no-print{
+//  margin-left:auto;
+  .el-button{
+     margin-right:0
+  }
+}
+</style>
+
+<style scoped lang='scss'>
+:deep(.no-print){
  margin-left:auto;
   .el-button{
      margin-right:0
   }
 }
+:deep(.avue-form__row){
+    max-width:300px;
+}
 </style>