fix: 结算单列表已指定应付列定义补充

src/api/payment/invoiceReceipt.js

@@ -41,9 +41,12 @@ export const pushKingdee = ids =>
 // 先票后款：发票明细查询（收票登记明细区块按票号带出发票明细行）
 export const invoiceDetailQuery = invoiceNo =>
   request({ url: `${baseUrl}/invoice-detail-query`, method: 'get', params: { invoiceNo } });
-// 先票后款：结算单认领收票单候选（审批通过且未被有效应付结算单认领）
-export const claimCandidates = keyword =>
-  request({ url: `${baseUrl}/claim-candidates`, method: 'get', params: { keyword } });
+// 先票后款：结算单认领收票单候选分页（审批通过且未被有效应付结算单认领）
+export const claimCandidates = params =>
+  request({ url: `${baseUrl}/claim-candidates`, method: 'get', params });
+// 先票后款：结算单已认领收票登记列表（发票登记对话框回显已认领票）
+export const claimedReceipts = formalSettlementId =>
+  request({ url: `${baseUrl}/claimed-list`, method: 'get', params: { formalSettlementId } });
 
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },

src/api/payment/paymentApplication.js

@@ -27,13 +27,13 @@ export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'p
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
 // 同步金蝶涉及多次金蝶远程接口调用（A103-2 预检 + A103-1/A103-3 推送），单笔可达 20s+，覆盖全局 10s 超时
 export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: APPROVE_TIMEOUT, params: { id } });
 // 批量同步逐单单据级事务串行推送，耗时随单量线性增长
 export const syncKingdeeBatch = ids =>
-  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', timeout: 30000, data: ids });
+  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', timeout: APPROVE_TIMEOUT, data: ids });
 // 回写任务按 paymentNo 分批远程查询 A103-2/A103-4，同样可能超过全局超时
 export const syncKingdeeResult = () =>
-  request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: 30000 });
+  request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: APPROVE_TIMEOUT });
 
 export const paymentTypeOptions = [
   { label: '项目预付', value: 'project_advance' },

src/api/settlement/formalSettlement.js

@@ -66,5 +66,13 @@ export const invoiceAssignKingdee = id =>
     timeout: 30000,
     params: { id },
   });
+// 先票后款：查看页重推认领收票单（收票单A303-2+指定应付A302-6 一步式），涉及多次金蝶远程调用，覆盖全局超时
+export const repushClaimedInvoice = (id, invoiceNo, matchedAmount) =>
+  request({
+    url: `${baseUrl}/repush-claimed-invoice`,
+    method: 'post',
+    timeout: 30000,
+    params: { id, invoiceNo, matchedAmount },
+  });
 export const queryInvoicePool = params =>
   request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });

src/option/payment/paymentApplication.js

@@ -170,6 +170,7 @@ export const paymentApplicationOption = ({
     { label: '当前处理人', prop: 'currentProcessor', minWidth: 120, formatter: textFormatter },
     { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 130, formatter: textFormatter },
     { label: '金蝶单据状态', prop: 'kingdeeStatusName', slot: true, minWidth: 130 },
+    { label: '已指定应付', prop: 'kingdeeAssignStatus', slot: true, minWidth: 120 },
     { label: '金蝶锁状态', prop: 'kingdeeLockStatus', slot: true, minWidth: 150 },
     { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100, formatter: textFormatter },
   ],

src/option/settlement/formalSettlement.js

@@ -87,6 +87,7 @@ const COLUMN_EXTRA = {
     searchPlaceholder: '请选择',
   },
   kingdeeLockStatus: { slot: true },
+  kingdeeAssignStatus: { slot: true },
   createTime: { width: 180 },
 };
 

src/option/settlement/formalSettlementTable.js

