Merge remote-tracking branch 'websoft/master'

src/views/settlement/formal-settlement.vue

@@ -41,7 +41,7 @@
     </section>
 
     <section class="formal-page__table-panel">
-      <el-tabs v-model="activeSettlementType" @tab-change="handleSettlementTypeChange">
+      <el-tabs type="border-card" v-model="activeSettlementType" @tab-change="handleSettlementTypeChange">
         <el-tab-pane label="应付" name="payable" />
         <el-tab-pane label="应收" name="receivable" />
       </el-tabs>

src/views/settlement/pre-settlement.vue

@@ -743,7 +743,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     min-height: 56px;
-    padding: 12px;
+    //padding: 12px;
   }
 
   &__toolbar-left,

src/views/settlement/transport-reconciliation.vue

@@ -312,7 +312,7 @@ export default {
   justify-content: space-between;
   align-items: center;
   min-height: 56px;
-  padding: 12px;
+  //padding: 12px;
 }
 .reconciliation-page__toolbar-right {
   display: flex;