Merge branch 'master' into feature/bfi-api-rate

# Conflicts:
#	src/components/vehicle-attachment-table/main.vue
#	src/option/payment/paymentApplication.js
#	src/views/payment/payment-application.vue
#	src/views/payment/receipt-claim-record.vue
#	src/views/vehicle/customer-archive.vue

src/views/settlement/components/pre-settlement-editor.vue

@@ -20,7 +20,7 @@
               <el-form-item :label="field.label" :prop="field.prop">
                 <el-input
                   v-if="field.type === 'contract'"
-                  v-model="form.contractName"
+                  :model-value="formatContractOptionLabel(form)"
                   readonly
                   :disabled="!editable || details.length > 0"
                   placeholder="请选择合同"
@@ -354,11 +354,21 @@
                 <span v-else>{{ attachmentTypeName(row.type) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="文件名称" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              label="文件名称"
+              min-width="260"
+              show-overflow-tooltip
+              class-name="is-ellipsis-link"
+            >
               <template #default="{ row }">
-                <el-link type="primary" @click="previewAttachment(row)">
-                  {{ attachmentName(row) }}
-                </el-link>
+                <span
+                  class="attachment-file-name"
+                  role="button"
+                  tabindex="0"
+                  @click="previewAttachment(row)"
+                  @keydown.enter="previewAttachment(row)"
+                  @keydown.space.prevent="previewAttachment(row)"
+                >{{ attachmentName(row) }}</span>
               </template>
             </el-table-column>
             <el-table-column label="附件描述" min-width="220">
@@ -963,6 +973,7 @@ import {
   settlementDetailColumns,
   settlementSummaryColumns,
 } from '@/option/settlement/preSettlementTable';
+import { formatContractOptionLabel } from '@/utils/contract';
 import { downloadFileByUrl } from '@/utils/util';
 import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import * as XLSX from 'xlsx';
@@ -1266,6 +1277,7 @@ export default {
     },
   },
   methods: {
+    formatContractOptionLabel,
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission?.[code], false);
     },
@@ -3003,7 +3015,7 @@ export default {
 }
 
 :deep(.pre-settlement-editor .el-form-item) {
-  margin-bottom: 14px;
+  margin-bottom: 24px;
 }
 
 :deep(.pre-settlement-editor .el-table),