Merge remote-tracking branch 'origin/master'

src/views/settlement/formal-settlement.vue

@@ -57,6 +57,7 @@
             v-if="hasPermission('formal_settlement_payment')"
             type="primary"
             plain
+            disabled
             @click="openPaymentDialog"
             >付款申请</el-button
           >
@@ -64,6 +65,7 @@
             v-if="hasPermission('formal_settlement_sync')"
             type="primary"
             plain
+            disabled
             @click="handleSync"
             >同步金蝶</el-button
           >

src/views/settlement/pre-settlement.vue

@@ -53,6 +53,7 @@
             v-if="hasPermission('pre_settlement_advance')"
             type="primary"
             plain
+            disabled
             @click="openAdvanceDialog"
           >
             预付申请
@@ -61,6 +62,7 @@
             v-if="hasPermission('pre_settlement_formal')"
             type="primary"
             plain
+            disabled
             @click="handleFormalSettlement"
           >
             尾款结算

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

@@ -686,7 +686,12 @@ export default {
       }
     },
     async loadContracts() {
-      const res = await getContractList(1, 999, { approvalStatus: 'approved' });
+      const contractCategory =
+        this.settlementType === 'payable' ? '承运商合同' : '客户合同';
+      const res = await getContractList(1, 999, {
+        approvalStatus: 'approved',
+        contractCategory,
+      });
       const data = this.unwrapPage(res);
       this.contractOptions = data.records || [];
     },

src/views/settlement/transport-reconciliation.vue

@@ -31,10 +31,6 @@
     </section>
 
     <section class="reconciliation-page__table-panel">
-      <el-tabs type="border-card" v-model="settlementType" @tab-change="handleTabChange">
-        <el-tab-pane label="应付" name="payable" />
-        <el-tab-pane label="应收" name="receivable" />
-      </el-tabs>
       <div class="reconciliation-page__toolbar">
         <div>
           <el-button
@@ -51,6 +47,15 @@
           </el-tooltip>
         </div>
       </div>
+      <el-tabs
+        v-model="settlementType"
+        class="reconciliation-page__settlement-tabs"
+        type="card"
+        @tab-change="handleTabChange"
+      >
+        <el-tab-pane label="应付" name="payable" />
+        <el-tab-pane label="应收" name="receivable" />
+      </el-tabs>
       <el-table v-loading="loading" :data="rows" border @selection-change="selection = $event">
         <el-table-column type="selection" width="52" fixed="left" align="center" />
         <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
@@ -74,7 +79,7 @@
             <span v-else>{{ displayValue(row[column.prop]) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="120" fixed="right" align="center">
+        <el-table-column label="操作" width="220" fixed="right" align="center">
           <template #default="{ row }">
             <div class="reconciliation-page__links">
               <el-link type="primary" @click="openView(row)">查看</el-link>
@@ -274,7 +279,7 @@ export default {
 .reconciliation-page__search {
   padding: 12px 12px 4px;
   background: #fff;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
 }
 .reconciliation-page__search-grid {
   display: grid;
@@ -300,7 +305,7 @@ export default {
   margin-bottom: 8px;
 }
 .reconciliation-page__table-panel {
-  margin-top: 12px;
+  margin-top: 8px;
 }
 .reconciliation-page__toolbar {
   display: flex;
@@ -314,6 +319,12 @@ export default {
   align-items: center;
   gap: 8px;
 }
+.reconciliation-page__settlement-tabs {
+  margin-bottom: 0;
+}
+.reconciliation-page__settlement-tabs :deep(.el-tabs__header) {
+  margin: 0;
+}
 .reconciliation-page__links {
   display: flex;
   flex-wrap: wrap;