code sync

modules/ration_repository/controllers/ration_controller.js

@@ -4,6 +4,8 @@
 
 var rationItem = require('../models/ration_item');
 import BaseController from "../../common/base/base_controller";
+const fs = require("fs");
+
 var callback = function(req, res, err, message, data){
     res.json({error: err, message: message, data: data});
 };
@@ -13,6 +15,14 @@ class RationController extends BaseController{
         try{
             let data = JSON.parse(req.body.data);
             let rationItems = await rationItem.getRationItemsByLib(data.rationLibId, data.showHint, data.returnFields);
+            /*
+            // let testRationItems = await rationItem.getRationItemsByLib(126); //"广西公路日常养护预算指标(2021)"
+            let testRationItems = await rationItem.getRationItemsByLib(130); //"广西公路养护预算定额(2021)"
+            // console.log('testRationItems:');
+            fs.writeFile(`D:/GitHome/YangHuOperation/tmp/testRationData_${(new Date()).getTime()}.js`, JSON.stringify(testRationItems), { 'flag': 'a' }, function(err){
+                if(err) throw err;
+            });
+            //*/
             callback(req, res, 0, '', rationItems);
         }
         catch(err){

modules/ration_repository/controllers/ration_repository_controller.js

@@ -26,6 +26,11 @@ class RationRepositoryController extends baseController {
         try {
             const data = JSON.parse(req.body.data);
             const rst = await rationItem.prepareInitData(data.rationRepId);
+            // console.log(rst);
+            // fs.writeFile(`D:/GitHome/YangHuOperation/tmp/testDataResult_${(new Date()).getTime()}.js`, JSON.stringify(rst.sectionTree), { 'flag': 'a' }, function(err){  // 这个只是导出SectionTree
+            // fs.writeFile(`D:/GitHome/YangHuOperation/tmp/testDataResult_${(new Date()).getTime()}.js`, JSON.stringify(rst), { 'flag': 'a' }, function(err){ // 这个导出全部
+            //     if(err) throw err;
+            // });
             res.json({error: 0, message: 'success', data: rst});
         } catch (err) {
             console.log(err);

web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -212,6 +212,7 @@ const exposed_ration_properties = [
     ,{Name: "定额_所属项目ID", Title: "", Key: "projectID", Order: "ascend"}
     ,{Name: "定额_所属清单ID", Title: "", Key: "billsItemID", Order: "ascend"}
     ,{Name: "定额_清单内顺序", Title: "", Key: "serialNo", Order: "ascend"}
+    ,{Name: "定额_类型", Title: "", Key: "type", Order: "ascend"}
 ];
 const exposed_ration_glj_properties = [
     {Name: "定额人材机_ID", Title: "", Key: "ID"}