Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/settlement/transport-reconciliation.vue

src/views/settlement/receivable-payable-detail.vue

@@ -76,7 +76,7 @@
             <span v-else>{{ formatColumnValue(row, column) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="220" fixed="right" align="center">
+        <el-table-column label="操作" width="120" fixed="right" align="center">
           <template #default="{ row }">
             <div class="settlement-detail-page__actions">
               <el-link v-if="row.settlementStatus === 'pending'" type="primary" @click="openAdjustDialog(row)">
@@ -111,7 +111,7 @@
       destroy-on-close
       class="settlement-detail-dialog"
     >
-      <el-tabs v-model="detailDialog.activeTab" @tab-change="handleDetailTabChange">
+      <el-tabs type="border-card" style="background-color: #ffffff" v-model="detailDialog.activeTab" @tab-change="handleDetailTabChange">
         <el-tab-pane label="费用明细" name="fee">
           <el-table v-loading="detailDialog.loading" :data="feeRows" border>
             <el-table-column type="index" label="序号" width="64" align="center" />
@@ -399,7 +399,13 @@
     </el-dialog>
 
     <el-dialog v-model="generateDialog.visible" title="生成费用" width="88%" append-to-body>
-      <el-form :model="generateQuery" inline label-position="right" label-width="120px">
+      <el-form
+        :model="generateQuery"
+        class="settlement-detail-page__generate-search"
+        inline
+        label-position="right"
+        label-width="120px"
+      >
         <el-form-item label="运单合同" required>
           <el-select
             v-model="generateQuery.contractId"
@@ -1258,7 +1264,7 @@ export default {
   margin-bottom: 8px;
   padding: 12px 12px 4px;
   background: #fff;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
 
   :deep(.el-form-item__label) {
     min-width: 160px;
@@ -1334,10 +1340,17 @@ export default {
 }
 
 .settlement-detail-page__dialog-form {
-  padding: 16px 20px 0;
+  padding: 16px 20px;
+  background: #fff;
+  border-radius: 6px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
 
   :deep(.el-form-item) {
     margin-bottom: 16px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
   }
 
   :deep(.el-select) {
@@ -1345,8 +1358,24 @@ export default {
   }
 }
 
+.settlement-detail-page__adjust-toolbar {
+  margin-bottom: 8px;
+}
+
+.settlement-detail-page__generate-search {
+  margin-bottom: 16px;
+  padding: 12px 12px 4px;
+  background: #fff;
+  border-radius: 6px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+}
+
 .settlement-detail-page__transfer-form {
   margin-bottom: 16px;
+  padding: 12px 12px 4px;
+  background: #fff;
+  border-radius: 6px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
 }
 
 @media screen and (max-width: 1200px) {
@@ -1360,4 +1389,17 @@ export default {
     grid-template-columns: 1fr;
   }
 }
+
+/* 详情弹窗 tabs 白底 */
+.settlement-detail-dialog {
+  :deep(.el-tabs__content) {
+    background: #fff;
+    padding: 16px;
+    border-radius: 0 0 6px 6px;
+  }
+
+  :deep(.el-tab-pane) {
+    background: transparent;
+  }
+}
 </style>