页面优化

src/app/share/select-date-yytime/select-date-yytime.component.ts

@@ -21,10 +21,8 @@ export class SelectDateYytimeComponent implements OnInit {
 
   ngOnInit() {
     if(this.date){
-      this.yyDate = new Date(this.date);
-      this.yyTime = new Date(this.date);
-    }else{
-      this.yyDate = new Date();
+      this.yyDate = startOfMinute(new Date(this.date));
+      this.yyTime = startOfMinute(new Date(this.date));
     }
   }
 

src/app/views/batch-inspection/batch-inspection.component.html

@@ -47,7 +47,7 @@
         </td>
         <td>
           <div *ngFor="let inspect of data.inspectList" class="display_flex align-items_center justify-content_flex-center">
-            {{inspect.inspectName}}
+            {{inspect.inspectName}} {{inspect.yyTime}}
             <span class="icon_transport transport-weibiaoti2010104" (click)="editInspect({data: data, inspect: inspect})"></span>
             <span class="icon_transport transport-shanchu1" (click)="showDelModal({data: data, inspect: inspect}, '您确认要删除吗？','删除','delInspect')"></span>
           </div>
@@ -84,7 +84,7 @@
 <app-select-date [date]="coopData.inspect && coopData.inspect.yyTime" *ngIf="isShowSelectDate" (submitFormHand)="submitSelectDate($event)" (cancelFlagHand)="cancelSelectDate($event)"></app-select-date>
 
 <!-- 批量发起陪检 -->
-<app-select-date-yytime *ngIf="isShowSelectDateYytime" (submitFormYytimeE)="submitSelectDateYytime($event)" (submitFormDirectE)="submitSelectDateDirect($event)" (cancelFlagHand)="cancelSelectDateYytime($event)"></app-select-date-yytime>
+<app-select-date-yytime [date]="dateRange.length && dateRange[0]" *ngIf="isShowSelectDateYytime" (submitFormYytimeE)="submitSelectDateYytime($event)" (submitFormDirectE)="submitSelectDateDirect($event)" (cancelFlagHand)="cancelSelectDateYytime($event)"></app-select-date-yytime>
 
 <!-- 追加患者检查 -->
 <app-add-inspect-modal *ngIf="isShowAddInspect" [patientInspectLogDTO]="patientInspectLogDTO" [deptDisplay]="deptDisplay" (closeModelHs)="closeAddInspectModel($event)" (confirmModelHs)="confirmAddInspectModel($event)"></app-add-inspect-modal>

src/app/views/inspect-closed-loop-view/inspect-closed-loop-view.component.html

@@ -52,14 +52,13 @@
   <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1">
     <thead>
       <tr class="thead">
-        <th nzWidth="12.5%">科室信息</th>
-        <th nzWidth="12.5%">患者信息</th>
-        <th nzWidth="12.5%">护理信息</th>
-        <th nzWidth="12.5%">预约时间</th>
-        <th nzWidth="12.5%">出行方式</th>
-        <th nzWidth="12.5%">检查项目</th>
-        <th nzWidth="12.5%">签到信息</th>
-        <th nzWidth="12.5%">状态</th>
+        <th nzWidth="14%">科室信息</th>
+        <th nzWidth="14%">患者信息</th>
+        <th nzWidth="14%">护理信息</th>
+        <th nzWidth="14%">出行方式</th>
+        <th nzWidth="16%">检查项目</th>
+        <th nzWidth="14%">签到信息</th>
+        <th nzWidth="14%">状态</th>
       </tr>
     </thead>
     <tbody>
@@ -67,7 +66,6 @@
         <td>{{data.deptName}}<br>{{data.deptDTO?.pcode}}</td>
         <td>{{data.patientName}}<ng-container *ngIf="data.age !== undefined">({{data.age}}岁)</ng-container><br><ng-container *ngIf="data.patientType && data.patientType.value == 'I'">住：{{data.patientCode}}（{{data.bedNum}}）</ng-container><ng-container *ngIf="data.patientType && data.patientType.value == 'O'">门诊：{{data.patientCode}}</ng-container><ng-container *ngIf="data.patientType && data.patientType.value == 'E'">急：{{data.patientCode}}</ng-container></td>
         <td>{{data.careLevel?.name}}<br>{{data.illnessState?.name}}</td>
-        <td>{{data.yyTime | date:'yyyy-MM-dd HH:mm'}}</td>
         <td>{{data.tripTypeDTO?.inspectMode}}</td>
         <td><ng-container *ngFor="let item of data.inspectList;let last = last">{{item.inspectName}}<ng-container *ngIf="!last"><br></ng-container></ng-container></td>
         <td>{{ data.signTime | date: "yyyy-MM-dd HH:mm" }}<br>{{ data.signDeptDTO?.dept }}<br>{{ data.signUserDTO?.name }}</td>