fix: 金蝶票据池弹框样式与批量转结算保持一致 #14
@@ -34,6 +34,15 @@ export const syncKingdeeBatch = ids =>
|
|||||||
// 回写任务按 paymentNo 分批远程查询 A103-2/A103-4,同样可能超过全局超时
|
// 回写任务按 paymentNo 分批远程查询 A103-2/A103-4,同样可能超过全局超时
|
||||||
export const syncKingdeeResult = () =>
|
export const syncKingdeeResult = () =>
|
||||||
request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: APPROVE_TIMEOUT });
|
request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: APPROVE_TIMEOUT });
|
||||||
|
// 付款记录付款凭证下载(后端代理 A801-2 流式回源),耗时较普通接口长,放宽到 120s
|
||||||
|
export const downloadRecordVoucher = recordId =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/record/download-voucher`,
|
||||||
|
method: 'get',
|
||||||
|
params: { recordId },
|
||||||
|
responseType: 'blob',
|
||||||
|
timeout: 120000,
|
||||||
|
});
|
||||||
|
|
||||||
export const paymentTypeOptions = [
|
export const paymentTypeOptions = [
|
||||||
{ label: '项目预付', value: 'project_advance' },
|
{ label: '项目预付', value: 'project_advance' },
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-dialog v-model="visible" :title="title" width="92%" append-to-body destroy-on-close @open="handleOpen">
|
<el-dialog v-model="visible" :title="title" width="92%" append-to-body align-center destroy-on-close @open="handleOpen">
|
||||||
<el-form :model="query" inline label-width="130px" @submit.prevent>
|
<el-form class="kingdee-pool-dialog__form" :model="query" inline label-position="right" label-width="120px" @submit.prevent>
|
||||||
<el-form-item label="发票号码">
|
<el-form-item label="发票号码">
|
||||||
<el-input v-model="query.invoiceNo" clearable @keyup.enter="handleQuery" />
|
<el-input v-model="query.invoiceNo" clearable placeholder="请输入" @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="开票日期">
|
<el-form-item label="开票日期">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
@@ -10,15 +10,16 @@
|
|||||||
type="daterange"
|
type="daterange"
|
||||||
value-format="YYYY-MM-DD"
|
value-format="YYYY-MM-DD"
|
||||||
format="YYYY-MM-DD"
|
format="YYYY-MM-DD"
|
||||||
start-placeholder="开始日期"
|
range-separator="-"
|
||||||
end-placeholder="结束日期"
|
start-placeholder="请选择"
|
||||||
|
end-placeholder="请选择"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="开票单位">
|
<el-form-item label="开票单位">
|
||||||
<el-input v-model="query.salerName" clearable @keyup.enter="handleQuery" />
|
<el-input v-model="query.salerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="受票单位">
|
<el-form-item label="受票单位">
|
||||||
<el-input v-model="query.buyerName" clearable @keyup.enter="handleQuery" />
|
<el-input v-model="query.buyerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="开票单位(销方)">
|
<el-form-item label="开票单位(销方)">
|
||||||
<el-select
|
<el-select
|
||||||
@@ -93,6 +94,9 @@
|
|||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button :disabled="loading" @click="resetQuery">重置</el-button>
|
<el-button :disabled="loading" @click="resetQuery">重置</el-button>
|
||||||
<el-button type="primary" :disabled="loading" @click="handleQuery">查询</el-button>
|
<el-button type="primary" :disabled="loading" @click="handleQuery">查询</el-button>
|
||||||
|
<el-tooltip content="按名称检索范围为已同步票,未找到请改用发票号码或税号精确查找" placement="top">
|
||||||
|
<el-icon class="kingdee-pool-dialog__query-tip"><QuestionFilled /></el-icon>
|
||||||
|
</el-tooltip>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-table
|
<el-table
|
||||||
@@ -101,7 +105,7 @@
|
|||||||
:data="rows"
|
:data="rows"
|
||||||
:row-key="rowKey"
|
:row-key="rowKey"
|
||||||
border
|
border
|
||||||
height="520"
|
max-height="50vh"
|
||||||
:highlight-current-row="!multiple"
|
:highlight-current-row="!multiple"
|
||||||
@selection-change="selection => (selected = selection)"
|
@selection-change="selection => (selected = selection)"
|
||||||
@row-dblclick="handleRowDblclick"
|
@row-dblclick="handleRowDblclick"
|
||||||
@@ -118,6 +122,7 @@
|
|||||||
</el-radio>
|
</el-radio>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column type="index" label="序号" width="70" align="center" :index="indexMethod" />
|
||||||
<el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
|
<el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
|
||||||
<el-table-column prop="invoiceDate" label="开票日期" min-width="120" />
|
<el-table-column prop="invoiceDate" label="开票日期" min-width="120" />
|
||||||
<el-table-column prop="invoiceType" label="发票类型" min-width="140" />
|
<el-table-column prop="invoiceType" label="发票类型" min-width="140" />
|
||||||
@@ -172,8 +177,8 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<div class="kingdee-pool-dialog__pager">
|
<div class="kingdee-pool-dialog__pagination">
|
||||||
<span class="kingdee-pool-dialog__pager-tip">按名称检索范围为已同步票,未找到请改用发票号码或税号精确查找</span>
|
<span class="kingdee-pool-dialog__pagination-tip">按名称检索范围为已同步票,未找到请改用发票号码或税号精确查找</span>
|
||||||
<el-pagination
|
<el-pagination
|
||||||
v-model:current-page="page.current"
|
v-model:current-page="page.current"
|
||||||
v-model:page-size="page.size"
|
v-model:page-size="page.size"
|
||||||
@@ -323,6 +328,9 @@ export default {
|
|||||||
this.page.current = 1;
|
this.page.current = 1;
|
||||||
this.load();
|
this.load();
|
||||||
},
|
},
|
||||||
|
indexMethod(index) {
|
||||||
|
return (this.page.current - 1) * this.page.size + index + 1;
|
||||||
|
},
|
||||||
resetQuery() {
|
resetQuery() {
|
||||||
this.query = this.emptyQuery();
|
this.query = this.emptyQuery();
|
||||||
this.handleQuery();
|
this.handleQuery();
|
||||||
@@ -420,15 +428,28 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.kingdee-pool-dialog__pager {
|
.kingdee-pool-dialog__form {
|
||||||
|
margin-bottom: 16px;
|
||||||
|
padding: 12px 12px 4px;
|
||||||
|
background: #fff;
|
||||||
|
border-radius: 6px;
|
||||||
|
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
|
||||||
|
}
|
||||||
|
.kingdee-pool-dialog__pagination {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 12px;
|
padding: 16px 0;
|
||||||
gap: 16px;
|
gap: 16px;
|
||||||
}
|
}
|
||||||
.kingdee-pool-dialog__pager-tip {
|
.kingdee-pool-dialog__pagination-tip {
|
||||||
color: #909399;
|
color: #909399;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
.kingdee-pool-dialog__query-tip {
|
||||||
|
margin-left: 8px;
|
||||||
|
color: #909399;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ export const invoiceReceiptTableColumns = [
|
|||||||
{ prop: 'createUserName', label: '创建人', minWidth: 110 },
|
{ prop: 'createUserName', label: '创建人', minWidth: 110 },
|
||||||
{ prop: 'createTime', label: '创建时间', minWidth: 170 },
|
{ prop: 'createTime', label: '创建时间', minWidth: 170 },
|
||||||
{ prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 },
|
{ prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 },
|
||||||
{ prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 },
|
{ prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130, kingdeeStatus: true },
|
||||||
{ prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 },
|
{ prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 },
|
||||||
{ prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
|
{ prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -21,16 +21,17 @@ export const isKingdeePathAttachment = attachment => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 请求金蝶文件流:成功返回 Blob;业务失败为 HTTP 200 + R.fail JSON(响应通道未写流时后端即失败),
|
* 请求金蝶文件流(公共核):成功返回 Blob;业务失败为 HTTP 200 + R.fail JSON
|
||||||
* 按 Content-Type 识别并抛出带 msg 的错误;网络级失败拦截器已提示,标记 silent 避免重复提示。
|
* (响应通道未写流时后端即失败),按 Content-Type 识别并抛出带 msg 的错误;
|
||||||
|
* 网络级失败拦截器已提示,标记 silent 避免重复提示。
|
||||||
* 供查看(弹窗内预览)/下载两类入口复用
|
* 供查看(弹窗内预览)/下载两类入口复用
|
||||||
* @param {String} invoiceNo 发票号码
|
* @param {Function} fetcher 文件流请求函数(返回 axios blob 响应)
|
||||||
* @returns {Promise<Blob>}
|
* @returns {Promise<Blob>}
|
||||||
*/
|
*/
|
||||||
export const requestKingdeeFile = async invoiceNo => {
|
const fetchKingdeeBlob = async fetcher => {
|
||||||
let res;
|
let res;
|
||||||
try {
|
try {
|
||||||
res = await downloadInvoicePoolAttachment(invoiceNo);
|
res = await fetcher();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw Object.assign(new Error(error?.message || '附件下载失败'), { silent: true });
|
throw Object.assign(new Error(error?.message || '附件下载失败'), { silent: true });
|
||||||
}
|
}
|
||||||
@@ -51,6 +52,45 @@ export const requestKingdeeFile = async invoiceNo => {
|
|||||||
return blob;
|
return blob;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 请求金蝶文件流:票池发票按发票号回源(后端代理 A801-2)
|
||||||
|
* @param {String} invoiceNo 发票号码
|
||||||
|
* @returns {Promise<Blob>}
|
||||||
|
*/
|
||||||
|
export const requestKingdeeFile = invoiceNo => fetchKingdeeBlob(() => downloadInvoicePoolAttachment(invoiceNo));
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 下载金蝶侧附件(经 A801-2 后端代理,公共入口),失败统一 ElMessage 提示
|
||||||
|
* @param {Function} fetcher 文件流请求函数
|
||||||
|
* @param {String} fileName 下载文件名
|
||||||
|
*/
|
||||||
|
export const downloadKingdeeFile = async (fetcher, fileName) => {
|
||||||
|
try {
|
||||||
|
const blob = await fetchKingdeeBlob(fetcher);
|
||||||
|
downloadFile(blob, fileName);
|
||||||
|
} catch (error) {
|
||||||
|
if (!error?.silent) ElMessage.error(error?.message || '金蝶附件下载失败');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新窗口预览金蝶侧附件(经 A801-2 后端代理,公共入口):拉取 Blob 转 objectURL
|
||||||
|
* (PDF 可预览;OFD 等浏览器不可预览的格式由浏览器触发下载)
|
||||||
|
* @param {Function} fetcher 文件流请求函数
|
||||||
|
* @param {String} fileName 预览文件名
|
||||||
|
*/
|
||||||
|
export const viewKingdeeFile = async (fetcher, fileName) => {
|
||||||
|
try {
|
||||||
|
const blob = await fetchKingdeeBlob(fetcher);
|
||||||
|
const url = URL.createObjectURL(blob);
|
||||||
|
window.open(url, '_blank');
|
||||||
|
// 延迟释放 objectURL:立即回收可能导致新窗口尚未加载完成即失效
|
||||||
|
setTimeout(() => URL.revokeObjectURL(url), 60000);
|
||||||
|
} catch (error) {
|
||||||
|
if (!error?.silent) ElMessage.error(error?.message || '金蝶附件预览失败');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 下载金蝶侧发票附件(经 A801-2 后端代理),失败统一 ElMessage 提示
|
* 下载金蝶侧发票附件(经 A801-2 后端代理),失败统一 ElMessage 提示
|
||||||
* @param {String} invoiceNo 发票号码
|
* @param {String} invoiceNo 发票号码
|
||||||
@@ -61,12 +101,7 @@ export const downloadKingdeeInvoiceFile = async (invoiceNo, fileName) => {
|
|||||||
ElMessage.warning('当前发票缺少发票号码,无法下载金蝶侧附件');
|
ElMessage.warning('当前发票缺少发票号码,无法下载金蝶侧附件');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
try {
|
await downloadKingdeeFile(() => downloadInvoicePoolAttachment(invoiceNo), fileName || `${invoiceNo}.pdf`);
|
||||||
const blob = await requestKingdeeFile(invoiceNo);
|
|
||||||
downloadFile(blob, fileName || `${invoiceNo}.pdf`);
|
|
||||||
} catch (error) {
|
|
||||||
if (!error?.silent) ElMessage.error(error?.message || '金蝶附件下载失败');
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -79,13 +114,5 @@ export const viewKingdeeInvoiceFile = async (invoiceNo, fileName) => {
|
|||||||
ElMessage.warning('当前发票缺少发票号码,无法预览金蝶侧附件');
|
ElMessage.warning('当前发票缺少发票号码,无法预览金蝶侧附件');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
try {
|
await viewKingdeeFile(() => downloadInvoicePoolAttachment(invoiceNo), fileName || `${invoiceNo}.pdf`);
|
||||||
const blob = await requestKingdeeFile(invoiceNo);
|
|
||||||
const url = URL.createObjectURL(blob);
|
|
||||||
window.open(url, '_blank');
|
|
||||||
// 延迟释放 objectURL:立即回收可能导致新窗口尚未加载完成即失效
|
|
||||||
setTimeout(() => URL.revokeObjectURL(url), 60000);
|
|
||||||
} catch (error) {
|
|
||||||
if (!error?.silent) ElMessage.error(error?.message || '金蝶附件预览失败');
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -14,6 +14,17 @@ export const KINGDEE_STATUS_TAG_TYPES = {
|
|||||||
/** 金蝶单据状态 → el-tag 颜色类型,未映射状态返回 info */
|
/** 金蝶单据状态 → el-tag 颜色类型,未映射状态返回 info */
|
||||||
export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info';
|
export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info';
|
||||||
|
|
||||||
|
/** 收票登记推送状态 → el-tag 颜色类型(已指定应付=绿、已保存收票单=黄、推送失败=红、未推送=灰) */
|
||||||
|
export const KINGDEE_PUSH_STATUS_TAG_TYPES = {
|
||||||
|
unsynced: 'info',
|
||||||
|
pushed: 'warning',
|
||||||
|
assigned: 'success',
|
||||||
|
failed: 'danger',
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 收票登记推送状态 → el-tag 颜色类型,未映射状态返回 info */
|
||||||
|
export const kingdeePushStatusType = status => KINGDEE_PUSH_STATUS_TAG_TYPES[status] || 'info';
|
||||||
|
|
||||||
/** 金蝶冲销状态 → el-tag 颜色类型(已冲销=绿、未冲销=黄) */
|
/** 金蝶冲销状态 → el-tag 颜色类型(已冲销=绿、未冲销=黄) */
|
||||||
export const KINGDEE_WRITEOFF_TAG_TYPES = {
|
export const KINGDEE_WRITEOFF_TAG_TYPES = {
|
||||||
writtenoff: 'success',
|
writtenoff: 'success',
|
||||||
|
|||||||
@@ -119,6 +119,9 @@
|
|||||||
<el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">
|
<el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">
|
||||||
{{ displayValue(row[column.prop]) }}
|
{{ displayValue(row[column.prop]) }}
|
||||||
</el-tag>
|
</el-tag>
|
||||||
|
<el-tag v-else-if="column.kingdeeStatus" :type="kingdeePushStatusType(row.kingdeePushStatus)">
|
||||||
|
{{ displayValue(row[column.prop]) }}
|
||||||
|
</el-tag>
|
||||||
<span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
|
<span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
|
||||||
<span v-else>{{ displayValue(row[column.prop]) }}</span>
|
<span v-else>{{ displayValue(row[column.prop]) }}</span>
|
||||||
</template>
|
</template>
|
||||||
@@ -222,6 +225,7 @@ import TableHeaderTools from '@/components/table-header-tools/main.vue';
|
|||||||
import organizationSearch from '@/mixins/organization-search';
|
import organizationSearch from '@/mixins/organization-search';
|
||||||
import { getMKApprovalUrl } from '@/api/system/business-process';
|
import { getMKApprovalUrl } from '@/api/system/business-process';
|
||||||
import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
|
import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
|
||||||
|
import { kingdeePushStatusType } from '@/utils/kingdee';
|
||||||
|
|
||||||
// 表单提交成功后带标记返回,keep-alive 缓存的列表页据此重新拉取
|
// 表单提交成功后带标记返回,keep-alive 缓存的列表页据此重新拉取
|
||||||
const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
|
const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
|
||||||
@@ -480,6 +484,7 @@ export default {
|
|||||||
''
|
''
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
kingdeePushStatusType,
|
||||||
displayValue(value) {
|
displayValue(value) {
|
||||||
return value === null || value === undefined || value === '' ? '-' : value;
|
return value === null || value === undefined || value === '' ? '-' : value;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -354,11 +354,23 @@
|
|||||||
><el-table-column prop="paidDate" label="付款日期" min-width="150" /><el-table-column
|
><el-table-column prop="paidDate" label="付款日期" min-width="150" /><el-table-column
|
||||||
prop="paymentNo"
|
prop="paymentNo"
|
||||||
label="付款单号"
|
label="付款单号"
|
||||||
min-width="160" /><el-table-column
|
min-width="160" /><el-table-column label="付款凭证" min-width="160"
|
||||||
prop="kingdeeBillNo"
|
><template #default="{ row }"
|
||||||
label="付款凭证"
|
><div v-if="row.voucherFileName" class="payment-form-page__invoice-actions"
|
||||||
min-width="160"
|
><el-link
|
||||||
/></el-table>
|
type="primary"
|
||||||
|
:disabled="kingdeeAttachmentBusy"
|
||||||
|
@click="viewRecordVoucher(row)"
|
||||||
|
>查看</el-link
|
||||||
|
><el-link
|
||||||
|
type="primary"
|
||||||
|
:disabled="kingdeeAttachmentBusy"
|
||||||
|
@click="downloadRecordVoucher(row)"
|
||||||
|
>下载</el-link
|
||||||
|
></div
|
||||||
|
><span v-else>-</span></template
|
||||||
|
></el-table-column
|
||||||
|
></el-table>
|
||||||
</section-card>
|
</section-card>
|
||||||
<section-card>
|
<section-card>
|
||||||
<template #title>
|
<template #title>
|
||||||
@@ -733,12 +745,12 @@ import {
|
|||||||
} from '@/api/vehicle/customer-archive';
|
} from '@/api/vehicle/customer-archive';
|
||||||
import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
|
import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
|
||||||
import { formatContractOptionLabel } from '@/utils/contract';
|
import { formatContractOptionLabel } from '@/utils/contract';
|
||||||
import { downloadFileByUrl } from '@/utils/util';
|
import { downloadFile, downloadFileByUrl } from '@/utils/util';
|
||||||
import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
|
import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
|
||||||
import {
|
import {
|
||||||
downloadKingdeeInvoiceFile,
|
downloadKingdeeFile,
|
||||||
isKingdeePathAttachment,
|
requestKingdeeFile,
|
||||||
viewKingdeeInvoiceFile,
|
viewKingdeeFile,
|
||||||
} from '@/utils/kingdee-attachment';
|
} from '@/utils/kingdee-attachment';
|
||||||
import PdfPreview from '@/components/pdf-preview/main.vue';
|
import PdfPreview from '@/components/pdf-preview/main.vue';
|
||||||
|
|
||||||
@@ -1899,55 +1911,80 @@ export default {
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
invoiceAttachmentUrl(row) {
|
|
||||||
return this.attachmentFileUrl(this.invoiceAttachment(row));
|
|
||||||
},
|
|
||||||
invoiceAttachmentName(row) {
|
invoiceAttachmentName(row) {
|
||||||
return (
|
return (
|
||||||
this.attachmentFileName(this.invoiceAttachment(row)) || `${row.invoiceNo || '发票'}.pdf`
|
this.attachmentFileName(this.invoiceAttachment(row)) || `${row.invoiceNo || '发票'}.pdf`
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
async viewInvoiceAttachment(row) {
|
/** 金蝶附件查看/下载互斥闸门(A801-2 拉流较慢,进行中忽略重复点击,结束自动释放) */
|
||||||
const attachment = this.invoiceAttachment(row);
|
async withKingdeeAttachmentBusy(action) {
|
||||||
// 金蝶侧附件(path 型)经后端代理 A801-2 预览,OSS 直链维持本地预览组件
|
|
||||||
if (isKingdeePathAttachment(attachment)) {
|
|
||||||
if (this.kingdeeAttachmentBusy) return;
|
if (this.kingdeeAttachmentBusy) return;
|
||||||
this.kingdeeAttachmentBusy = true;
|
this.kingdeeAttachmentBusy = true;
|
||||||
try {
|
try {
|
||||||
await viewKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
|
await action();
|
||||||
} finally {
|
} finally {
|
||||||
this.kingdeeAttachmentBusy = false;
|
this.kingdeeAttachmentBusy = false;
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
async viewInvoiceAttachment(row) {
|
||||||
|
await this.withKingdeeAttachmentBusy(async () => {
|
||||||
|
// 发票版式文件按票号走金蝶票池(A801-2 镜像优先/实时回源),登记扫描件仅在票池无此票时兜底
|
||||||
|
try {
|
||||||
|
const blob = await requestKingdeeFile(row.invoiceNo);
|
||||||
|
const url = URL.createObjectURL(blob);
|
||||||
|
window.open(url, '_blank');
|
||||||
|
// 延迟释放 objectURL:立即回收可能导致新窗口尚未加载完成即失效
|
||||||
|
setTimeout(() => URL.revokeObjectURL(url), 60000);
|
||||||
return;
|
return;
|
||||||
|
} catch (error) {
|
||||||
|
// 网络级失败(silent,拦截器已提示)不再回退;票池无此票回退登记附件
|
||||||
|
if (error?.silent) return;
|
||||||
}
|
}
|
||||||
|
const attachment = this.invoiceAttachment(row);
|
||||||
if (!this.attachmentFileUrl(attachment)) {
|
if (!this.attachmentFileUrl(attachment)) {
|
||||||
this.$message.warning('当前发票暂无可查看附件');
|
this.$message.warning('当前发票没有金蝶版式文件,也没有登记附件');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.previewAttachment(
|
this.previewAttachment(
|
||||||
{ ...attachment, name: this.invoiceAttachmentName(row) },
|
{ ...attachment, name: this.invoiceAttachmentName(row) },
|
||||||
[attachment]
|
[attachment]
|
||||||
);
|
);
|
||||||
|
});
|
||||||
},
|
},
|
||||||
async downloadInvoiceAttachment(row) {
|
async downloadInvoiceAttachment(row) {
|
||||||
const attachment = this.invoiceAttachment(row);
|
await this.withKingdeeAttachmentBusy(async () => {
|
||||||
// 金蝶侧附件(path 型)经后端代理 A801-2 下载,OSS 直链维持前端直连下载
|
|
||||||
if (isKingdeePathAttachment(attachment)) {
|
|
||||||
if (this.kingdeeAttachmentBusy) return;
|
|
||||||
this.kingdeeAttachmentBusy = true;
|
|
||||||
try {
|
try {
|
||||||
await downloadKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
|
const blob = await requestKingdeeFile(row.invoiceNo);
|
||||||
} finally {
|
downloadFile(blob, this.invoiceAttachmentName(row));
|
||||||
this.kingdeeAttachmentBusy = false;
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
|
} catch (error) {
|
||||||
|
if (error?.silent) return;
|
||||||
}
|
}
|
||||||
|
const attachment = this.invoiceAttachment(row);
|
||||||
const url = this.attachmentFileUrl(attachment);
|
const url = this.attachmentFileUrl(attachment);
|
||||||
if (!url) {
|
if (!url) {
|
||||||
this.$message.warning('当前发票暂无可下载附件');
|
this.$message.warning('当前发票没有金蝶版式文件,也没有登记附件');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
downloadFileByUrl(url, this.invoiceAttachmentName(row));
|
downloadFileByUrl(url, this.invoiceAttachmentName(row));
|
||||||
|
});
|
||||||
|
},
|
||||||
|
/** 付款记录付款凭证(金蝶电子回单,A801-2 代理):查看=新窗口预览,下载=保存文件 */
|
||||||
|
viewRecordVoucher(row) {
|
||||||
|
return this.withKingdeeAttachmentBusy(() =>
|
||||||
|
viewKingdeeFile(
|
||||||
|
() => api.downloadRecordVoucher(row.id),
|
||||||
|
`${row.paymentNo || '付款记录'}-付款凭证.pdf`
|
||||||
|
)
|
||||||
|
);
|
||||||
|
},
|
||||||
|
downloadRecordVoucher(row) {
|
||||||
|
return this.withKingdeeAttachmentBusy(() =>
|
||||||
|
downloadKingdeeFile(
|
||||||
|
() => api.downloadRecordVoucher(row.id),
|
||||||
|
`${row.paymentNo || '付款记录'}-付款凭证.pdf`
|
||||||
|
)
|
||||||
|
);
|
||||||
},
|
},
|
||||||
attachmentFileName(file) {
|
attachmentFileName(file) {
|
||||||
return String(file?.originalName || file?.name || file?.fileName || '').trim();
|
return String(file?.originalName || file?.name || file?.fileName || '').trim();
|
||||||
|
|||||||
@@ -1133,12 +1133,8 @@ import {
|
|||||||
settlementRecordTypeName,
|
settlementRecordTypeName,
|
||||||
settlementStatusName,
|
settlementStatusName,
|
||||||
} from '@/utils/settlementStatus';
|
} from '@/utils/settlementStatus';
|
||||||
import { downloadFileByUrl } from '@/utils/util';
|
import { downloadFile, downloadFileByUrl } from '@/utils/util';
|
||||||
import {
|
import { requestKingdeeFile } from '@/utils/kingdee-attachment';
|
||||||
downloadKingdeeInvoiceFile,
|
|
||||||
isKingdeePathAttachment,
|
|
||||||
viewKingdeeInvoiceFile,
|
|
||||||
} from '@/utils/kingdee-attachment';
|
|
||||||
import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
|
import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
|
||||||
import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
|
import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
|
||||||
import ProjectAdvanceWriteOff from './project-advance-write-off.vue';
|
import ProjectAdvanceWriteOff from './project-advance-write-off.vue';
|
||||||
@@ -2918,38 +2914,45 @@ export default {
|
|||||||
return attachment.originalName || attachment.name || `${row.invoiceNo || '发票'}.pdf`;
|
return attachment.originalName || attachment.name || `${row.invoiceNo || '发票'}.pdf`;
|
||||||
},
|
},
|
||||||
async viewInvoiceAttachment(row) {
|
async viewInvoiceAttachment(row) {
|
||||||
const attachment = this.invoiceAttachment(row);
|
|
||||||
// 金蝶侧附件(path 型)经后端代理 A801-2 预览,OSS 直链维持 window.open
|
|
||||||
if (isKingdeePathAttachment(attachment)) {
|
|
||||||
if (this.kingdeeAttachmentBusy) return;
|
if (this.kingdeeAttachmentBusy) return;
|
||||||
this.kingdeeAttachmentBusy = true;
|
this.kingdeeAttachmentBusy = true;
|
||||||
try {
|
try {
|
||||||
await viewKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
|
// 发票版式文件按票号走金蝶票池(A801-2 镜像优先/实时回源),登记扫描件仅在票池无此票时兜底
|
||||||
|
try {
|
||||||
|
const blob = await requestKingdeeFile(row.invoiceNo);
|
||||||
|
const url = URL.createObjectURL(blob);
|
||||||
|
window.open(url, '_blank');
|
||||||
|
// 延迟释放 objectURL:立即回收可能导致新窗口尚未加载完成即失效
|
||||||
|
setTimeout(() => URL.revokeObjectURL(url), 60000);
|
||||||
|
return;
|
||||||
|
} catch (error) {
|
||||||
|
// 网络级失败(silent,拦截器已提示)不再回退;票池无此票回退登记附件
|
||||||
|
if (error?.silent) return;
|
||||||
|
}
|
||||||
|
const url = this.invoiceAttachmentUrl(row);
|
||||||
|
if (!url) return this.$message.warning('当前发票没有金蝶版式文件,也没有登记附件');
|
||||||
|
window.open(url, '_blank');
|
||||||
} finally {
|
} finally {
|
||||||
this.kingdeeAttachmentBusy = false;
|
this.kingdeeAttachmentBusy = false;
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
|
||||||
const url = this.invoiceAttachmentUrl(row);
|
|
||||||
if (!url) return this.$message.warning('当前发票暂无可查看附件');
|
|
||||||
window.open(url, '_blank');
|
|
||||||
},
|
},
|
||||||
async downloadInvoiceAttachment(row) {
|
async downloadInvoiceAttachment(row) {
|
||||||
const attachment = this.invoiceAttachment(row);
|
|
||||||
// 金蝶侧附件(path 型)经后端代理 A801-2 下载,OSS 直链维持前端直连下载
|
|
||||||
if (isKingdeePathAttachment(attachment)) {
|
|
||||||
if (this.kingdeeAttachmentBusy) return;
|
if (this.kingdeeAttachmentBusy) return;
|
||||||
this.kingdeeAttachmentBusy = true;
|
this.kingdeeAttachmentBusy = true;
|
||||||
try {
|
try {
|
||||||
await downloadKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
|
try {
|
||||||
|
const blob = await requestKingdeeFile(row.invoiceNo);
|
||||||
|
downloadFile(blob, this.invoiceAttachmentName(row));
|
||||||
|
return;
|
||||||
|
} catch (error) {
|
||||||
|
if (error?.silent) return;
|
||||||
|
}
|
||||||
|
const url = this.invoiceAttachmentUrl(row);
|
||||||
|
if (!url) return this.$message.warning('当前发票没有金蝶版式文件,也没有登记附件');
|
||||||
|
downloadFileByUrl(url, this.invoiceAttachmentName(row));
|
||||||
} finally {
|
} finally {
|
||||||
this.kingdeeAttachmentBusy = false;
|
this.kingdeeAttachmentBusy = false;
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
|
||||||
const url = this.invoiceAttachmentUrl(row);
|
|
||||||
if (!url) return this.$message.warning('当前发票暂无可下载附件');
|
|
||||||
downloadFileByUrl(url, this.invoiceAttachmentName(row));
|
|
||||||
},
|
},
|
||||||
// 开票发票预览地址:数电PDF优先(OFD浏览器无法预览),退预览图、板式文件
|
// 开票发票预览地址:数电PDF优先(OFD浏览器无法预览),退预览图、板式文件
|
||||||
issuedInvoicePreviewUrl(row) {
|
issuedInvoicePreviewUrl(row) {
|
||||||
|
|||||||
@@ -74,6 +74,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { claimCandidates } from '@/api/payment/invoiceReceipt';
|
import { claimCandidates } from '@/api/payment/invoiceReceipt';
|
||||||
|
import { kingdeePushStatusType } from '@/utils/kingdee';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'InvoiceReceiptCandidatesDialog',
|
name: 'InvoiceReceiptCandidatesDialog',
|
||||||
@@ -152,7 +153,7 @@ export default {
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
pushStatusType(value) {
|
pushStatusType(value) {
|
||||||
return { pushed: 'warning', assigned: 'success', failed: 'danger', unsynced: 'info' }[value] || 'info';
|
return kingdeePushStatusType(value);
|
||||||
},
|
},
|
||||||
formatMoney(value) {
|
formatMoney(value) {
|
||||||
const number = Number(value);
|
const number = Number(value);
|
||||||
|
|||||||
@@ -145,10 +145,10 @@
|
|||||||
<el-descriptions-item label="创建时间">
|
<el-descriptions-item label="创建时间">
|
||||||
{{ invoiceRegisterDialog.row.createTime || '-' }}
|
{{ invoiceRegisterDialog.row.createTime || '-' }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="金蝶同步状态" :span="2">
|
<el-descriptions-item label="金蝶同步状态">
|
||||||
{{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }}
|
{{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="备注" :span="2">
|
<el-descriptions-item label="备注">
|
||||||
{{ invoiceRegisterDialog.row.remark || '-' }}
|
{{ invoiceRegisterDialog.row.remark || '-' }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
@@ -847,6 +847,10 @@ export default {
|
|||||||
settlementTypeName(value) {
|
settlementTypeName(value) {
|
||||||
return { payable: '付款', receivable: '收款' }[value] || '-';
|
return { payable: '付款', receivable: '收款' }[value] || '-';
|
||||||
},
|
},
|
||||||
|
// 模板无法直接访问 script 顶部 import,包装成实例方法(与 formal-settlement-table-panel 同模式)
|
||||||
|
kingdeeSyncName(value) {
|
||||||
|
return kingdeeSyncName(value);
|
||||||
|
},
|
||||||
unwrapData(response) {
|
unwrapData(response) {
|
||||||
const body = response?.data || response || {};
|
const body = response?.data || response || {};
|
||||||
return body?.data || body;
|
return body?.data || body;
|
||||||
|
|||||||
Reference in New Issue
Block a user