This commit is contained in:
wintsa 2026-03-18 11:16:53 +08:00
parent 5a11b7431f
commit 03dd8297de
2 changed files with 3 additions and 0 deletions

View File

@ -501,6 +501,7 @@ const finishReportExportProgress = (success: boolean, text: string, blobUrl?: st
reportExportStatus.value = success ? 'success' : 'error' reportExportStatus.value = success ? 'success' : 'error'
reportExportProgress.value = 100 reportExportProgress.value = 100
reportExportText.value = text reportExportText.value = text
console.log(blobUrl)
reportExportBlobUrl.value = success && blobUrl ? blobUrl : null reportExportBlobUrl.value = success && blobUrl ? blobUrl : null
reportExportToastOpen.value = true reportExportToastOpen.value = true
if (!success || !blobUrl) { if (!success || !blobUrl) {

View File

@ -2111,6 +2111,7 @@ async function generateTemplate(data) {
let descRowNum1 = descRowNum + 1; let descRowNum1 = descRowNum + 1;
let descRowNum2 = descRowNum + 2; let descRowNum2 = descRowNum + 2;
let descRowNum3 = descRowNum + 2; let descRowNum3 = descRowNum + 2;
console.log( data.contracts)
data.contracts.forEach((ci, cindex) => { data.contracts.forEach((ci, cindex) => {
descRowNum3 = descRowNum3 - descRowNum2; descRowNum3 = descRowNum3 - descRowNum2;
descRowNum2 = descRowNum2 - descRowNum1 - 1; descRowNum2 = descRowNum2 - descRowNum1 - 1;
@ -2143,6 +2144,7 @@ async function generateTemplate(data) {
}); });
// 咨询服务类型 // 咨询服务类型
descRowNum2 = descRowNum1 + descRowNum2 + 1; descRowNum2 = descRowNum1 + descRowNum2 + 1;
console.log(ci.services)
let ciServiceText = ` ${cindex + 1}.${ci.name}` + ci.services.slice(0, -1).map(si => serviceList[si.id].name).join('、') + (ci.services.length > 1 ? '和' : '') + serviceList[ci.services.slice(-1)[0].id].name + '。'; let ciServiceText = ` ${cindex + 1}.${ci.name}` + ci.services.slice(0, -1).map(si => serviceList[si.id].name).join('、') + (ci.services.length > 1 ? '和' : '') + serviceList[ci.services.slice(-1)[0].id].name + '。';
let ciServiceTextArr = paragraphLineBreakFor1112(ciServiceText, ctx); let ciServiceTextArr = paragraphLineBreakFor1112(ciServiceText, ctx);
ciServiceTextArr.forEach(ti => { ciServiceTextArr.forEach(ti => {