diff --git a/src/option/settlement/formalSettlementTable.js b/src/option/settlement/formalSettlementTable.js index 390c4e1..dececd2 100644 --- a/src/option/settlement/formalSettlementTable.js +++ b/src/option/settlement/formalSettlementTable.js @@ -19,6 +19,8 @@ export const formalSettlementTableColumns = [ { label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true }, { label: '当前节点', prop: 'currentNode', minWidth: 130 }, { label: '当前处理人', prop: 'currentProcessor', minWidth: 130 }, + { label: '调整标识', prop: 'adjustFlag', minWidth: 110 }, + { label: '来源原单号', prop: 'originFormalSettlementNo', minWidth: 170 }, { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 }, { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 }, { label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 }, diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue index 930e2a1..3807f0c 100644 --- a/src/views/settlement/components/formal-settlement-editor.vue +++ b/src/views/settlement/components/formal-settlement-editor.vue @@ -639,6 +639,22 @@ + + + @@ -1048,6 +1064,7 @@ import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/m import ProjectAdvanceWriteOff from './project-advance-write-off.vue'; import * as XLSX from 'xlsx'; import { isAdministrator } from '@/utils/auth'; +import * as settlementAdjustmentApi from '@/api/settlement/settlementAdjustment'; // 结算币种为本位币(人民币)时汇率恒为1,汇率日期、结算汇率与按汇率换算的本位币合计都不展示 const LOCAL_CURRENCY_HIDDEN_FIELDS = ['exchangeRateDate', 'exchangeRate', 'localSettlementAmount']; @@ -1316,6 +1333,17 @@ export default { hasPermission(code) { return this.isAdmin || this.validData(this.permission?.[code], false); }, + async handleAdjustmentRepush(row) { + await this.$confirm( + '请确认金蝶旧应付/应收单已由财务手工冲销,继续将生成全新财务应付/应收单。', + '高危操作确认', + { type: 'warning', confirmButtonText: '确认重新推送' } + ); + const res = await settlementAdjustmentApi.repush(row.id); + this.$message.success(`已生成新金蝶单据:${res.data?.data || res.data || '-'}`); + await this.loadFormalDetail(this.recordId); + this.$emit('success'); + }, async loadFormalDetail(id) { const response = this.publicMode ? await getMkPublicDetail('formal-settlement', id) diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue index 9108e5c..80ed458 100644 --- a/src/views/settlement/components/formal-settlement-table-panel.vue +++ b/src/views/settlement/components/formal-settlement-table-panel.vue @@ -92,6 +92,7 @@ {{ kingdeeSyncName(row.kingdeeSyncStatus) }} + {{ adjustFlag(row) }}