feat: 批量转结算弹窗新增单据号和合同编码查询条件

- 下一页回传上页nextCursor续扫，新查询/换页容量/重新打开自动重置游标与页缓存
- 上一页直接回显已浏览页缓存，不再发起请求
- 查询表单删除单据使用状态条件（后端固定查未用），新增剩余可用金额展示列

src/api/payment/invoiceReceipt.js

@@ -25,8 +25,6 @@ export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post'
 export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
-export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
 export const pushKingdee = ids =>
   request({ url: `${baseUrl}/push-kingdee`, method: 'post', data: ids });
 
@@ -38,8 +36,9 @@ export const approvalStatusOptions = [
   { label: '已作废', value: 'voided' },
 ];
 
-export const kingdeeStatusOptions = [
-  { label: '未同步', value: 'unsynced' },
-  { label: '已同步', value: 'synced' },
-  { label: '同步失败', value: 'failed' },
+export const kingdeePushStatusOptions = [
+  { label: '未推送', value: 'unsynced' },
+  { label: '已保存收票单', value: 'pushed' },
+  { label: '已指定应付', value: 'assigned' },
+  { label: '推送失败', value: 'failed' },
 ];

src/components/kingdee-invoice-pool-dialog/main.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog v-model="visible" :title="title" width="92%" append-to-body destroy-on-close @open="handleOpen">
-    <el-form :model="query" inline label-width="90px" @submit.prevent>
+    <el-form :model="query" inline label-width="130px" @submit.prevent>
       <el-form-item label="发票号码">
         <el-input v-model="query.invoiceNo" clearable @keyup.enter="handleQuery" />
       </el-form-item>
@@ -14,7 +14,7 @@
           end-placeholder="结束日期"
         />
       </el-form-item>
-      <el-form-item label="销方税号">
+      <el-form-item label="销方（开票方税号）">
         <el-input
           v-model="query.salerTaxNo"
           clearable
@@ -22,7 +22,7 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="购方税号">
+      <el-form-item label="购方（收票方税号）">
         <el-input
           v-model="query.buyerTaxNo"
           clearable
@@ -46,16 +46,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="单据使用状态">
-        <el-select v-model="query.expenseStatus" clearable placeholder="不限" style="width: 130px">
-          <el-option
-            v-for="option in expenseStatusOptions"
-            :key="option.value"
-            :label="option.label"
-            :value="option.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button :disabled="loading" @click="resetQuery">重置</el-button>
         <el-button type="primary" :disabled="loading" @click="handleQuery">查询</el-button>
@@ -98,6 +88,9 @@
       <el-table-column label="税额" min-width="120" align="right">
         <template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
       </el-table-column>
+      <el-table-column label="剩余可用金额" min-width="130" align="right">
+        <template #default="{ row }">{{ formatMoney(row.availableTaxAmount) }}</template>
+      </el-table-column>
       <el-table-column prop="kingdeeBillNo" label="金蝶单据号" min-width="210" show-overflow-tooltip />
       <el-table-column label="认领状态" min-width="100" align="center">
         <template #default="{ row }">
@@ -153,16 +146,16 @@ export default {
         { value: '26', label: '数电发票（普通发票）' },
         { value: '27', label: '数电发票（增值税专用发票）' },
       ],
-      expenseStatusOptions: [
-        { value: '1', label: '未用' },
-        { value: '30', label: '在用' },
-        { value: '60', label: '已用' },
-        { value: '65', label: '已入账' },
-      ],
       rows: [],
       selected: [],
       current: null,
       page: { current: 1, size: 10, hasMore: false },
+      // 续扫游标（服务端过滤补页后翻页须按游标对齐，防漏行/重行）
+      nextCursor: null,
+      // 下一页请求待回传的游标：nextPage 时暂存，load 成功或失败后清空
+      pendingCursor: null,
+      // 已浏览页缓存：上一页直接回显不再请求（0 远程调用）
+      pageCache: {},
       query: this.emptyQuery(),
     };
   },
@@ -185,8 +178,6 @@ export default {
         salerTaxNo: '',
         buyerTaxNo: '',
         invoiceType: '',
-        // 单据使用状态默认"未用"
-        expenseStatus: '1',
       };
     },
     // 远程实时查询的票未入本地镜像，id 恒空，用发票号码兜底作为行主键
