汇总，汇总最新期、审批完成最新期模式，调整选择标段窗口

app/public/report/js/rpt_custom.js

@@ -217,13 +217,16 @@ const rptCustomObj = (function () {
         } else if (gsObj.setting.type === 'zone') {
             $('#gather-by-month').hide();
             $('#gather-by-zone').show();
+        } else {
+            $('#gather-by-month').hide();
+            $('#gather-by-zone').hide();
         }
         SpreadJsObj.loadSheetData(gsObj.grSheet, SpreadJsObj.DataType.Data, gsObj.grArray);
         // 初始化选择结果
         if (gsSelect) {
             if (gsSelect.zone) {
                 $('#gather-zone').val(gsSelect.zone ? gsSelect.zone : '');
-            } else {
+            } else if (gsSelect.month) {
                 $('#gather-month').val(gsSelect.month ? gsSelect.month: '');
             }
             gatherSelectSpreadObj.initSelectTenders(gsSelect.tenders);
@@ -371,7 +374,7 @@ const rptCustomObj = (function () {
                 hintObj.html('请选择 汇总年月').show();
                 return;
             }
-        } else {
+        } else if (gsObj.setting.type === 'zone') {
             data[sGatherSelect].zone = $('#gather-zone').val();
             if (data[sGatherSelect].zone === '') {
                 hintObj.html('请选择 汇总周期').show();

builder_report_index_define.js

@@ -452,19 +452,19 @@ const gather_stage_bills = {
         { name: '(标段)本期-完成-数量', field: 't_gather_qty', type: dataType.currency },
         { name: '(标段)本期-完成-金额', field: 't_gather_tp', type: dataType.currency },
 
-        // { name: '(标段)截止上期-合同-数量', field: 't_pre_contract_qty', type: dataType.currency },
-        // { name: '(标段)截止上期-合同-金额', field: 't_pre_contract_tp', type: dataType.currency },
-        // { name: '(标段)截止上期-变更-数量', field: 't_pre_qc_qty', type: dataType.currency },
-        // { name: '(标段)截止上期-变更-金额', field: 't_pre_qc_tp', type: dataType.currency },
-        // { name: '(标段)截止上期-完成-数量', field: 't_pre_gather_qty', type: dataType.currency },
-        // { name: '(标段)截止上期-完成-金额', field: 't_pre_gather_tp', type: dataType.currency },
-        //
-        // { name: '(标段)截止本期-合同-数量', field: 't_end_contract_qty', type: dataType.currency },
-        // { name: '(标段)截止本期-合同-金额', field: 't_end_contract_tp', type: dataType.currency },
-        // { name: '(标段)截止本期-变更-数量', field: 't_end_qc_qty', type: dataType.currency },
-        // { name: '(标段)截止本期-变更-金额', field: 't_end_qc_tp', type: dataType.currency },
-        // { name: '(标段)截止本期-完成-数量', field: 't_end_gather_qty', type: dataType.currency },
-        // { name: '(标段)截止本期-完成-金额', field: 't_end_gather_tp', type: dataType.currency },
+        { name: '(标段)截止上期-合同-数量', field: 't_pre_contract_qty', type: dataType.currency },
+        { name: '(标段)截止上期-合同-金额', field: 't_pre_contract_tp', type: dataType.currency },
+        { name: '(标段)截止上期-变更-数量', field: 't_pre_qc_qty', type: dataType.currency },
+        { name: '(标段)截止上期-变更-金额', field: 't_pre_qc_tp', type: dataType.currency },
+        { name: '(标段)截止上期-完成-数量', field: 't_pre_gather_qty', type: dataType.currency },
+        { name: '(标段)截止上期-完成-金额', field: 't_pre_gather_tp', type: dataType.currency },
+
+        { name: '(标段)截止本期-合同-数量', field: 't_end_contract_qty', type: dataType.currency },
+        { name: '(标段)截止本期-合同-金额', field: 't_end_contract_tp', type: dataType.currency },
+        { name: '(标段)截止本期-变更-数量', field: 't_end_qc_qty', type: dataType.currency },
+        { name: '(标段)截止本期-变更-金额', field: 't_end_qc_tp', type: dataType.currency },
+        { name: '(标段)截止本期-完成-数量', field: 't_end_gather_qty', type: dataType.currency },
+        { name: '(标段)截止本期-完成-金额', field: 't_end_gather_tp', type: dataType.currency },
 
         { name: '(合计)台账-数量', field: 's_ty', type: dataType.currency },
         { name: '(合计)台账-金额', field: 's_tp', type: dataType.currency },
@@ -476,19 +476,19 @@ const gather_stage_bills = {
         { name: '(合计)本期-完成-数量', field: 's_gather_qty', type: dataType.currency },
         { name: '(合计)本期-完成-金额', field: 's_gather_tp', type: dataType.currency },
 
-        // { name: '(合计)截止上期-合同-数量', field: 's_pre_contract_qty', type: dataType.currency },
-        // { name: '(合计)截止上期-合同-金额', field: 's_pre_contract_tp', type: dataType.currency },
-        // { name: '(合计)截止上期-变更-数量', field: 's_pre_qc_qty', type: dataType.currency },
-        // { name: '(合计)截止上期-变更-金额', field: 's_pre_qc_tp', type: dataType.currency },
-        // { name: '(合计)截止上期-完成-数量', field: 's_pre_gather_qty', type: dataType.currency },
-        // { name: '(合计)截止上期-完成-金额', field: 's_pre_gather_tp', type: dataType.currency },
-        //
-        // { name: '(合计)截止本期-合同-数量', field: 's_end_contract_qty', type: dataType.currency },
-        // { name: '(合计)截止本期-合同-金额', field: 's_end_contract_tp', type: dataType.currency },
-        // { name: '(合计)截止本期-变更-数量', field: 's_end_qc_qty', type: dataType.currency },
-        // { name: '(合计)截止本期-变更-金额', field: 's_end_qc_tp', type: dataType.currency },
-        // { name: '(合计)截止本期-完成-数量', field: 's_end_gather_qty', type: dataType.currency },
-        // { name: '(合计)截止本期-完成-金额', field: 's_end_gather_tp', type: dataType.currency },
+        { name: '(合计)截止上期-合同-数量', field: 's_pre_contract_qty', type: dataType.currency },
+        { name: '(合计)截止上期-合同-金额', field: 's_pre_contract_tp', type: dataType.currency },
+        { name: '(合计)截止上期-变更-数量', field: 's_pre_qc_qty', type: dataType.currency },
+        { name: '(合计)截止上期-变更-金额', field: 's_pre_qc_tp', type: dataType.currency },
+        { name: '(合计)截止上期-完成-数量', field: 's_pre_gather_qty', type: dataType.currency },
+        { name: '(合计)截止上期-完成-金额', field: 's_pre_gather_tp', type: dataType.currency },
+
+        { name: '(合计)截止本期-合同-数量', field: 's_end_contract_qty', type: dataType.currency },
+        { name: '(合计)截止本期-合同-金额', field: 's_end_contract_tp', type: dataType.currency },
+        { name: '(合计)截止本期-变更-数量', field: 's_end_qc_qty', type: dataType.currency },
+        { name: '(合计)截止本期-变更-金额', field: 's_end_qc_tp', type: dataType.currency },
+        { name: '(合计)截止本期-完成-数量', field: 's_end_gather_qty', type: dataType.currency },
+        { name: '(合计)截止本期-完成-金额', field: 's_end_gather_tp', type: dataType.currency },
 
         { name: '(特殊1-需替换key1)台账-数量', field: 'ts_key1_qty', type: dataType.currency },
         { name: '(特殊1-需替换key1)台账-金额', field: 'ts_key1_tp', type: dataType.currency },