Browse Source

定额导出内部数据定额基价

zhongzewei 6 years ago
parent
commit
6886d62a59

+ 1 - 1
modules/ration_repository/controllers/ration_repository_controller.js

@@ -218,7 +218,7 @@ class RationRepositoryController extends baseController {
     }
 
     /**
-     * 导出内数据
+     * 导出内数据
      *
      * @param {Object} request
      * @param {Object} response

+ 3 - 3
modules/ration_repository/models/ration_item.js

@@ -915,17 +915,17 @@ rationItemDAO.prototype.exportExcelData = async function(rationRepId) {
         rationRepId: rationRepId
     };
     // @todo 限制导出的数量以防内存溢出
-    const rationDataList = await this.getRationItemByCondition(condition, ['name', 'code', 'ID', 'sectionId', 'feeType', 'caption']);
+    const rationDataList = await this.getRationItemByCondition(condition, ['name', 'code', 'ID', 'sectionId', 'feeType', 'caption', 'basePrice']);
 
     // 整理数据
     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];
+        const ration = [sectionId, feeType, tmp.ID, tmp.code, tmp.name, tmp.caption, tmp.basePrice];
         rationData.push(ration);
     }
-    const excelData = [['树ID', '取费专业', '定额ID', '定额编码', '定额名', '定额显示名称']];
+    const excelData = [['树ID', '取费专业', '定额ID', '定额编码', '定额名', '定额显示名称', '基价']];
     excelData.push.apply(excelData, rationData);
 
     return excelData;