@@ -200,21 +191,34 @@ export default {
       this.selected = [];
       this.$refs.poolTable?.clearSelection();
       this.page.current = 1;
+      this.resetScanState();
       this.load();
     },
     handleQuery() {
       this.page.current = 1;
+      this.resetScanState();
       this.load();
     },
     handleSizeChange() {
       this.page.current = 1;
+      this.resetScanState();
       this.load();
     },
     prevPage() {
+      // 已浏览页直接回显缓存，不再请求
+      const cached = this.pageCache[this.page.current - 1];
+      if (cached) {
+        this.page.current -= 1;
+        this.rows = cached.rows;
+        this.page.hasMore = cached.hasMore;
+        this.nextCursor = cached.nextCursor;
+        return;
+      }
       this.page.current -= 1;
       this.load();
     },
     nextPage() {
+      this.pendingCursor = this.nextCursor;
       this.page.current += 1;
       this.load();
     },
@@ -222,6 +226,12 @@ export default {
       this.query = this.emptyQuery();
       this.handleQuery();
     },
+    // 新查询/换页容量/重新打开时清空游标与已浏览页缓存，重新锚定扫描
+    resetScanState() {
+      this.nextCursor = null;
+      this.pendingCursor = null;
+      this.pageCache = {};
+    },
     unwrap(response) {
       const body = response?.data || response || {};
       return body?.data || body;
@@ -230,23 +240,27 @@ export default {
       this.loading = true;
       // 请求前快照页码：prev/next 会先改写 current，远程失败时回滚避免停留在错页
       const lastRequested = this.page.current;
+      const cursor = this.pendingCursor;
+      this.pendingCursor = null;
       try {
         const range = this.query.invoiceDateRange || [];
         const data = this.unwrap(
           await this.queryApi({
             current: this.page.current,
             size: this.page.size,
+            cursor: cursor || undefined,
             invoiceNo: this.query.invoiceNo || undefined,
             invoiceDateStart: range[0] || undefined,
             invoiceDateEnd: range[1] || undefined,
             salerTaxNo: this.query.salerTaxNo || undefined,
             buyerTaxNo: this.query.buyerTaxNo || undefined,
             invoiceType: this.query.invoiceType || undefined,
-            expenseStatus: this.query.expenseStatus || undefined,
           })
         );
         this.rows = data.records || [];
         this.page.hasMore = !!data.hasMore;
+        this.nextCursor = data.nextCursor || null;
+        this.pageCache[this.page.current] = { rows: this.rows, hasMore: this.page.hasMore, nextCursor: this.nextCursor };
       } catch (error) {
         if (this.page.current !== lastRequested) {
           this.page.current = lastRequested;

src/option/payment/invoiceReceipt.js

@@ -11,6 +11,7 @@ export const invoiceReceiptTableColumns = [
   { prop: 'currentProcessor', label: '当前处理人', minWidth: 130 },
   { prop: 'createUserName', label: '创建人', minWidth: 110 },
   { prop: 'createTime', label: '创建时间', minWidth: 170 },
-  { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 150 },
-  { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 140 },
+  { prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 },
+  { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 },
+  { prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 },
 ];

src/option/settlement/receivable-payable-detail.js

@@ -88,6 +88,8 @@ export const updateFeeFormFields = [
 ];
 
 export const transferSearchFields = [
+  { label: '单据号', prop: 'documentNo', type: 'input' },
+  { label: '合同编码', prop: 'contractNo', type: 'input' },
   { label: '合同名称', prop: 'contractName', type: 'input' },
   { label: '批次号', prop: 'batchNo', type: 'input' },
   { label: '生成日期', prop: 'generateDateRange', type: 'daterange' },

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

@@ -226,8 +226,6 @@ const emptyForm = () => ({
   bankName: '',
   bankAccount: '',
   issuingBank: '',
-  kingdeeBillNo: '',
-  kingdeeStatus: 'unsynced',
   phone: '',
   customerEmails: [],
   departmentEmails: [],
@@ -395,8 +393,6 @@ export default {
         bankName: selected.bankName,
         bankAccount: selected.bankAccount,
         issuingBank: selected.issuingBank,
-        kingdeeBillNo: selected.kingdeeBillNo || '',
-        kingdeeStatus: selected.kingdeeStatus || 'unsynced',
         phone: preserveUserInput ? this.form.phone : selected.phone || '',
         customerEmails: preserveUserInput
           ? this.form.customerEmails
@@ -518,8 +514,6 @@ export default {
         bankName: this.form.bankName,
         bankAccount: this.form.bankAccount,
         issuingBank: this.form.issuingBank,
-        kingdeeBillNo: this.form.kingdeeBillNo,
-        kingdeeStatus: this.form.kingdeeStatus,
         phone: this.form.phone,
         customerEmails: this.form.customerEmails.join(';'),
         departmentEmails: this.form.departmentEmails.join(';'),

src/views/payment/invoice-receipt.vue

@@ -40,10 +40,10 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item v-if="searchExpanded" label="金蝶单据状态">
-            <el-select v-model="query.kingdeeStatus" clearable placeholder="请选择">
+          <el-form-item v-if="searchExpanded" label="金蝶状态">
+            <el-select v-model="query.kingdeePushStatus" clearable placeholder="请选择">
               <el-option
-                v-for="item in kingdeeStatusOptions"
+                v-for="item in kingdeePushStatusOptions"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -66,19 +66,12 @@
     <section class="receipt-page__table-panel">
       <div class="receipt-page__toolbar">
         <div class="receipt-page__toolbar-left">
-          <el-button
-            v-if="hasPermission('invoice_receipt_sync')"
-            type="primary"
-            plain
-            @click="handleBatchSync"
-            >批量同步</el-button
-          >
           <el-button
             v-if="hasPermission('invoice_receipt_sync')"
             type="primary"
             plain
             @click="handlePushKingdee"
-            >推送金蝶收票单</el-button
+            >批量同步</el-button
           >
           <el-button v-if="hasPermission('invoice_receipt_add')" type="primary" @click="openCreate"
             >新增</el-button
@@ -251,7 +244,7 @@ const emptyQuery = () => ({
   deptName: '',
   deptPath: [],
   approvalStatus: '',
-  kingdeeStatus: '',
+  kingdeePushStatus: '',
 });
 
 export default {
@@ -265,7 +258,7 @@ export default {
       query: emptyQuery(),
       searchExpanded: false,
       approvalStatusOptions: api.approvalStatusOptions,
-      kingdeeStatusOptions: api.kingdeeStatusOptions,
+      kingdeePushStatusOptions: api.kingdeePushStatusOptions,
       columns: invoiceReceiptTableColumns,
       rows: [],
       selection: [],
@@ -370,23 +363,13 @@ export default {
       this.$message.success('作废成功');
       this.loadTable();
     },
-    async handleBatchSync() {
-      const rows = this.selection.filter(row => row.approvalStatus === 'approved');
-      if (!rows.length) {
-        this.$message.warning('请选择至少一条审批通过的收票登记');
-        return;
-      }
-      await Promise.all(rows.map(row => api.syncKingdee(row.id)));
-      this.$message.success(`已同步${rows.length}条收票登记`);
-      this.loadTable();
-    },
     async handlePushKingdee() {
       const rows = this.selection.filter(row => row.approvalStatus === 'approved');
       if (!rows.length) {
         this.$message.warning('请选择至少一条审批通过的收票登记');
         return;
       }
-      await this.$confirm(`确认将选中的 ${rows.length} 条收票登记推送金蝶收票单？`, '提示', {
+      await this.$confirm(`确认将选中的 ${rows.length} 条收票登记同步至金蝶？`, '提示', {
         type: 'warning',
       });
       const summary = this.unwrapData(await api.pushKingdee(rows.map(row => row.id)));
@@ -408,8 +391,9 @@ export default {
         当前处理人: item.currentProcessor,
         创建人: item.createUserName,
         创建时间: item.createTime,
-        金蝶单据号: item.kingdeeBillNo,
-        金蝶单据状态: item.kingdeeStatusName,
+        金蝶单据号: item.kingdeeReceivedInvoiceNo,
+        金蝶状态: item.kingdeePushStatusName,
+        失败原因: item.kingdeePushMsg,
       }));
       const workbook = XLSX.utils.book_new();
       XLSX.utils.book_append_sheet(workbook, XLSX.utils.json_to_sheet(exportRows), '收票登记');