@@ -26,6 +26,7 @@ export const formalSettlementTableColumns = [
   { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
   { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
   { label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 },
+  { label: '已指定应付', prop: 'kingdeeAssignStatus', minWidth: 120 },
   { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 },
   { label: '创建人', prop: 'createUserName', minWidth: 110 },
   { label: '创建时间', prop: 'createTime', minWidth: 170 },

src/views/payment/invoice-receipt-form.vue

@@ -227,6 +227,9 @@ import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.v
 import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
+// 提交成功后带标记返回，列表页（keep-alive）据此重新拉取
+const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
+
 const emptyForm = () => ({
   id: null,
   invoiceNo: '',
@@ -555,6 +558,7 @@ export default {
         mkEnabled: await loadMkEnabled().catch(() => false),
       });
       this.$message.success('提交成功');
+      sessionStorage.setItem(invoiceReceiptListRefreshKey, '1');
       this.goBack();
     },
     async syncReferenceData() {

src/views/payment/invoice-receipt.vue

@@ -223,6 +223,10 @@ import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
+// 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取
+const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
+const invoiceReceiptListRoute = '/payment/invoice-receipt';
+
 const emptyQuery = () => ({
   invoiceNo: '',
   invoiceDate: '',
@@ -281,7 +285,28 @@ export default {
         this.mkEnabled = false;
       });
   },
+  activated() {
+    this.consumeListRefreshFlag();
+  },
+  watch: {
+    $route(to, from) {
+      if (
+        to.path === invoiceReceiptListRoute &&
+        from?.path?.includes('/invoice-receipt/form')
+      ) {
+        this.consumeListRefreshFlag();
+      }
+    },
+  },
   methods: {
+    /** 表单提交成功后带标记返回时，重新拉取列表 */
+    consumeListRefreshFlag() {
+      if (!sessionStorage.getItem(invoiceReceiptListRefreshKey)) {
+        return;
+      }
+      sessionStorage.removeItem(invoiceReceiptListRefreshKey);
+      this.loadTable();
+    },
     hasPermission(code) {
       return this.permission?.[code] !== false;
     },

src/views/payment/payment-application.vue

@@ -80,6 +80,23 @@
         </el-tooltip>
       </template>
 
+      <template #kingdeeAssignStatus="{ row }">
+        <el-tooltip
+          :disabled="row.kingdeeAssignStatus !== 'failed'"
+          :content="row.kingdeeAssignFailReason || '收票单指定应付失败，可在对应付款结算单查看页重新推送'"
+          placement="top"
+        >
+          <el-tag
+            v-if="row.kingdeeAssignStatus"
+            :type="{ assigned: 'success', failed: 'danger' }[row.kingdeeAssignStatus] || 'info'"
+            size="small"
+          >
+            {{ { assigned: '已指定应付', failed: '指定失败' }[row.kingdeeAssignStatus] || '未指定' }}
+          </el-tag>
+          <span v-else>-</span>
+        </el-tooltip>
+      </template>
+
       <template #menu="{ row }">
         <el-link
           v-if="hasPermission('payment_application_view')"
@@ -409,6 +426,12 @@ export default {
         return;
       }
       this.syncLoading = true;
+      // 批量同步金蝶逐单串行推送耗时较长，加遮罩防重复操作（照审批通过遮罩）
+      const loading = this.$loading({
+        lock: true,
+        text: '正在批量同步金蝶，请稍候…',
+        background: 'rgba(255, 255, 255, 0.6)',
+      });
       try {
         const data = this.unwrapData(await api.syncKingdeeBatch(rows.map(row => row.id))) || [];
         const failedList = data.filter(item => String(item).includes('同步失败'));
@@ -425,6 +448,7 @@ export default {
         this.warnAttachmentNotUploaded(rows.map(row => row.id));
       } finally {
         this.syncLoading = false;
+        loading.close();
       }
     },
     // 附件联带同步提示：同步成功但附件未全部上传时追加 warning，重推即自动补传

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

@@ -482,18 +482,39 @@
             align="center"
           >
             <template #default="{ row }">
-              <!-- 先票后款：收票单认领金额固定=发票金额（全额认领），不可改 -->
+              <!-- 匹配结算单金额支持手动修改：编辑态全放开；查看页仅指定失败行（failed）开放，重推时一并保存生效 -->
               <el-input-number
-                v-if="editable && form.settlementType === 'receivable'"
+                v-if="canEditMatchedAmount(row)"
                 v-model="row.matchedAmount"
                 :min="0"
-                :max="Number(row.availableInvoiceAmount || 0)"
+                :max="Number(row.availableInvoiceAmount || row.invoiceAmount || 0)"
                 :precision="2"
                 :controls="false"
               />
               <span v-else>{{ formatMoney(row.matchedAmount) }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="是否已指定应付" min-width="130" align="center">
+            <template #default="{ row }">
+              <el-tooltip
+                :disabled="row.kingdeePushStatus !== 'failed'"
+                :content="row.kingdeePushMsg || '推送金蝶失败，可重新推送'"
+                placement="top"
+              >
+                <el-tag
+                  :type="
+                    { assigned: 'success', failed: 'danger' }[row.kingdeePushStatus] || 'info'
+                  "
+                  size="small"
+                >
+                  {{
+                    { assigned: '已指定应付', failed: '指定失败' }[row.kingdeePushStatus] ||
+                    '未指定'
+                  }}
+                </el-tag>
+              </el-tooltip>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="220" fixed="right" align="center">
             <template #default="{ row, $index }">
               <div class="formal-editor__links">
@@ -509,6 +530,14 @@
                   @click="downloadInvoiceAttachment(row)"
                   >下载</el-link
                 >
+                <!-- 查看页重推入口：付款结算单已同步金蝶且认领票未指定应付（failed/pushed） -->
+                <el-link
+                  v-if="canRepushInvoice(row)"
+                  type="warning"
+                  :disabled="repushing"
+                  @click="repushInvoice(row)"
+                  >重新推送</el-link
+                >
                 <el-link v-if="editable" type="danger" @click="removeInvoice($index)">删除</el-link>
               </div>
             </template>
@@ -1061,6 +1090,7 @@ import {
   getNextNo,
   getReceiptClaims,
   claimInvoices as claimInvoicesApi,
+  repushClaimedInvoice,
   queryInvoicePool,
   save,
   syncKingdee,
@@ -1159,6 +1189,8 @@ export default {
       attachments: [],
       selectedAttachmentRows: [],
       invoices: [],
+      // 查看页认领收票单重推进行中（行级操作守卫）
+      repushing: false,
       // 开票申请经金蝶回写的发票结果（只读展示，含板式文件/数电PDF下载地址）
       issuedInvoices: [],
       // 金蝶侧发票附件查看/下载进行中（行组级 loading 守卫）
@@ -2669,6 +2701,48 @@ export default {
     openInvoiceReceiptDialog() {
       this.invoiceReceiptDialog.visible = true;
     },
+    // 查看页重推入口展示条件：只读 + 付款结算单 + 审批通过 + 金蝶应付单已同步 + 该票未指定应付（failed/pushed）
+    canRepushInvoice(row) {
+      return (
+        !this.editable &&
+        this.form.settlementType !== 'receivable' &&
+        this.form.approvalStatus === 'approved' &&
+        this.form.kingdeeSyncStatus === 'synced' &&
+        ['failed', 'pushed'].includes(row.kingdeePushStatus || '')
+      );
+    },
+    // 查看页匹配金额编辑仅开放指定失败行（failed）；pushed 行等待自动补偿指定，金额保持只读
+    canEditMatchedAmount(row) {
+      return (
+        this.editable ||
+        (this.form.settlementType !== 'receivable' &&
+          this.form.approvalStatus === 'approved' &&
+          this.form.kingdeeSyncStatus === 'synced' &&
+          row.kingdeePushStatus === 'failed')
+      );
+    },
+    // 重推 = 收票单A303-2 + 指定应付A302-6 一步式，服务端返回结果描述；完成后重载详情刷新状态
+    async repushInvoice(row) {
+      try {
+        await this.$confirm(`确认重新推送发票${row.invoiceNo || ''}到金蝶并指定应付?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        });
+      } catch {
+        return;
+      }
+      this.repushing = true;
+      try {
+        const data = this.unwrapData(
+          await repushClaimedInvoice(this.form.id, row.invoiceNo, Number(row.matchedAmount || 0))
+        );
+        this.$message.success(data || '重新推送成功');
+        await this.loadFormalDetail(this.form.id);
+      } finally {
+        this.repushing = false;
+      }
+    },
     async handleInvoiceReceiptConfirm(rows) {
       // 收票单行 → 结算单发票行：匹配金额固定=发票金额（全额认领），附件契约归一为单数 attachmentJson
       const invoices = rows.map(row => ({

src/views/settlement/components/formal-settlement-table-panel.vue

@@ -23,6 +23,15 @@
         @click="$emit('payment')"
         >付款申请</el-button
       >
+      <!-- 先票后款：付款结算单审批通过后可发票登记（关联收票单并推送指定应付），选中一条付款结算单操作 -->
+      <el-button
+        v-if="showPaymentAction && hasPermission('invoice_register')"
+        type="primary"
+        plain
+        :disabled="!selection.length"
+        @click="emitSingle('invoiceRegister')"
+        >发票登记</el-button
+      >
       <el-button
         v-if="hasPermission('sync')"
         type="primary"
@@ -79,6 +88,23 @@
       <span v-else>-</span>
     </template>
 
+    <template #kingdeeAssignStatus="{ row }">
+      <el-tooltip
+        :disabled="row.kingdeeAssignStatus !== 'failed'"
+        :content="row.kingdeeAssignFailReason || '收票单指定应付失败，可在查看页对失败行重新推送'"
+        placement="top"
+      >
+        <el-tag
+          v-if="row.kingdeeAssignStatus"
+          :type="{ assigned: 'success', failed: 'danger' }[row.kingdeeAssignStatus] || 'info'"
+          size="small"
+        >
+          {{ { assigned: '已指定应付', failed: '指定失败' }[row.kingdeeAssignStatus] || '未指定' }}
+        </el-tag>
+        <span v-else>-</span>
+      </el-tooltip>
+    </template>
+
     <template #menu="{ row }">
       <el-link
         v-for="action in rowActions(row)"
@@ -189,13 +215,6 @@ export default {
         row.kingdeeSyncStatus !== 'synced'
       )
         actions.push({ type: 'void', label: '作废', danger: true });
-      // 先票后款：付款结算单审批通过后可发票登记（关联收票单并推送指定应付）
-      if (
-        this.showPaymentAction &&
-        this.hasPermission('invoice_register') &&
-        row.approvalStatus === 'approved'
-      )
-        actions.push({ type: 'invoiceRegister', label: '发票登记' });
       return actions;
     },
     statusType(status) {

src/views/settlement/components/invoice-receipt-candidates-dialog.vue

@@ -38,14 +38,30 @@
       </el-table-column>
       <el-table-column label="推送状态" min-width="120" align="center">
         <template #default="{ row }">
-          <el-tag :type="pushStatusType(row.kingdeePushStatus)" size="small">
-            {{ pushStatusName(row.kingdeePushStatus) }}
-          </el-tag>
+          <el-tooltip
+            :disabled="row.kingdeePushStatus !== 'failed'"
+            :content="row.kingdeePushMsg || '推送金蝶失败，可在收票登记列表重推'"
+            placement="top"
+          >
+            <el-tag :type="pushStatusType(row.kingdeePushStatus)" size="small">
+              {{ pushStatusName(row.kingdeePushStatus) }}
+            </el-tag>
+          </el-tooltip>
         </template>
       </el-table-column>
     </el-table>
+    <div class="invoice-candidates-dialog__pagination">
+      <el-pagination
+        v-model:current-page="page.current"
+        v-model:page-size="page.size"
+        :total="page.total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @current-change="load"
+        @size-change="handleSizeChange"
+      />
+    </div>
     <div class="invoice-candidates-dialog__tip">
-      仅列出审批通过且未被其他付款结算单认领的收票单，最多 200 条
+      仅列出审批通过且未被其他付款结算单认领的收票单
     </div>
     <template #footer>
       <el-button @click="visible = false">取消</el-button>
@@ -71,6 +87,7 @@ export default {
       keyword: '',
       rows: [],
       selection: [],
+      page: { current: 1, size: 10, total: 0 },
     };
   },
   computed: {
@@ -90,17 +107,31 @@ export default {
     },
     handleOpen() {
       this.keyword = '';
+      this.page = { current: 1, size: 10, total: 0 };
       this.selection = [];
       this.$refs.candidatesTable?.clearSelection?.();
       this.load();
     },
     handleQuery() {
+      this.page.current = 1;
+      this.load();
+    },
+    handleSizeChange() {
+      this.page.current = 1;
       this.load();
     },
     async load() {
       this.loading = true;
       try {
-        this.rows = this.unwrap(await claimCandidates(this.keyword)) || [];
+        const data = this.unwrap(
+          await claimCandidates({
+            current: this.page.current,
+            size: this.page.size,
+            keyword: this.keyword,
+          })
+        );
+        this.rows = data?.records || [];
+        this.page.total = Number(data?.total || 0);
       } finally {
         this.loading = false;
       }
@@ -142,6 +173,11 @@ export default {
     width: 360px;
   }
 }
+.invoice-candidates-dialog__pagination {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 12px;
+}
 .invoice-candidates-dialog__tip {
   margin-top: 8px;
   color: #909399;

src/views/settlement/formal-settlement.vue

@@ -112,25 +112,57 @@
           <el-descriptions-item label="结算单号">
             {{ invoiceRegisterDialog.row.formalSettlementNo || '-' }}
           </el-descriptions-item>
+          <el-descriptions-item label="项目名称">
+            {{ invoiceRegisterDialog.row.projectName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="所属组织">
+            {{ invoiceRegisterDialog.row.deptName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="合同编号">
+            {{ invoiceRegisterDialog.row.contractNo || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="付款方">
+            {{ invoiceRegisterDialog.row.payerName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="收款方">
+            {{ invoiceRegisterDialog.row.payeeName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="结算类型">
+            {{ settlementTypeName(invoiceRegisterDialog.row.settlementType) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="业务模式">
+            {{ invoiceRegisterDialog.row.businessModelName || '-' }}
+          </el-descriptions-item>
           <el-descriptions-item label="结算总金额">
             {{ formatMoney(invoiceRegisterDialog.row.settlementAmount, invoiceRegisterDialog.row.currency) }}
           </el-descriptions-item>
           <el-descriptions-item label="已匹配发票金额">
             {{ formatMoney(invoiceRegisterDialog.row.invoiceAmount, invoiceRegisterDialog.row.currency) }}
           </el-descriptions-item>
-          <el-descriptions-item label="金蝶同步状态">
+          <el-descriptions-item label="创建人">
+            {{ invoiceRegisterDialog.row.createUserName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="创建时间">
+            {{ invoiceRegisterDialog.row.createTime || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="金蝶同步状态" :span="2">
             {{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }}
           </el-descriptions-item>
+          <el-descriptions-item label="备注" :span="2">
+            {{ invoiceRegisterDialog.row.remark || '-' }}
+          </el-descriptions-item>
         </el-descriptions>
       </section-card>
       <section-card title="认领收票单">
-        <el-button
-          type="primary"
-          plain
-          :disabled="invoiceRegisterDialog.saving"
-          @click="candidatesDialog.visible = true"
-          >选择收票单</el-button
-        >
+        <div class="invoice-register-dialog__actions">
+          <el-button
+            type="primary"
+            plain
+            :disabled="invoiceRegisterDialog.saving"
+            @click="candidatesDialog.visible = true"
+            >选择收票单</el-button
+          >
+        </div>
         <el-table :data="invoiceRegisterDialog.candidates" border class="invoice-register-dialog__table">
           <el-table-column type="index" label="序号" width="64" align="center" />
           <el-table-column prop="invoiceNo" label="发票号" min-width="160" align="center" />
@@ -140,12 +172,26 @@
           <el-table-column label="发票金额（含税）" min-width="140" align="right">
             <template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
           </el-table-column>
-          <el-table-column label="匹配结算单金额" min-width="150" align="right">
-            <template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
+          <el-table-column label="匹配结算单金额" min-width="160" align="right">
+            <template #default="{ row }">
+              <!-- 匹配金额支持手动修改（默认=发票金额全额），已认领回显行只读 -->
+              <el-input-number
+                v-if="!row.claimed"
+                v-model="row.matchedAmount"
+                :min="0"
+                :max="Number(row.invoiceAmount || 0)"
+                :precision="2"
+                :controls="false"
+              />
+              <span v-else>{{ formatMoney(row.matchedAmount || row.invoiceAmount) }}</span>
+            </template>
           </el-table-column>
           <el-table-column label="操作" width="90" fixed="right" align="center">
-            <template #default="{ $index }">
+            <template #default="{ row, $index }">
+              <!-- 已认领票回显：认领保存为增量逻辑不支持移除，仅新增票可移除 -->
+              <el-tag v-if="row.claimed" size="small">已认领</el-tag>
               <el-link
+                v-else
                 type="danger"
                 :disabled="invoiceRegisterDialog.saving"
                 @click="invoiceRegisterDialog.candidates.splice($index, 1)"
@@ -186,6 +232,7 @@ import { isAdministrator } from '@/utils/auth';
 import { downloadFile } from '@/utils/util';
 import * as api from '@/api/settlement/formalSettlement';
 import * as paymentApi from '@/api/payment/paymentApplication';
+import * as invoiceReceiptApi from '@/api/payment/invoiceReceipt';
 import { formalSettlementOption, kingdeeSyncName } from '@/option/settlement/formalSettlement';
 import organizationSearch from '@/mixins/organization-search';
 import FormalSettlementEditor from './components/formal-settlement-editor.vue';
@@ -682,10 +729,21 @@ export default {
       }
     },
     // 先票后款路径B：发票登记——认领收票单（claim-invoices 走增量认领并同步收票侧关系）
-    openInvoiceRegisterDialog(row) {
+    // 打开时回显本单已认领收票单（claimed 标记禁止移除），已认领过票的可直接保存推送补指定应付
+    async openInvoiceRegisterDialog(row) {
+      if ((row?.approvalStatus || '') !== 'approved') {
+        this.$message.warning('仅审批通过的付款结算单允许发票登记');
+        return;
+      }
       this.invoiceRegisterDialog.row = row || {};
       this.invoiceRegisterDialog.candidates = [];
       this.invoiceRegisterDialog.visible = true;
+      try {
+        const claimed = this.unwrapData(await invoiceReceiptApi.claimedReceipts(row.id)) || [];
+        this.invoiceRegisterDialog.candidates = claimed.map(item => ({ ...item, claimed: true }));
+      } catch (error) {
+        this.invoiceRegisterDialog.candidates = [];
+      }
     },
     addInvoiceRegisterCandidates(rows) {
       const existing = new Set(
@@ -696,7 +754,7 @@ export default {
         this.$message.warning('所选收票单均已登记');
         return;
       }
-      // 全额认领：匹配金额固定=发票金额
+      // 全额认领：匹配金额固定=发票金额（仅暂存展示，点保存认领确认后才落库）
       this.invoiceRegisterDialog.candidates.push(
         ...added.map(row => ({ ...row, matchedAmount: Number(row.invoiceAmount || 0) }))
       );
@@ -709,25 +767,24 @@ export default {
         invoiceType: row.invoiceType || '',
         taxRate: row.taxRate ?? null,
         availableInvoiceAmount: Number(row.invoiceAmount || 0),
-        matchedAmount: Number(row.invoiceAmount || 0),
+        matchedAmount: Number(row.matchedAmount || row.invoiceAmount || 0),
       }));
+      try {
+        // 先确认后保存：确定才认领并推送指定应付，取消不保存任何数据
+        await this.$confirm('确认认领并推送金蝶指定应付?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        });
+      } catch {
+        return;
+      }
       this.invoiceRegisterDialog.saving = true;
       try {
         await api.claimInvoices({ formalSettlementId: settlement.id, invoices });
-        this.invoiceRegisterDialog.visible = false;
-        this.onLoad(this.page);
-        try {
-          await this.$confirm('是否将发票匹配数据推送金蝶?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-          });
-        } catch {
-          this.$message.info('已保存认领，未推送金蝶');
-          return;
-        }
         const data = this.unwrapData(await api.invoiceAssignKingdee(settlement.id));
         this.$message.success(data || '发票登记推送金蝶成功');
+        this.invoiceRegisterDialog.visible = false;
         this.onLoad(this.page);
       } finally {
         this.invoiceRegisterDialog.saving = false;
@@ -782,6 +839,9 @@ export default {
       params.settlementType = this.lockedSettlementType || this.activeSettlementType;
       return params;
     },
+    settlementTypeName(value) {
+      return { payable: '付款', receivable: '收款' }[value] || '-';
+    },
     unwrapData(response) {
       const body = response?.data || response || {};
       return body?.data || body;
@@ -822,6 +882,11 @@ export default {
   margin-bottom: 12px;
   color: #606266;
 }
+.invoice-register-dialog__actions {
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 8px;
+}
 :deep(.formal-page.basic-container .basic-container__card > .el-card__body) {
   padding: 0;
 }