feat: 已推送金蝶的认领隐藏作废按钮

- 行按钮推送金蝶（receipt_flow_push 权限，认领完成且未推送可点），成功提示金蝶收款单号
- 列表/详情展示推送状态、推送失败原因、金蝶收款单号与金蝶状态，留痕表含推送记录
- 认领表单/批量认领上限校验切公告未认领金额口径，新增剩余可认领金额展示

src/api/payment/receiptClaimRecord.js

@@ -16,6 +16,12 @@ export const claimStatusOptions = [
   { label: '已作废', value: 'voided' },
 ];
 
+export const pushStatusOptions = [
+  { label: '未推送', value: 'none' },
+  { label: '已推送', value: 'pushed' },
+  { label: '推送失败', value: 'failed' },
+];
+
 export const kingdeeBillStatusOptions = [
   { label: '未生成', value: 'none' },
   { label: '已推送', value: 'pushed' },

src/api/payment/receiptFlow.js

@@ -13,9 +13,24 @@ export const getSettlementCandidates = (keyword, flowId) =>
   });
 export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
 export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' });
+export const pushKingdee = flowId =>
+  request({ url: `${baseUrl}/push-kingdee`, method: 'post', params: { flowId } });
 
 export const claimStatusOptions = [
   { label: '未认领', value: 'unclaimed' },
   { label: '部分认领', value: 'partial' },
   { label: '认领完成', value: 'claimed' },
 ];
+
+export const pushStatusOptions = [
+  { label: '未推送', value: 'none' },
+  { label: '已推送', value: 'pushed' },
+  { label: '推送失败', value: 'failed' },
+];
+
+export const kingdeeBillStatusOptions = [
+  { label: '已推送', value: 'pushed' },
+  { label: '审核通过', value: 'approved' },
+  { label: '已收款', value: 'received' },
+  { label: '处理失败', value: 'failed' },
+];

src/option/payment/receiptFlow.js

