Merge branch 'lmm' into develop

src/app/views/form-management/form-management.component.less

@@ -6,9 +6,6 @@
   .ant-calendar-picker {
   width: 100% !important;
 }
-::ng-deep .ant-calendar-picker-input {
-  width: 410px !important;
-}
 
 .save {
   position: fixed;

src/app/views/medical-waste-information/medical-waste-information.component.html

@@ -57,7 +57,7 @@
         </div>
         <div class="list-template__searchItem">
           <span class="label">收取时间：</span>
-          <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange"></nz-range-picker>
+          <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
         </div>
       </div>
       <div nz-col nzXl="8" class="list-template__btns">

src/app/views/medical-waste-information/medical-waste-information.component.ts

@@ -51,6 +51,17 @@ export class MedicalWasteInformationComponent implements OnInit {
     this.getHospital();
   }
 
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      let dateStart = new Date(dateArr[0]);
+      let dateEnd = new Date(dateArr[1]);
+      dateStart.setHours(0,0,0);
+      dateEnd.setHours(23,59,59);
+      this.searchCriteria.dateRange = [dateStart,dateEnd];
+    }
+  }
+
   // 删除
   delModal: boolean = false; //删除模态框
   del() {

src/app/views/medical-waste-outgoing-record/medical-waste-outgoing-record.component.html

@@ -4,7 +4,7 @@
       <div nz-col nzXl='16' class="list-template__searchBox">
         <div class="list-template__searchItem">
           <span class="label">出库时间：</span>
-          <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange"></nz-range-picker>
+          <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
         </div>
         <div class="list-template__searchItem">
           <span class="label">操作人：</span>

src/app/views/medical-waste-outgoing-record/medical-waste-outgoing-record.component.ts

@@ -45,6 +45,17 @@ export class MedicalWasteOutgoingRecordComponent implements OnInit {
     this.getHospital();
   }
 
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      let dateStart = new Date(dateArr[0]);
+      let dateEnd = new Date(dateArr[1]);
+      dateStart.setHours(0,0,0);
+      dateEnd.setHours(23,59,59);
+      this.searchCriteria.dateRange = [dateStart,dateEnd];
+    }
+  }
+
   batchOutOfOtorageClick(){
     this.router.navigateByUrl("/main/batchOutOfStorage");
   }

src/app/views/medical-waste-storage-record/medical-waste-storage-record.component.html

@@ -4,7 +4,7 @@
       <div nz-col nzXl='16' class="list-template__searchBox">
         <div class="list-template__searchItem">
           <span class="label">入库时间：</span>
-          <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange"></nz-range-picker>
+          <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
         </div>
         <div class="list-template__searchItem">
           <span class="label">操作人：</span>

src/app/views/medical-waste-storage-record/medical-waste-storage-record.component.ts

@@ -44,6 +44,17 @@ export class MedicalWasteStorageRecordComponent implements OnInit {
     this.getHospital();
   }
 
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      let dateStart = new Date(dateArr[0]);
+      let dateEnd = new Date(dateArr[1]);
+      dateStart.setHours(0,0,0);
+      dateEnd.setHours(23,59,59);
+      this.searchCriteria.dateRange = [dateStart,dateEnd];
+    }
+  }
+
   // 删除
   delModal: boolean = false; //删除模态框
   del() {

src/app/views/nucleic-acid-collection/nucleic-acid-collection.component.less

@@ -6,9 +6,6 @@
   .ant-calendar-picker {
   width: 100% !important;
 }
-::ng-deep .ant-calendar-picker-input {
-  width: 410px !important;
-}
 
 .save {
   position: fixed;

src/app/views/order-management/order-management.component.html

@@ -72,7 +72,7 @@
           <span class="label">发起时间</span>：
           <!-- <nz-range-picker [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"
             [nzDisabled]="checkOptionsOne[2]?.checked"></nz-range-picker> -->
-          <nz-range-picker nzShowTime [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+          <nz-range-picker nzShowTime [(ngModel)]="dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)" (ngModelChange)="changeDate($event)"></nz-range-picker>
         </div>
       </div>
       <div nz-col nzXl='7' class="list-template__btns">

src/app/views/order-management/order-management.component.ts

@@ -189,6 +189,16 @@ export class OrderManagementComponent implements OnInit {
     this.changeTasktype("");
     this.tasktype = null;
   }
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      let dateStart = new Date(dateArr[0]);
+      let dateEnd = new Date(dateArr[1]);
+      dateStart.setHours(0,0,0);
+      dateEnd.setHours(23,59,59);
+      this.dateRange = [dateStart,dateEnd];
+    }
+  }
   // 表格数据
   loading1 = false;
   getList() {

src/app/views/regular-off-duty/regular-off-duty.component.less

@@ -6,9 +6,6 @@
   .ant-calendar-picker {
   width: 100% !important;
 }
-::ng-deep .ant-calendar-picker-input {
-  width: 410px !important;
-}
 
 .save {
   position: fixed;

src/app/views/timing-message-sending/timing-message-sending.component.less

@@ -6,9 +6,6 @@
   .ant-calendar-picker {
   width: 100% !important;
 }
-::ng-deep .ant-calendar-picker-input {
-  width: 410px !important;
-}
 
 .textarea{
   p{

src/app/views/worker-statistics/worker-statistics.component.html

@@ -8,6 +8,7 @@
             [(ngModel)]="dateRange" nzShowTime
             [nzAllowClear]="false"
             (ngModelChange)="changeDate($event)"
+            (nzOnCalendarChange)="onCalendarChangeDate($event)"
           >
           </nz-range-picker>
           <br />

src/app/views/worker-statistics/worker-statistics.component.ts

@@ -261,6 +261,16 @@ export class WorkerStatisticsComponent implements OnInit {
     this.group = e;
     this.search();
   }
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      let dateStart = new Date(dateArr[0]);
+      let dateEnd = new Date(dateArr[1]);
+      dateStart.setHours(0,0,0);
+      dateEnd.setHours(23,59,59);
+      this.dateRange = [dateStart,dateEnd];
+    }
+  }
   // 日期选择 快速修改时间区间
   nowdate = new Date();
   quick: boolean = false;

src/app/views/workorder-message/workorder-message.component.less

@@ -6,9 +6,6 @@
   .ant-calendar-picker {
   width: 100% !important;
 }
-::ng-deep .ant-calendar-picker-input {
-  width: 410px !important;
-}
 
 .save {
   position: fixed;

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.57');
+    console.info('v2.4.58');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)