02-2表

modules/reports/facade/rpt_tpl_data_facade.js

@@ -11,7 +11,8 @@ let projectFacade = require('../../../modules/main/facade/project_facade');
 
 module.exports = {
     prepareProjectData: prepareProjectData,
-    getBudgetSummayDatas: getBudgetSummayDatas
+    getBudgetSummayDatas: getBudgetSummayDatas,
+    getGLJSummayDatas: getGLJSummayDatas
 };
 
 function prepareProjectData(userId, prjId, filter, callback) {
@@ -44,4 +45,8 @@ function prepareProjectData(userId, prjId, filter, callback) {
 
 async function getBudgetSummayDatas(prjIds) {
     return await projectFacade.getBudgetSummayDatas(prjIds);
-}
+}
+
+async function getGLJSummayDatas(prjIds) {
+    return await projectFacade.getGLJSummayDatas(prjIds);
+}

web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -60,7 +60,7 @@
                 </div>
                 <div class="input-group col-3">
                     <div class="input-group-addon">报表汇总类型</div>
-                    <select class="form-control input-sm" id="element_rptFlags_select" onchange="zTreeOprObj.onChangeFlag('reportType', this)"><option value ="NA">N/A</option><option value ="billSummary">工程清单汇总</option></select>
+                    <select class="form-control input-sm" id="element_rptFlags_select" onchange="zTreeOprObj.onChangeFlag('reportType', this)"><option value ="NA">N/A</option><option value ="billSummary">工程清单汇总</option><option value ="gljSummary">工程工料机汇总</option></select>
                 </div>
             </div>
         </div>