@@ -10,4 +10,9 @@ export const receiptFlowTableColumns = [
   { prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },
   { prop: 'kingdeeClaimStatusName', label: '公告状态', minWidth: 110 },
   { prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
+  { prop: 'unclaimedAmount', label: '金蝶未认领金额', minWidth: 140, money: true },
+  { prop: 'pushStatusName', label: '推送状态', minWidth: 110, status: true },
+  { prop: 'pushFailReason', label: '推送失败原因', minWidth: 160 },
+  { prop: 'kingdeeBillNo', label: '金蝶收款单号', minWidth: 150 },
+  { prop: 'kingdeeBillStatusName', label: '金蝶状态', minWidth: 110 },
 ];

src/views/payment/receipt-claim-record.vue

@@ -56,6 +56,16 @@
           <el-form-item v-show="searchExpanded" label="所属组织">
             <el-input v-model="query.claimerDeptName" clearable placeholder="请输入" />
           </el-form-item>
+          <el-form-item v-show="searchExpanded" label="推送状态">
+            <el-select v-model="query.pushStatus" clearable placeholder="请选择">
+              <el-option
+                v-for="item in pushStatusOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item v-show="searchExpanded" label="金蝶单据状态">
             <el-select v-model="query.kingdeeBillStatus" clearable placeholder="请选择">
               <el-option
@@ -112,7 +122,11 @@
         <el-table-column label="操作" width="120" fixed="right" align="center">
           <template #default="{ row }">
             <el-link
-              v-if="hasPermission('receipt_claim_record_void') && row.claimStatus === 'claimed'"
+              v-if="
+                hasPermission('receipt_claim_record_void') &&
+                  row.claimStatus === 'claimed' &&
+                  row.pushStatus !== 'pushed'
+              "
               type="danger"
               @click="handleVoid(row)"
               >作废</el-link
@@ -156,6 +170,7 @@ const emptyQuery = () => ({
   claimDateRange: [],
   claimerDeptName: '',
   kingdeeBillStatus: '',
+  pushStatus: '',
 });
 
 export default {
@@ -169,6 +184,7 @@ export default {
       searchExpanded: false,
       claimStatusOptions: api.claimStatusOptions,
       kingdeeBillStatusOptions: api.kingdeeBillStatusOptions,
+      pushStatusOptions: api.pushStatusOptions,
       columns: receiptClaimRecordTableColumns,
       rows: [],
       loading: false,
@@ -190,8 +206,9 @@ export default {
   },
   methods: {
     unwrapData(response) {
-      const body = response?.data || response || {};
-      return body?.data || body;
+      // 数字 0 是合法返回值（如回写/同步 0 条），须用 ?? 判空避免 0 被信封对象顶掉导致 Number() 得 NaN
+      const body = response?.data ?? response ?? {};
+      return body?.data ?? body;
     },
     queryParams() {
       const transactionRange = this.query.transactionDateRange || [];
@@ -235,12 +252,12 @@ export default {
     },
     async handleVoid(row) {
       await this.$confirm(
-        '作废后将回退本次认领金额，并生成审核通过状态的金蝶认领冲单，是否继续？',
+        '作废后将回退本次认领金额，是否继续？',
         '作废认领记录',
         { type: 'warning', confirmButtonText: '确定', cancelButtonText: '取消' }
       );
-      const kingdeeBillNo = this.unwrapData(await api.voidClaim(row.id));
-      this.$message.success(`作废成功，金蝶冲单号：${kingdeeBillNo}`);
+      await api.voidClaim(row.id);
+      this.$message.success('作废成功');
       await this.loadTable();
     },
     async handleRefreshKingdeeResult() {

src/views/payment/receipt-flow-batch-form.vue

@@ -43,6 +43,9 @@
           <el-table-column label="已认领金额" min-width="130" align="right">
             <template #default="{ row }">{{ formatMoney(row.claimedAmount) }}</template>
           </el-table-column>
+          <el-table-column label="金蝶未认领金额" min-width="140" align="right">
+            <template #default="{ row }">{{ formatMoney(row.unclaimedAmount) }}</template>
+          </el-table-column>
           <el-table-column prop="summary" label="摘要" min-width="180" show-overflow-tooltip />
         </el-table>
         <el-row :gutter="32" class="receipt-claim-batch-form-page__claim-info">
@@ -336,11 +339,11 @@ export default {
       for (const flow of this.flows) {
         const total = this.flowAllocatedTotal(flow.id);
         const remaining = Math.max(
-          Number(flow.receiptAmount || 0) - Number(flow.claimedAmount || 0),
+          Number(flow.unclaimedAmount || 0) - Number(flow.claimedAmount || 0),
           0
         );
         if (total > remaining + 0.001) {
-          this.$message.warning(`流水${flow.receiptNoticeNo}的分摊金额不能超过剩余可认领金额`);
+          this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过公告未认领金额`);
           return;
         }
       }

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

@@ -47,6 +47,14 @@
             ><el-form-item label="已认领金额"
               ><el-input :model-value="formatMoney(form.claimedAmount)" disabled /></el-form-item
           ></el-col>
+          <el-col :span="6"
+            ><el-form-item label="金蝶未认领金额"
+              ><el-input :model-value="formatMoney(form.unclaimedAmount)" disabled /></el-form-item
+          ></el-col>
+          <el-col :span="6"
+            ><el-form-item label="剩余可认领金额"
+              ><el-input :model-value="formatMoney(claimableAmount)" disabled /></el-form-item
+          ></el-col>
           <el-col :span="6"
             ><el-form-item label="摘要"><el-input v-model="form.summary" disabled /></el-form-item
           ></el-col>
@@ -197,6 +205,7 @@ const emptyForm = () => ({
   transactionTime: '',
   detailSerialNo: '',
   claimedAmount: 0,
+  unclaimedAmount: 0,
   claimerName: '',
   claimerDeptName: '',
   claimDate: '',
@@ -242,6 +251,12 @@ export default {
         0
       );
     },
+    claimableAmount() {
+      return Math.max(
+        Number(this.form.unclaimedAmount || 0) - Number(this.form.claimedAmount || 0),
+        0
+      );
+    },
   },
   created() {
     if (!this.batchMode) this.initialize();
@@ -331,8 +346,8 @@ export default {
         this.$message.warning('分摊收款金额必须大于0');
         return;
       }
-      if (this.allocatedTotal > amount - Number(this.form.claimedAmount || 0) + 0.001) {
-        this.$message.warning('本次分摊金额不能超过流水剩余可认领金额');
+      if (this.allocatedTotal > this.claimableAmount + 0.001) {
+        this.$message.warning('累计认领金额不能超过公告未认领金额（剩余可认领金额）');
         return;
       }
       for (const row of this.form.settlements)

src/views/payment/receipt-flow.vue

@@ -9,16 +9,20 @@
           <el-form-item label="对方户名">
             <el-input v-model="query.counterpartyName" clearable placeholder="请输入" />
           </el-form-item>
-          <el-form-item label="对方开户行">
-            <el-input v-model="query.counterpartyBank" clearable placeholder="请输入" />
-          </el-form-item>
           <el-form-item label="对方账号">
             <el-input v-model="query.counterpartyAccount" clearable placeholder="请输入" />
           </el-form-item>
-          <el-form-item v-show="searchExpanded" label="摘要">
-            <el-input v-model="query.summary" clearable placeholder="请输入" />
+          <el-form-item label="推送状态">
+            <el-select v-model="query.pushStatus" clearable placeholder="请选择">
+              <el-option
+                v-for="item in pushStatusOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
-          <el-form-item v-show="searchExpanded" label="认领状态">
+          <el-form-item label="认领状态">
             <el-select v-model="query.claimStatus" clearable placeholder="请选择">
               <el-option
                 v-for="item in claimStatusOptions"
@@ -28,7 +32,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item v-show="searchExpanded" label="交易时间">
+          <el-form-item label="交易时间">
             <el-date-picker
               v-model="query.transactionTimeRange"
               type="datetimerange"
@@ -39,13 +43,54 @@
               clearable
             />
           </el-form-item>
+          <el-form-item v-show="searchExpanded" label="对方开户行">
+            <el-input v-model="query.counterpartyBank" clearable placeholder="请输入" />
+          </el-form-item>
+          <el-form-item v-show="searchExpanded" label="摘要">
+            <el-input v-model="query.summary" clearable placeholder="请输入" />
+          </el-form-item>
+          <el-form-item v-show="searchExpanded" label="明细流水号">
+            <el-input v-model="query.detailSerialNo" clearable placeholder="请输入" />
+          </el-form-item>
+          <el-form-item v-show="searchExpanded" label="金蝶状态">
+            <el-select v-model="query.kingdeeBillStatus" clearable placeholder="请选择">
+              <el-option
+                v-for="item in kingdeeBillStatusOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-show="searchExpanded" label="收款金额">
+            <div class="amount-range">
+              <el-input-number
+                v-model="query.receiptAmountStart"
+                :controls="false"
+                :min="0"
+                placeholder="最低金额"
+              />
+              <span>~</span>
+              <el-input-number
+                v-model="query.receiptAmountEnd"
+                :controls="false"
+                :min="0"
+                placeholder="最高金额"
+              />
+            </div>
+          </el-form-item>
+          <el-form-item v-show="searchExpanded" label="认领人">
+            <el-input v-model="query.claimerName" clearable placeholder="请输入" />
+          </el-form-item>
         </div>
         <div class="receipt-flow-page__search-actions">
-          <el-button @click="searchExpanded = !searchExpanded">
-            {{ searchExpanded ? '折叠' : '展开' }}
-          </el-button>
           <el-button type="primary" @click="handleSearch">查询</el-button>
           <el-button @click="resetSearch">重置</el-button>
+          <el-tooltip :content="searchExpanded ? '折叠' : '展开'" placement="top">
+            <el-button text @click="searchExpanded = !searchExpanded">
+              <el-icon><component :is="searchExpanded ? ArrowUp : ArrowDown" /></el-icon>
+            </el-button>
+          </el-tooltip>
         </div>
       </el-form>
     </section>
@@ -90,7 +135,7 @@
             </el-link>
             <el-tag
               v-else-if="column.status"
-              :type="statusType(row.claimStatus)"
+              :type="statusType(row, column)"
               class="status-text"
             >
               {{ displayValue(row[column.prop]) }}
@@ -99,10 +144,23 @@
             <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="170" fixed="right" align="center">
           <template #default="{ row }">
-            <el-link v-if="canClaim(row)" type="primary" @click="openClaim(row)">认领</el-link>
-            <span v-else>-</span>
+            <el-link
+              v-if="canClaim(row)"
+              type="primary"
+              :disabled="pushingId === row.id"
+              @click="openClaim(row)"
+              >认领</el-link
+            >
+            <el-link
+              v-if="canPush(row)"
+              type="warning"
+              :disabled="pushingId === row.id"
+              @click="handlePush(row)"
+              >推送金蝶</el-link
+            >
+            <span v-if="!canClaim(row) && !canPush(row)">-</span>
           </template>
         </el-table-column>
       </el-table>
@@ -153,7 +211,7 @@
             {{ displayValue(detailDialog.data.detailSerialNo) }}
           </el-descriptions-item>
           <el-descriptions-item label="认领状态">
-            <el-tag :type="statusType(detailDialog.data.claimStatus)">
+            <el-tag :type="statusType(detailDialog.data, { prop: 'claimStatusName' })">
               {{ displayValue(detailDialog.data.claimStatusName) }}
             </el-tag>
           </el-descriptions-item>
@@ -163,6 +221,23 @@
           <el-descriptions-item label="剩余可认领金额">
             {{ formatMoney(detailDialog.data.remainingAmount) }}
           </el-descriptions-item>
+          <el-descriptions-item label="金蝶未认领金额">
+            {{ formatMoney(detailDialog.data.unclaimedAmount) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="推送状态">
+            <el-tag :type="statusType(detailDialog.data, { prop: 'pushStatusName' })">
+              {{ displayValue(detailDialog.data.pushStatusName) }}
+            </el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="金蝶收款单号">
+            {{ displayValue(detailDialog.data.kingdeeBillNo) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="金蝶状态">
+            {{ displayValue(detailDialog.data.kingdeeBillStatusName) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="推送失败原因">
+            {{ displayValue(detailDialog.data.pushFailReason) }}
+          </el-descriptions-item>
           <el-descriptions-item label="摘要">
             {{ displayValue(detailDialog.data.summary) }}
           </el-descriptions-item>
@@ -177,7 +252,9 @@
           </el-table-column>
           <el-table-column prop="operatorName" label="认领人" min-width="120" align="center" />
           <el-table-column label="状态变化" min-width="170" align="center">
-            <template #default="{ row }">{{ claimStatusChange(row) }}</template>
+            <template #default="{ row }">
+              {{ row.actionType === 'push' ? row.actionName : claimStatusChange(row) }}
+            </template>
           </el-table-column>
           <el-table-column prop="content" label="认领说明" min-width="220" />
         </el-table>
@@ -190,6 +267,7 @@
 </template>
 
 <script>
+import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/receiptFlow';
 import { receiptFlowTableColumns } from '@/option/payment/receiptFlow';
@@ -200,7 +278,13 @@ const emptyQuery = () => ({
   counterpartyBank: '',
   counterpartyAccount: '',
   summary: '',
+  detailSerialNo: '',
   claimStatus: '',
+  pushStatus: '',
+  kingdeeBillStatus: '',
+  receiptAmountStart: undefined,
+  receiptAmountEnd: undefined,
+  claimerName: '',
   transactionTimeRange: [],
 });
 
@@ -208,13 +292,18 @@ export default {
   name: 'ReceiptFlow',
   data() {
     return {
+      ArrowDown,
+      ArrowUp,
       query: emptyQuery(),
       claimStatusOptions: api.claimStatusOptions,
+      pushStatusOptions: api.pushStatusOptions,
+      kingdeeBillStatusOptions: api.kingdeeBillStatusOptions,
       columns: receiptFlowTableColumns,
       rows: [],
       selectedRows: [],
       loading: false,
       syncing: false,
+      pushingId: null,
       searchExpanded: false,
       page: { current: 1, size: 10, total: 0 },
       detailDialog: { visible: false, loading: false, data: {}, claimRecords: [] },
@@ -234,8 +323,9 @@ export default {
   },
   methods: {
     unwrapData(response) {
-      const body = response?.data || response || {};
-      return body?.data || body;
+      // 数字 0 是合法返回值（如回写/同步 0 条），须用 ?? 判空避免 0 被信封对象顶掉导致 Number() 得 NaN
+      const body = response?.data ?? response ?? {};
+      return body?.data ?? body;
     },
     async loadTable() {
       this.loading = true;
@@ -331,8 +421,41 @@ export default {
     canClaim(row) {
       return this.hasPermission('receipt_flow_claim') && Number(row.remainingAmount || 0) > 0;
     },
-    statusType(status) {
-      return { claimed: 'success', partial: 'warning', unclaimed: 'info' }[status] || '';
+    canPush(row) {
+      return (
+        this.hasPermission('receipt_flow_push') &&
+        !!row.billId &&
+        row.claimStatus === 'claimed' &&
+        row.pushStatus !== 'pushed'
+      );
+    },
+    async handlePush(row) {
+      try {
+        await this.$confirm(
+          `确认将流水【${row.receiptNoticeNo || row.detailSerialNo || ''}】推送金蝶生成收款单？`,
+          '推送金蝶',
+          { type: 'warning' }
+        );
+      } catch {
+        return;
+      }
+      this.pushingId = row.id;
+      try {
+        const data = this.unwrapData(await api.pushKingdee(row.id));
+        const billNo = data?.kingdeeBillNo;
+        this.$message.success(billNo ? `推送成功，金蝶收款单号：${billNo}` : '推送成功');
+        await this.loadTable();
+      } finally {
+        this.pushingId = null;
+      }
+    },
+    statusType(row, column) {
+      if (column?.prop === 'pushStatusName') {
+        return { pushed: 'success', failed: 'danger' }[row.pushStatus] || 'info';
+      }
+      return (
+        { claimed: 'success', partial: 'warning', unclaimed: 'info' }[row.claimStatus] || ''
+      );
     },
     claimStatusChange(row) {
       const label = status =>
@@ -365,7 +488,14 @@ export default {
 }
 .receipt-flow-page__search :deep(.el-input),
 .receipt-flow-page__search :deep(.el-select),
-.receipt-flow-page__search :deep(.el-date-editor) {
+.receipt-flow-page__search :deep(.el-date-editor),
+.receipt-flow-page__search :deep(.el-input-number) {
+  width: 100%;
+}
+.receipt-flow-page__search .amount-range {
+  display: flex;
+  align-items: center;
+  gap: 4px;
   width: 100%;
 }
 .receipt-flow-page__search-actions {
@@ -395,6 +525,9 @@ export default {
 .receipt-flow-page :deep(.el-table) {
   --el-table-border-color: #eff1f7;
 }
+.receipt-flow-page :deep(.el-table .cell .el-link + .el-link) {
+  margin-left: 12px;
+}
 .receipt-flow-page :deep(.el-table__row:nth-child(even) > td.el-table__cell) {
   background: #fafafa;
 }