diff --git a/src/sql.ts b/src/sql.ts index 80e7e00..e6d0ed4 100644 --- a/src/sql.ts +++ b/src/sql.ts @@ -581,6 +581,7 @@ export async function exportFile(fileName: string, data: any): Promise { // 按模板生成最终工作簿:填充封面、目录、各分表及汇总数据。 async function generateTemplate(data) { // const downTextTmp = { richText: [{ font: { charset: 134, color: { theme: 1 }, italic: true, name: '宋体', size: 10 }, text: '常规' }, { font: { charset: 134, color: { theme: 1 }, italic: true, name: 'Calibri', size: 10, vertAlign: 'subscript' }, text: '下标' }] }; + console.log(data) try { // 获取模板 let templateExcel = 'template20260226001test010'; @@ -1067,7 +1068,7 @@ async function generateTemplate(data) { targetRow.getCell(2).value = taskX.code; targetRow.getCell(3).value = taskX.name + (taskX.desc ? `(${taskX.desc})` : ''); targetRow.getCell(4).value = taskX.basicParam; - targetRow.getCell(5).value = numberFormatter(tobj.price, 2); + targetRow.getCell(5).value = numberFormatter(tobj.price * taskX.conversion, 2); targetRow.getCell(6).value = numberFormatter(tobj.amount, 2); targetRow.getCell(7).value = numberFormatter(tobj.basicFee, 2); targetRow.getCell(8).value = numberFormatter(tobj.serviceCoe, 3); @@ -1142,7 +1143,7 @@ async function generateTemplate(data) { targetRow.getCell(2).value = addobj.code; targetRow.getCell(3).value = addobj.name; let tmpArr = []; - if (addobj.m0) tmpArr.push(`按上述小计的${addobj.m0.coe}计得${addobj.m0.fee}元`); + if (addobj.m0) tmpArr.push(`按基本、可选工作小计的${addobj.m0.coe}计得${addobj.m0.fee}元`); if (addobj.m4) tmpArr.push(`按工时法计得${addobj.m4.fee}元`); if (addobj.m5) tmpArr.push(`按数量单价计得${addobj.m5.fee}元`); targetRow.getCell(4).value = tmpArr.join(';'); @@ -1230,7 +1231,7 @@ async function generateTemplate(data) { targetRow.getCell(2).value = ci.reserve.code; targetRow.getCell(3).value = ci.reserve.name; let tmpArr = []; - if (ci.reserve.m0) tmpArr.push(`按上述小计及附加工作费之和的${ci.reserve.m0.coe}计得${ci.reserve.m0.fee}元`); + if (ci.reserve.m0) tmpArr.push(`按基本、可选工作小计与附加工作小计之和的${ci.reserve.m0.coe}计得${ci.reserve.m0.fee}元`); if (ci.reserve.m4) tmpArr.push(`按工时法计得${ci.reserve.m4.fee}元`); if (ci.reserve.m5) tmpArr.push(`按数量单价计得${ci.reserve.m5.fee}元`); targetRow.getCell(4).value = tmpArr.join(';');