Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/common/components/filter/index.vue

@@ -62,6 +62,15 @@ export default defineComponent({
 </script>
 
 <style lang="less">
+.btnDeafault.ant-btn {
+    margin-left: 0;
+}
+.ant-select + .btnDeafault.ant-btn {
+    margin-left: 10px;
+}
+.ant-space.ant-space-vertical + .btnDeafault.ant-btn {
+    margin-left: 0;
+}
 .filter-custom-table {
     display: inline-flex;
     padding-top: 4px;
@@ -74,8 +83,12 @@ export default defineComponent({
         height: 26px !important;
         line-height: 26px !important;
     }
+
+    .ant-select-single:not(.ant-select-customize-input) + .ant-select-single:not(.ant-select-customize-input),
+    .ant-select + .ant-space.ant-space-vertical {
+        margin-left: 10px;
+    }
     .ant-select-single:not(.ant-select-customize-input) {
-        margin-right: 10px;
         height: 26px;
         line-height: 26px !important;
         .ant-select-selector {
@@ -98,6 +111,7 @@ export default defineComponent({
             }
         }
     }
+
     .allDatePicker.ant-calendar-picker {
         height: 26px !important;
         border: 1px solid @m-grey46 !important;