From 1a143aa05b2278d27381aa4575f8e6e06b36dd53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Sat, 31 Oct 2026 16:07:04 +0800 Subject: [PATCH 01/21] =?UTF-8?q?fix:=20=E5=90=88=E5=90=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=88=A0=E9=99=A4hcsRepush=E9=87=8D=E5=A4=8D=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/contract-manage.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue index d11d3ec..554dbfe 100644 --- a/src/views/business/contract-manage.vue +++ b/src/views/business/contract-manage.vue @@ -1122,7 +1122,6 @@ import { repush as hcsRepush, repushBatch as hcsRepushBatch, } from '@/api/business/hcs'; -import { repush as hcsRepush, repushBatch as hcsRepushBatch, getRisk } from '@/api/business/hcs'; import { isContractBlack, isRiskyTag, resolveRiskTagName } from '@/utils/risk-display'; import { Position } from '@element-plus/icons-vue'; import { getMkPublicDetail } from '@/api/mk-process'; -- 2.52.0 From 441d62a874cb594e2d16437ed4ecc99ec8aee9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Sat, 31 Oct 2026 16:07:04 +0800 Subject: [PATCH 02/21] =?UTF-8?q?feat:=20=E6=94=B6=E7=A5=A8=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E5=85=88=E7=A5=A8=E5=90=8E=E6=AC=BE=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=94=B9=E9=80=A0=EF=BC=88=E6=89=8B=E9=80=89=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E7=BB=84=E7=BB=87/=E5=8F=91=E7=A5=A8=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=8C=BA=E5=9D=97/=E5=8E=BB=E5=85=B3=E8=81=94=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E5=8D=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/payment/invoiceReceipt.js | 6 + src/views/payment/invoice-receipt-form.vue | 343 ++++++++------------- 2 files changed, 127 insertions(+), 222 deletions(-) diff --git a/src/api/payment/invoiceReceipt.js b/src/api/payment/invoiceReceipt.js index 8db2dfb..79d2fab 100644 --- a/src/api/payment/invoiceReceipt.js +++ b/src/api/payment/invoiceReceipt.js @@ -38,6 +38,12 @@ export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'p export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data }); export const pushKingdee = ids => request({ url: `${baseUrl}/push-kingdee`, method: 'post', timeout: 30000, data: 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 approvalStatusOptions = [ { label: '草稿', value: 'draft' }, diff --git a/src/views/payment/invoice-receipt-form.vue b/src/views/payment/invoice-receipt-form.vue index b798e98..53ae453 100644 --- a/src/views/payment/invoice-receipt-form.vue +++ b/src/views/payment/invoice-receipt-form.vue @@ -109,34 +109,50 @@ - - -
- - - -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + @@ -216,71 +223,6 @@ :query-api="apiQueryInvoicePool" @confirm="handleInvoicePicked" /> - - -
- - 查询 -
- - - - - - - - - - - - - - - - - - - - @@ -288,6 +230,7 @@ import { Search } from '@element-plus/icons-vue'; import { mapGetters } from 'vuex'; import * as api from '@/api/payment/invoiceReceipt'; +import { getDeptTree } from '@/api/system/dept'; import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue'; import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue'; import { getMkPublicDetail } from '@/api/mk-process'; @@ -310,6 +253,7 @@ const emptyForm = () => ({ customerEmails: [], departmentEmails: [], projectName: '', + deptId: null, deptName: '', payerName: '', payeeName: '', @@ -330,26 +274,24 @@ export default { form: emptyForm(), customerEmailOptions: [], departmentEmailOptions: [], + invoiceItems: [], + deptTreeOptions: [], + deptMap: new Map(), + // 结算组织=合同承办部门：部门树级联单选（取末级 id），后端沿部门树上溯平台公司取金蝶组织 + deptCascaderProps: { checkStrictly: true, emitPath: true }, invoiceDialog: { visible: false, }, - settlementDialog: { - visible: false, - loading: false, - keyword: '', - rows: [], - selection: [], - }, rules: { invoiceNo: [{ required: true, validator: this.validateInvoice, trigger: 'change' }], - settlementIds: [{ required: true, validator: this.validateSettlements, trigger: 'change' }], + deptId: [{ required: true, validator: this.validateDept, trigger: 'change' }], customerEmails: [{ validator: this.validateEmails, trigger: 'change' }], departmentEmails: [{ validator: this.validateEmails, trigger: 'change' }], }, }; }, computed: { - ...mapGetters(['permission']), + ...mapGetters(['permission', 'userInfo']), recordId() { return this.$route.query.id || ''; }, @@ -363,14 +305,11 @@ export default { const code = this.recordId ? 'invoice_receipt_edit' : 'invoice_receipt_add'; return this.hasPermission(code); }, - settlementLabel() { - return this.form.settlements - .map(item => item.formalSettlementNo) - .filter(Boolean) - .join(','); - }, - settlementIds() { - return this.form.settlements.map(item => item.formalSettlementId || item.settlementId); + deptCascaderValue() { + if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') { + return []; + } + return [String(this.form.deptId)]; }, }, created() { @@ -406,6 +345,7 @@ export default { .filter(Boolean); }, async initialize() { + this.loadDepartments(); if (this.isPublicViewPage) { await this.loadPublicDetail(); return; @@ -419,14 +359,13 @@ export default { } const data = this.unwrapData(await api.getDetail(this.recordId)); this.applyDetail(data); - if (this.settlementIds.length) await this.loadReferenceInformation(); }, async loadPublicDetail() { if (!this.recordId) return; const data = this.unwrapData(await getMkPublicDetail('invoice-receipt', this.recordId)); this.applyDetail(data); }, - applyDetail(data) { + async applyDetail(data) { this.form = { ...emptyForm(), ...data, @@ -438,6 +377,7 @@ export default { })), attachments: this.parse(data.attachmentsJson), }; + await this.loadInvoiceDetail(); }, validateInvoice(rule, value, callback) { if (!value) { @@ -446,9 +386,9 @@ export default { } callback(); }, - validateSettlements(rule, value, callback) { - if (!this.form.settlements.length) { - callback(new Error('请选择应付正式结算单')); + validateDept(rule, value, callback) { + if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') { + callback(new Error('请选择结算组织')); return; } callback(); @@ -469,7 +409,7 @@ export default { openInvoiceDialog() { this.invoiceDialog.visible = true; }, - confirmInvoice(row, options = {}) { + async confirmInvoice(row, options = {}) { const selected = row; if (!selected) { this.$message.warning('请选择一张金蝶票据池发票'); @@ -504,92 +444,63 @@ export default { ...new Set([...this.departmentEmailOptions, ...this.form.departmentEmails]), ]; this.invoiceDialog.visible = false; + await this.loadInvoiceDetail(); this.$refs.formRef?.validateField('invoiceNo').catch(() => {}); return true; }, - async openSettlementDialog() { - this.settlementDialog.visible = true; - this.settlementDialog.selection = []; - await this.loadSettlementCandidates(); - await this.$nextTick(); - const selectedIds = new Set(this.settlementIds.map(id => String(id))); - this.settlementDialog.rows.forEach(row => { - if (selectedIds.has(String(row.id))) { - this.$refs.settlementTable?.toggleRowSelection(row, true); - } - }); - }, - async loadSettlementCandidates() { - this.settlementDialog.loading = true; + // 发票明细区块：按票号带出金蝶发票明细行（A801-1 镜像，推送 A303-2 分录同源） + async loadInvoiceDetail() { + if (!this.form.invoiceNo) { + this.invoiceItems = []; + return; + } try { - this.settlementDialog.rows = - this.unwrapData( - await api.getSettlementCandidates(this.settlementDialog.keyword, this.form.id) - ) || []; - } finally { - this.settlementDialog.loading = false; + this.invoiceItems = this.unwrapData(await api.invoiceDetailQuery(this.form.invoiceNo)) || []; + } catch { + this.invoiceItems = []; } }, - async confirmSettlements() { - const rows = this.settlementDialog.selection; - if (!rows.length) { - this.$message.warning('请至少选择一张应付正式结算单'); - return; - } - const first = rows[0]; - const incompatible = rows.some( - item => - String(item.projectId) !== String(first.projectId) || - String(item.deptId) !== String(first.deptId) || - item.payerName !== first.payerName || - item.payeeName !== first.payeeName - ); - if (incompatible) { - this.$message.warning('关联结算单必须属于同一项目、组织及收付款方'); - return; - } - const previousAmount = new Map( - this.form.settlements.map(item => [ - String(item.formalSettlementId || item.settlementId), - item.allocatedInvoiceAmount, - ]) - ); - this.form.settlements = rows.map(item => ({ - ...item, - formalSettlementId: item.id, - settlementId: item.id, - allocatedInvoiceAmount: previousAmount.has(String(item.id)) - ? Number(previousAmount.get(String(item.id)) || 0) - : rows.length === 1 - ? Number(item.settlementAmount || 0) - : 0, + loadDepartments() { + // 结算组织取租户部门树（过滤外部组织），选中取末级部门 id + getDeptTree(this.userInfo?.tenantId) + .then(response => { + const rows = this.excludeExternalOrganization(this.unwrapData(response) || []); + this.deptTreeOptions = this.toDeptCascaderOptions(rows); + this.deptMap = new Map(); + this.flattenDepartments(rows).forEach(item => + this.deptMap.set(String(item.id), item.title || item.deptName || item.name) + ); + }) + .catch(() => {}); + }, + excludeExternalOrganization(list = []) { + return list.reduce((result, item) => { + const deptName = item.title || item.deptName || item.name; + if (String(deptName || '').trim() === '外部组织') return result; + result.push({ + ...item, + children: item.children?.length + ? this.excludeExternalOrganization(item.children) + : item.children, + }); + return result; + }, []); + }, + toDeptCascaderOptions(list = []) { + return list.map(item => ({ + label: item.title || item.deptName || item.name, + value: item.id == null || item.id === '' ? '' : String(item.id), + children: item.children?.length ? this.toDeptCascaderOptions(item.children) : undefined, })); - this.form.projectName = first.projectName; - this.form.deptName = first.deptName; - this.form.payerName = first.payerName; - this.form.payeeName = first.payeeName; - this.settlementDialog.visible = false; - await this.loadReferenceInformation(); - this.$refs.formRef?.validateField('settlementIds').catch(() => {}); }, - selectSettlement(row) { - this.$refs.settlementTable?.toggleRowSelection(row); + flattenDepartments(rows) { + return (rows || []).flatMap(item => [item, ...this.flattenDepartments(item.children || [])]); }, - async loadReferenceInformation() { - const data = this.unwrapData(await api.getReferenceInformation(this.settlementIds.join(','))); - this.customerEmailOptions = data.customerEmails || []; - this.departmentEmailOptions = [ - ...new Set([...this.departmentEmailOptions, ...(data.departmentEmails || [])]), - ]; - if (!this.form.customerEmails.length && this.customerEmailOptions.length) { - this.form.customerEmails = [this.customerEmailOptions[0]]; - } - }, - remainingAmount(row) { - return Math.max( - Number(row.settlementAmount || 0) - Number(row.receivedInvoiceAmount || 0), - 0 - ); + handleDeptChange(value) { + const deptId = Array.isArray(value) ? value.at(-1) : value; + this.form.deptId = deptId || null; + this.form.deptName = deptId ? this.deptMap.get(String(deptId)) || '' : ''; + this.$refs.formRef?.validateField('deptId').catch(() => {}); }, openSettlementDetail(row) { const id = row.formalSettlementId || row.settlementId || row.id; @@ -602,15 +513,6 @@ export default { validateBusiness() { const invoiceAmount = Number(this.form.invoiceAmount || 0); if (invoiceAmount <= 0) throw new Error('开票金额必须大于0'); - for (const row of this.form.settlements) { - const allocated = Number(row.allocatedInvoiceAmount); - if (!Number.isFinite(allocated) || allocated < 0) { - throw new Error('分摊发票金额必须大于或等于0'); - } - if (allocated - this.remainingAmount(row) > 0.001) { - throw new Error(`结算单${row.formalSettlementNo}的累计收票金额不能超过结算总金额`); - } - } }, payload() { return { @@ -631,10 +533,9 @@ export default { departmentEmails: this.form.departmentEmails.join(';'), attachmentsJson: JSON.stringify(this.form.attachments || []), remark: this.form.remark, - settlements: this.form.settlements.map(item => ({ - settlementId: item.formalSettlementId || item.settlementId, - allocatedInvoiceAmount: item.allocatedInvoiceAmount, - })), + // 结算组织=页面手选部门（先票后款不挂结算单，认领关系由结算单侧维护，不再传 settlements） + deptId: this.form.deptId, + deptName: this.form.deptName, }; }, async saveDraft() { @@ -678,8 +579,7 @@ export default { this.$message.warning('金蝶票池未查询到该发票'); return; } - if (!this.confirmInvoice(invoice, { preserveUserInput: true })) return; - if (this.settlementIds.length) await this.loadReferenceInformation(); + if (!(await this.confirmInvoice(invoice, { preserveUserInput: true }))) return; this.$message.success('同步成功'); }, goBack() { @@ -688,6 +588,14 @@ export default { formatMoney(value) { return Number(value || 0).toFixed(2); }, + formatQuantity(value) { + const number = Number(value); + return Number.isFinite(number) ? String(number) : '-'; + }, + formatRateText(value) { + if (value === null || value === undefined || value === '') return '-'; + return `${value}%`; + }, formatRate(value) { return value === null || value === undefined || value === '' ? '' : `${Number(value)}%`; }, @@ -738,15 +646,6 @@ export default { :global(.avue-layout--horizontal .receipt-form-page__actions) { left: 0; } -.receipt-form-page__dialog-search { - display: flex; - justify-content: flex-end; - gap: 8px; - margin-bottom: 12px; -} -.receipt-form-page__dialog-search .el-input { - width: 360px; -} .receipt-form-page :deep(.el-table) { --el-table-border-color: #eff1f7; } -- 2.52.0 From 46e7952e4943eb50339cbe99f7b5900ed31110e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Sat, 31 Oct 2026 16:07:12 +0800 Subject: [PATCH 03/21] =?UTF-8?q?feat:=20=E4=BB=98=E6=AC=BE=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E5=8D=95=E9=80=89=E6=94=B6=E7=A5=A8=E5=8D=95=E5=85=A8?= =?UTF-8?q?=E9=A2=9D=E8=AE=A4=E9=A2=86=E5=B9=B6=E6=96=B0=E5=A2=9E=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=99=BB=E8=AE=B0=E6=8E=A8=E9=80=81=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E5=BA=94=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/settlement/formalSettlement.js | 8 + .../components/formal-settlement-editor.vue | 63 +++++++- .../formal-settlement-table-panel.vue | 7 + .../invoice-receipt-candidates-dialog.vue | 150 ++++++++++++++++++ src/views/settlement/formal-settlement.vue | 141 +++++++++++++++- 5 files changed, 359 insertions(+), 10 deletions(-) create mode 100644 src/views/settlement/components/invoice-receipt-candidates-dialog.vue diff --git a/src/api/settlement/formalSettlement.js b/src/api/settlement/formalSettlement.js index 2d980d4..032e253 100644 --- a/src/api/settlement/formalSettlement.js +++ b/src/api/settlement/formalSettlement.js @@ -58,5 +58,13 @@ export const applyPayments = data => request({ url: `${baseUrl}/apply-payments`, method: 'post', data }); export const claimInvoices = data => request({ url: `${baseUrl}/claim-invoices`, method: 'post', data }); +// 先票后款：发票登记确认推送（认领收票单逐单 A302-6 指定应付），涉及多次金蝶远程调用，覆盖全局超时 +export const invoiceAssignKingdee = id => + request({ + url: `${baseUrl}/invoice-assign-kingdee`, + method: 'post', + timeout: 30000, + params: { id }, + }); export const queryInvoicePool = params => request({ url: `${baseUrl}/invoice-pool`, method: 'get', params }); diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue index 7455abb..2589487 100644 --- a/src/views/settlement/components/formal-settlement-editor.vue +++ b/src/views/settlement/components/formal-settlement-editor.vue @@ -440,8 +440,15 @@ /> -
- 认领查询 +
+ + 选择收票单 + 认领查询
@@ -452,11 +459,6 @@ - - - + + + + + + + {{ invoiceRegisterDialog.row.formalSettlementNo || '-' }} + + + {{ formatMoney(invoiceRegisterDialog.row.settlementAmount, invoiceRegisterDialog.row.currency) }} + + + {{ formatMoney(invoiceRegisterDialog.row.invoiceAmount, invoiceRegisterDialog.row.currency) }} + + + {{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }} + + + + + 选择收票单 + + + + + + + + + + + + + + + + + + + + + @@ -113,16 +186,17 @@ 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 { formalSettlementOption } from '@/option/settlement/formalSettlement'; +import { formalSettlementOption, kingdeeSyncName } from '@/option/settlement/formalSettlement'; import organizationSearch from '@/mixins/organization-search'; import FormalSettlementEditor from './components/formal-settlement-editor.vue'; import FormalSettlementTablePanel from './components/formal-settlement-table-panel.vue'; +import InvoiceReceiptCandidatesDialog from './components/invoice-receipt-candidates-dialog.vue'; import { submitMkApprovalFlow, loadMkEnabled } from '@/utils/mk-approval'; import { getMKApprovalUrl } from '@/api/system/business-process'; export default { name: 'FormalSettlement', - components: { FormalSettlementEditor, FormalSettlementTablePanel }, + components: { FormalSettlementEditor, FormalSettlementTablePanel, InvoiceReceiptCandidatesDialog }, mixins: [organizationSearch], props: { /** 菜单拆分后锁定结算类型：payable=付款结算单，receivable=收款结算单 */ @@ -151,6 +225,16 @@ export default { rows: [], form: { appliedAmount: 0, remark: '' }, }, + // 先票后款路径B：发票登记（关联收票单 + 确认推送指定应付） + invoiceRegisterDialog: { + visible: false, + saving: false, + row: {}, + candidates: [], + }, + candidatesDialog: { + visible: false, + }, mkEnabled: false, // keep-alive 多标签下仅激活实例响应 detailNo，避免缓存页重复弹窗 isPageActive: true, @@ -297,6 +381,7 @@ export default { return: () => this.handleReturn(row), void: () => this.handleVoid(row), print: () => this.handlePrint(row), + invoiceRegister: () => this.openInvoiceRegisterDialog(row), }; (handlers[type] || (() => {}))(); }, @@ -596,6 +681,58 @@ export default { this.paymentDialog.loading = false; } }, + // 先票后款路径B：发票登记——认领收票单（claim-invoices 走增量认领并同步收票侧关系） + openInvoiceRegisterDialog(row) { + this.invoiceRegisterDialog.row = row || {}; + this.invoiceRegisterDialog.candidates = []; + this.invoiceRegisterDialog.visible = true; + }, + addInvoiceRegisterCandidates(rows) { + const existing = new Set( + this.invoiceRegisterDialog.candidates.map(item => String(item.invoiceNo)) + ); + const added = rows.filter(row => !existing.has(String(row.invoiceNo))); + if (!added.length) { + this.$message.warning('所选收票单均已登记'); + return; + } + // 全额认领：匹配金额固定=发票金额 + this.invoiceRegisterDialog.candidates.push( + ...added.map(row => ({ ...row, matchedAmount: Number(row.invoiceAmount || 0) })) + ); + }, + async submitInvoiceRegister() { + const settlement = this.invoiceRegisterDialog.row; + const invoices = this.invoiceRegisterDialog.candidates.map(row => ({ + ...row, + attachmentJson: row.attachmentJson || row.attachmentsJson, + invoiceType: row.invoiceType || '', + taxRate: row.taxRate ?? null, + availableInvoiceAmount: Number(row.invoiceAmount || 0), + matchedAmount: Number(row.invoiceAmount || 0), + })); + 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.onLoad(this.page); + } finally { + this.invoiceRegisterDialog.saving = false; + } + }, handlePrint(row) { if (!row) { row = this.selectedOne('打印'); -- 2.52.0 From 9908b543ea44966e695c50102f5296f388d7a94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Sat, 31 Oct 2026 16:37:01 +0800 Subject: [PATCH 04/21] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E7=AB=8B?= =?UTF-8?q?=E9=A1=B9=E8=A1=A5=E5=85=85getRisk=E5=AF=BC=E5=85=A5=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=A3=8E=E9=99=A9=E6=9F=A5=E8=AF=A2=E6=9C=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/project-apply.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue index 0242715..88e1ba9 100644 --- a/src/views/business/project-apply.vue +++ b/src/views/business/project-apply.vue @@ -985,6 +985,7 @@ import { exportBlob } from '@/api/common'; import { defineAsyncComponent } from 'vue'; import * as api from '@/api/business/project-apply'; import { + getRisk, loadHcsImmediateEnabled, repush as hcsRepush, repushBatch as hcsRepushBatch, -- 2.52.0 From d78d1008248867683db30e4c7291c6bf8acaae70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Sat, 31 Oct 2026 16:52:22 +0800 Subject: [PATCH 05/21] =?UTF-8?q?feat:=20=E5=85=A8=E9=A2=9D=E8=AE=A4?= =?UTF-8?q?=E9=A2=86=E4=B8=8D=E5=86=8D=E6=A0=A1=E9=AA=8C=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=90=88=E8=AE=A1=E4=B8=8A=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/settlement/components/formal-settlement-editor.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue index 2589487..28e76e8 100644 --- a/src/views/settlement/components/formal-settlement-editor.vue +++ b/src/views/settlement/components/formal-settlement-editor.vue @@ -2812,10 +2812,7 @@ export default { } matchedTotal += matchedAmount; } - if (matchedTotal > this.resolveInvoiceClaimSettlementAmount()) { - this.$message.warning('发票匹配结算单金额合计不能超过结算金额'); - return false; - } + // 先票后款全额认领：匹配金额=发票全额，可超过结算金额，不再校验合计上限（收票状态按覆盖判定） return true; }, removeInvoice(index) { -- 2.52.0 From ab7491e6d692a0b49f3a5cc9dd9344c3d2cd5834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Sun, 1 Nov 2026 22:05:56 +0800 Subject: [PATCH 06/21] =?UTF-8?q?feat:=20=E6=94=B6=E7=A5=A8=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E8=A1=A8=E5=8D=95=E5=8E=BB=E7=A8=8E=E7=8E=87=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/payment/invoice-receipt-form.vue | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/views/payment/invoice-receipt-form.vue b/src/views/payment/invoice-receipt-form.vue index 53ae453..fe6d8b8 100644 --- a/src/views/payment/invoice-receipt-form.vue +++ b/src/views/payment/invoice-receipt-form.vue @@ -53,15 +53,6 @@ - - - - - -- 2.52.0 From eae50ab90987fb312694a1b8a6fdc71309a2b3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Mon, 2 Nov 2026 15:39:26 +0800 Subject: [PATCH 07/21] =?UTF-8?q?feat:=20=E5=8F=91=E7=A5=A8=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E7=A7=BB=E8=87=B3=E5=B7=A5=E5=85=B7=E6=A0=8F=E5=B9=B6?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=B7=B2=E8=AE=A4=E9=A2=86=E6=94=B6=E7=A5=A8?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/payment/invoiceReceipt.js | 3 +++ .../formal-settlement-table-panel.vue | 16 +++++++++------- src/views/settlement/formal-settlement.vue | 19 +++++++++++++++++-- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/api/payment/invoiceReceipt.js b/src/api/payment/invoiceReceipt.js index 79d2fab..4fecc7a 100644 --- a/src/api/payment/invoiceReceipt.js +++ b/src/api/payment/invoiceReceipt.js @@ -44,6 +44,9 @@ export const invoiceDetailQuery = invoiceNo => // 先票后款：结算单认领收票单候选（审批通过且未被有效应付结算单认领） export const claimCandidates = keyword => request({ url: `${baseUrl}/claim-candidates`, method: 'get', params: { keyword } }); +// 先票后款：结算单已认领收票登记列表（发票登记对话框回显已认领票） +export const claimedReceipts = formalSettlementId => + request({ url: `${baseUrl}/claimed-list`, method: 'get', params: { formalSettlementId } }); export const approvalStatusOptions = [ { label: '草稿', value: 'draft' }, diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue index 927e6fd..60fb4f7 100644 --- a/src/views/settlement/components/formal-settlement-table-panel.vue +++ b/src/views/settlement/components/formal-settlement-table-panel.vue @@ -23,6 +23,15 @@ @click="$emit('payment')" >付款申请 + + 发票登记 {{ formatMoney(row.invoiceAmount) }} -