olym пре 7 година
родитељ
комит
b9fe421628
2 измењених фајлова са 3 додато и 2 уклоњено
  1. 3 2
      modules/ration_repository/models/ration_item.js
  2. 0 0
      public/tmp/test.md

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

@@ -494,6 +494,7 @@ rationItemDAO.prototype.updateAnnotation = function (lastOpr, repId, updateArr,
  * @param {Object} condition
  * @param {Object} fields
  * @param {String} indexBy
+ * @param {Object} sort
  * @return {Promise|Array}
  */
 rationItemDAO.prototype.getRationItemByCondition = async function (condition, fields = null, indexBy = null) {
@@ -637,10 +638,10 @@ rationItemDAO.prototype.exportExcelData = async function(rationRepId) {
     // 整理数据
     let rationData = [];
     for (const tmp of rationDataList) {
-        const ration = [null, tmp.ID, tmp.code, tmp.name];
+        const ration = [null, null, tmp.ID, tmp.code, tmp.name];
         rationData.push(ration);
     }
-    const excelData = [['树ID', '定额ID', '定额编码', '定额名']];
+    const excelData = [['树ID', '取费专业', '定额ID', '定额编码', '定额名']];
     excelData.push.apply(excelData, rationData);
 
     return excelData;

+ 0 - 0
public/tmp/test.md