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

src/common/components/buttonList/index.vue

@@ -23,5 +23,10 @@ export default defineComponent({
 });
 </script>
 
-<style lang="scss">
+<style lang="less">
+.btn-list {
+  display: inline-flex;
+  padding-top: 9px;
+  padding-bottom: 6px;
+}
 </style>

src/common/components/filter/index.vue

@@ -52,7 +52,7 @@ export default defineComponent({
 
 <style lang="less">
 .filter-custom-table {
-    width: 100%;
+    // width: 100%;
     display: inline-flex;
     padding-top: 9px;
     padding-bottom: 6px;

src/views/information/custom/compoments/filterTable/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 过滤客户资料表格 -->
-  <div>
+  <div class="filterTable">
     <FilterOption :selectList="selectList"
                   :inputList="inputList"
                   :fixedBtnList="fixedBtnList" />
@@ -44,4 +44,8 @@ export default defineComponent({
 </script>
 
 <style lang="less">
+.filterTable {
+    display: inline-flex;
+    width: 100%;
+}
 </style>;