code sync + 01-2表后台支持

modules/reports/rpt_component/jpc_flow_tab.js

@@ -892,8 +892,10 @@ JpcFlowTabSrv.prototype.createNew = function(){
                 }
             }
             if (removeCellIds.length > 0) {
-                //这次真的要排序了
-                removeCellIds.sort(); //默认方式即可
+                //排序，保证一定的顺序，不能用默认的方式(默认方式是针对字符串的简单排序)
+                removeCellIds.sort(function (idx1, idx2) {
+                    return idx1 - idx2;
+                });
                 for (let idx = removeCellIds.length - 1; idx >= 0; idx--) {
                     rstPageCells.splice(removeCellIds[idx], 1);
                 }

web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -58,6 +58,10 @@
                     <div class="input-group-addon">工程类型</div>
                     <select class="form-control input-sm" id="element_prjFlags_select" onchange="zTreeOprObj.onChangeFlag('valuationType', this)"><option value ="NA">N/A</option><option value ="bill">预算</option><option value ="ration">工程量清单</option></select>
                 </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>
+                </div>
             </div>
         </div>
     </div>

web/maintain/report/js/rpt_tpl_main.js

@@ -887,6 +887,13 @@ let zTreeOprObj = {
                             } else {
                                 $("#element_prjFlags_select")[0].selectedIndex = 0;
                             }
+                            if (me.currentNode.flags.hasOwnProperty('reportType')) {
+                                let rType = me.currentNode.flags['reportType'];
+                                if (rType === 'billSummary') $("#element_rptFlags_select")[0].selectedIndex = 1
+                                else $("#element_rptFlags_select")[0].selectedIndex = 0;
+                            } else {
+                                $("#element_rptFlags_select")[0].selectedIndex = 0;
+                            }
                         } else {
                             $("#element_flags_select")[0].selectedIndex = 0;
                             $("#element_prjFlags_select")[0].selectedIndex = 0;

web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -219,6 +219,7 @@ const exposed_ration_glj_properties = [
     ,{Name: "定额人材机_所属工程ID", Title: "", Key: "projectID", Order: "ascend"}
     ,{Name: "定额人材机_代码", Title: "", Key: "code", Order: "ascend"}
     ,{Name: "定额人材机_类型", Title: "", Key: "type", Order: "ascend", individualType: fixed_glj_types}
+    ,{Name: "定额人材机_数量", Title: "", Key: "quantity", Order: "ascend"}
     ,{Name: "定额人材机_是否暂估", Title: "", Key: "ref_join(projectGLJID,projectGLJ,id).is_evaluate", Order: "ascend", isBoolean: true, booleanOptions: [1,0]}
     ,{Name: "定额人材机_供货方式", Title: "", Key: "ref_join(projectGLJID,projectGLJ,id).supply", Order: "ascend", individualType: fixed_supply_types}
     ,{Name: "定额人材机_三材类别", Title: "", Key: "ref_join(projectGLJID,projectGLJ,id).materialType", Order: "ascend", individualType: fixed_material_types}