seimin 3 тижнів тому
батько
коміт
5ff6e69ad8

+ 2 - 2
src/app/share/add-inspect-modal/add-inspect-modal.component.html

@@ -16,7 +16,7 @@
16 16
       <div class="tableWrap">
17 17
         <ng-container *ngIf="activeTabId == 1">
18 18
           <nz-table class="hospitalTable" [nzData]="data1List" nzSize="middle" [nzShowPagination]="false"
19
-            [nzLoading]="hsLoading" (nzCurrentPageDataChange)="currentPageData1Change($event)" [nzScroll]="{ y: '400px' }">
19
+            [nzLoading]="hsLoading" (nzCurrentPageDataChange)="currentPageData1Change($event)" [nzScroll]="{ y: '385px' }">
20 20
             <thead>
21 21
               <tr class="thead">
22 22
                 <th nzWidth="4%" nzShowCheckbox [(nzChecked)]="isAllDisplayData1Checked" [nzIndeterminate]="isIndeterminateData1"
@@ -42,7 +42,7 @@
42 42
             检查类型:<u *ngFor="let item of inspectCheckItemList" (click)="clickInspectCheckItem(item.id)" [ngClass]="{ active: activeInspectCheckItemId == item.id }">{{item.name}}</u>
43 43
           </div>
44 44
           <nz-table class="hospitalTable" [nzData]="data2List" nzSize="middle" [nzShowPagination]="false"
45
-            [nzLoading]="hsLoading" (nzCurrentPageDataChange)="currentPageData2Change($event)" [nzScroll]="{ y: '400px' }">
45
+            [nzLoading]="hsLoading" (nzCurrentPageDataChange)="currentPageData2Change($event)" [nzScroll]="{ y: '385px' }">
46 46
             <thead>
47 47
               <tr class="thead">
48 48
                 <th nzWidth="4%" nzShowCheckbox [(nzChecked)]="isAllDisplayData2Checked" [nzIndeterminate]="isIndeterminateData2"

+ 1 - 0
src/app/share/add-inspect-modal/add-inspect-modal.component.less

@@ -109,6 +109,7 @@
109 109
     }
110 110
 
111 111
     .content {
112
+      height: 603px;
112 113
       min-height: 117px;
113 114
       background: #f9fafb;
114 115
       border: 1px solid #e5e9ed;

+ 14 - 3
src/app/views/batch-inspection/batch-inspection.component.ts

@@ -143,6 +143,10 @@ export class BatchInspectionComponent implements OnInit {
143 143
   maskFlag: any = false;
144 144
 
145 145
   addPatientList(){
146
+    if(!this.dateRange.length){
147
+      this.message.info('请选择预约时间!');
148
+      return;
149
+    }
146 150
     let postData = {
147 151
       idx: 0,
148 152
       sum: 9999,
@@ -187,12 +191,19 @@ export class BatchInspectionComponent implements OnInit {
187 191
 
188 192
   changePatientId(id){
189 193
     this.setIsSelecting(true);
190
-    if(!id){
191
-      return;
192
-    }
193 194
     setTimeout(() => {
194 195
       this.patientId = null;
195 196
     }, 0)
197
+
198
+    if(!id){
199
+      return;
200
+    }
201
+
202
+    if(!this.dateRange.length){
203
+      this.message.info('请选择预约时间!');
204
+      return;
205
+    }
206
+
196 207
     let patientDTO = this.patientList.find(v => v.id == id);
197 208
     this.patientActiveList = [patientDTO];
198 209
     let postData = {