MaiXinRong 2 năm trước cách đây
mục cha
commit
017eb59cd9
2 tập tin đã thay đổi với 3 bổ sung2 xóa
  1. 2 1
      app/service/rpt_gather_memory.js
  2. 1 1
      app/view/report/rpt_all_popup.ejs

+ 2 - 1
app/service/rpt_gather_memory.js

@@ -303,6 +303,7 @@ module.exports = app => {
             return validStages;
         }
         async _getCheckedZoneStages(tender, zone) {
+            console.log(zone);
             const times = zone.split(' - ');
             if (times.length !== 2) throw '选择的汇总周期无效';
             const beginTime = moment(times[0], 'YYYY-MM-DD');
@@ -641,7 +642,7 @@ module.exports = app => {
                             await this._gatherIndexZoneData(tender, completeData, gsCustom.stage_zone);
                             break;
                         case 'checked-zone':
-                            await this._gatherCheckedZoneData(tender, completeData, gsCustom.check_zone);
+                            await this._gatherCheckedZoneData(tender, completeData, gsCustom.checked_zone);
                             break;
                     }
                     commonIndex++;

+ 1 - 1
app/view/report/rpt_all_popup.ejs

@@ -382,7 +382,7 @@
                                 <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-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">
                             </div>
                         </div>
                         <div id="gather-by-stage" name="gather-type">