|
@@ -1078,14 +1078,14 @@ rationItemDAO.prototype.exportExcelData = async function (rationRepId) {
|
|
|
rationRepId: rationRepId
|
|
|
};
|
|
|
// @todo 限制导出的数量以防内存溢出
|
|
|
- const rationDataList = await this.getRationItemByCondition(condition, ['name', 'code', 'ID', 'sectionId', 'feeType', 'caption', 'basePrice', 'jobContent', 'annotation']);
|
|
|
+ const rationDataList = await this.getRationItemByCondition(condition, ['name', 'code', 'ID', 'sectionId', 'feeType', 'caption', 'basePrice', 'jobContent', 'annotation', 'unit']);
|
|
|
|
|
|
// 整理数据
|
|
|
let rationData = [];
|
|
|
for (const tmp of rationDataList) {
|
|
|
const sectionId = tmp.sectionId <= 0 || tmp.sectionId === undefined ? null : tmp.sectionId;
|
|
|
const feeType = tmp.feeType === '' || tmp.feeType === undefined ? null : tmp.feeType;
|
|
|
- const ration = [sectionId, feeType, tmp.ID, tmp.code, tmp.name, tmp.caption, tmp.basePrice, tmp.jobContent, tmp.annotation];
|
|
|
+ const ration = [sectionId, feeType, tmp.ID, tmp.code, tmp.name, tmp.caption, tmp.basePrice, tmp.jobContent, tmp.annotation, tmp.unit];
|
|
|
rationData.push(ration);
|
|
|
}
|
|
|
//根据编号排序,优先级:number-number-..., number, Anumber....
|
|
@@ -1151,7 +1151,7 @@ rationItemDAO.prototype.exportExcelData = async function (rationRepId) {
|
|
|
}
|
|
|
return rst;
|
|
|
});*/
|
|
|
- const excelData = [['树ID', '取费专业', '定额ID', '定额编码', '定额名', '定额显示名称', '基价', '工作内容', '附注']];
|
|
|
+ const excelData = [['树ID', '取费专业', '定额ID', '定额编码', '定额名', '定额显示名称', '基价', '工作内容', '附注', '单位']];
|
|
|
excelData.push.apply(excelData, rationData);
|
|
|
|
|
|
return excelData;
|