汇总表，custom-zone相关

app/public/report/js/rpt_custom.js

@@ -310,13 +310,13 @@ const rptCustomObj = (function () {
         if (gsObj.setting.type === 'zone') $('#gather-by-zone').show();
         if (gsObj.setting.type === 'stage') $('#gather-by-stage').show();
         if (gsObj.setting.type === 'stage-zone') $('#gather-by-stage-zone').show();
-        if (gsObj.setting.type === 'checked-zone') $('#gather-by-checked-zone').show();
+        if (gsObj.setting.type === 'custom-zone') $('#gather-by-custom-zone').show();
 
         if (gsSelect) {
             if (gsSelect.zone) {
                 $('#gather-zone').val(gsSelect.zone ? gsSelect.zone : '');
-            } else if (gsSelect.checked_zone) {
-                $('#gather-checked-zone').val(gsSelect.checked_zone ? gsSelect.checked_zone : '');
+            } else if (gsSelect.custom_zone) {
+                $('#gather-custom-zone').val(gsSelect.custom_zone ? gsSelect.custom_zone : '');
             } else if (gsSelect.month) {
                 $('#gather-month').val(gsSelect.month ? gsSelect.month: '');
             } else if (gsSelect.stage) {
@@ -618,12 +618,12 @@ const rptCustomObj = (function () {
                 return;
             }
             data[sGatherSelect].stage_zone = stageBegin + ':' + stageEnd;
-        } else if (gsObj.setting.type === 'checked-zone') {
-            data[sGatherSelect].checked_zone = $('#gather-checked-zone').val();
-            if (data[sGatherSelect].checked_zone === '') {
+        } else if (gsObj.setting.type === 'custom-zone') {
+            data[sGatherSelect].custom_zone = $('#gather-custom-zone').val();
+            if (data[sGatherSelect].custom_zone === '') {
                 hintObj.html('请选择 汇总周期').show();
                 return;
-            } else if(data[sGatherSelect].checked_zone.indexOf(' - ') < 0) {
+            } else if(data[sGatherSelect].custom_zone.indexOf(' - ') < 0) {
                 hintObj.html('请选择 完整汇总周期').show();
                 return;
             }

app/service/rpt_gather_memory.js

@@ -711,7 +711,7 @@ module.exports = app => {
                             await this._gatherIndexZoneData(tender, completeData, gsCustom.stage_zone);
                             break;
                         case 'custom-zone':
-                            await this._gatherCustomZoneData(tender, completeData, gsCustom.checked_zone);
+                            await this._gatherCustomZoneData(tender, completeData, gsCustom.custom_zone);
                             break;
                     }
                     commonIndex++;

app/view/report/rpt_all_popup.ejs

@@ -398,12 +398,12 @@
                                 <input id="gather-zone" class="datepicker-here form-control mt-0" placeholder="点击选择周期" data-range="true" data-multiple-dates-separator=" - "  data-min-view="months" data-view="months" data-date-format="yyyy-MM" data-language="zh" type="text" autocomplete="off">
                             </div>
                         </div>
-                        <div id="gather-by-checked-zone" name="gather-type">
+                        <div id="gather-by-custom-zone" name="gather-type">
                             <div class="input-group input-group-sm">
                                 <div class="input-group-prepend">
                                     <span class="input-group-text">汇总周期</span>
                                 </div>
-                                <input id="gather-checked-zone" class="datepicker-here form-control mt-0" placeholder="点击选择周期" data-range="true" data-multiple-dates-separator=" - "  data-min-view="days" data-view="days" data-date-format="yyyy-MM-dd" data-language="zh" type="text" autocomplete="off">
+                                <input id="gather-custom-zone" class="datepicker-here form-control mt-0" placeholder="点击选择周期" data-range="true" data-multiple-dates-separator=" - "  data-min-view="days" data-view="days" data-date-format="yyyy-MM-dd" data-language="zh" type="text" autocomplete="off">
                             </div>
                         </div>
                         <div id="gather-by-stage" name="gather-type">