diff --git a/src/sql.ts b/src/sql.ts index 78f1d51..83ebb49 100644 --- a/src/sql.ts +++ b/src/sql.ts @@ -1326,7 +1326,7 @@ async function generateTemplate(data) { if (addobj.m4) { cusInsertRowFunc(4 + num_4, [sheet_4.getRow(4)], sheet_4, (targetRow) => { targetRow.getCell(1).value = num_4++; - targetRow.getCell(2).value = addobj.ref; + targetRow.getCell(2).value = addobj.code; targetRow.getCell(3).value = addobj.name; targetRow.getCell(4).value = numberFormatter(addobj.m4.person_num, 0); targetRow.getCell(5).value = numberFormatter(addobj.m4.work_day, 2); @@ -1334,7 +1334,7 @@ async function generateTemplate(data) { }); cusInsertRowFunc(4 + num_4_1, [sheet_4_1.getRow(4)], sheet_4_1, (targetRow) => { targetRow.getCell(1).value = num_4_1++; - targetRow.getCell(2).value = addobj.ref; + targetRow.getCell(2).value = addobj.code; targetRow.getCell(3).value = addobj.name; targetRow.getCell(4).value = '/'; targetRow.getCell(5).value = '/'; @@ -1362,20 +1362,20 @@ async function generateTemplate(data) { if (addobj.m5) { cusInsertRowFunc(4 + num_5, [sheet_5.getRow(4)], sheet_5, (targetRow) => { num_5++; - targetRow.getCell(1).value = addobj.ref; + targetRow.getCell(1).value = addobj.code; targetRow.getCell(2).value = addobj.name; targetRow.getCell(3).value = '/'; targetRow.getCell(4).value = '/'; targetRow.getCell(5).value = '/'; targetRow.getCell(6).value = numberFormatter(addobj.m5.fee, 2); }); - const tmpJSS = JSON.stringify(addobj.ref); + const tmpJSS = JSON.stringify(addobj.code); addobj.m5.det.forEach((eobj, eindex) => { - let ref = JSON.parse(tmpJSS); - ref.richText.push({ font: { charset: 134, color: { theme: 1 }, italic: true, name: '宋体', size: 10 }, text: '-' + (eindex + 1) }); + let code = JSON.parse(tmpJSS); + code.richText.push({ font: { charset: 134, color: { theme: 1 }, italic: true, name: '宋体', size: 10 }, text: '-' + (eindex + 1) }); cusInsertRowFunc(4 + num_5, [sheet_5.getRow(4)], sheet_5, (targetRow) => { num_5++; - targetRow.getCell(1).value = ref; + targetRow.getCell(1).value = code; targetRow.getCell(2).value = eobj.name; targetRow.getCell(3).value = eobj.unit; targetRow.getCell(4).value = numberFormatter(eobj.amount, 3); @@ -1392,7 +1392,7 @@ async function generateTemplate(data) { endRows++; cusInsertRowFunc(ci.services.length + 3 + endRows, [sheet_1.getRow(3)], sheet_1, (targetRow) => { targetRow.getCell(1).value = ci.services.length + endRows; - targetRow.getCell(2).value = ci.reserve.ref; + 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}元`); @@ -1404,7 +1404,7 @@ async function generateTemplate(data) { if (ci.reserve.m4) { cusInsertRowFunc(4 + num_4, [sheet_4.getRow(4)], sheet_4, (targetRow) => { targetRow.getCell(1).value = num_4++; - targetRow.getCell(2).value = ci.reserve.ref; + targetRow.getCell(2).value = ci.reserve.code; targetRow.getCell(3).value = ci.reserve.name; targetRow.getCell(4).value = numberFormatter(ci.reserve.m4.person_num, 0); targetRow.getCell(5).value = numberFormatter(ci.reserve.m4.work_day, 2); @@ -1412,7 +1412,7 @@ async function generateTemplate(data) { }); cusInsertRowFunc(4 + num_4_1, [sheet_4_1.getRow(4)], sheet_4_1, (targetRow) => { targetRow.getCell(1).value = num_4_1++; - targetRow.getCell(2).value = ci.reserve.ref; + targetRow.getCell(2).value = ci.reserve.code; targetRow.getCell(3).value = ci.reserve.name; targetRow.getCell(4).value = '/'; targetRow.getCell(5).value = '/'; @@ -1440,20 +1440,20 @@ async function generateTemplate(data) { if (ci.reserve.m5) { cusInsertRowFunc(4 + num_5, [sheet_5.getRow(4)], sheet_5, (targetRow) => { num_5++; - targetRow.getCell(1).value = ci.reserve.ref; + targetRow.getCell(1).value = ci.reserve.code; targetRow.getCell(2).value = ci.reserve.name; targetRow.getCell(3).value = '/'; targetRow.getCell(4).value = '/'; targetRow.getCell(5).value = '/'; targetRow.getCell(6).value = numberFormatter(ci.reserve.m5.fee, 2); }); - const tmpJSS = JSON.stringify(ci.reserve.ref); + const tmpJSS = JSON.stringify(ci.reserve.code); ci.reserve.m5.det.forEach((eobj, eindex) => { - let ref = JSON.parse(tmpJSS); - ref.richText.push({ font: { charset: 134, color: { theme: 1 }, italic: true, name: '宋体', size: 10 }, text: '-' + (eindex + 1) }); + let code = JSON.parse(tmpJSS); + code.richText.push({ font: { charset: 134, color: { theme: 1 }, italic: true, name: '宋体', size: 10 }, text: '-' + (eindex + 1) }); cusInsertRowFunc(4 + num_5, [sheet_5.getRow(4)], sheet_5, (targetRow) => { num_5++; - targetRow.getCell(1).value = ref; + targetRow.getCell(1).value = code; targetRow.getCell(2).value = eobj.name; targetRow.getCell(3).value = eobj.unit; targetRow.getCell(4).value = numberFormatter(eobj.amount, 3);