seimin 3 years ago
parent
commit
40138c744b

+ 2 - 1
src/app/share/detail-patients/detail-patients.component.html

@@ -23,7 +23,8 @@
23
           <div nz-col nzSpan="8">陪同情况:{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</div>
23
           <div nz-col nzSpan="8">陪同情况:{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</div>
24
           <div nz-col nzSpan="8">预约时间:{{orderInfo.yyjdTime|date:'MM-dd HH:mm'}}</div>
24
           <div nz-col nzSpan="8">预约时间:{{orderInfo.yyjdTime|date:'MM-dd HH:mm'}}</div>
25
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息:{{orderInfo.worker.name}}</div>
25
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息:{{orderInfo.worker.name}}</div>
26
-          <div nz-col nzSpan="8">是否半程陪检:{{orderInfo.isHalfInspect===1?'是':'否'}}</div>
26
+          <div nz-col nzSpan="8" *ngIf="orderInfo.taskType.associationType.value==='inspect'">
27
+            是否半程陪检:{{orderInfo.isHalfInspect===1?'是':'否'}}</div>
27
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
28
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
28
             特殊情况关闭原因:{{orderInfo.specialCloseReason}}
29
             特殊情况关闭原因:{{orderInfo.specialCloseReason}}
29
           </div>
30
           </div>

+ 1 - 1
src/app/share/order-detail/order-detail.component.html

@@ -392,7 +392,7 @@
392
               陪同情况:{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</div>
392
               陪同情况:{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</div>
393
             <div nz-col nzSpan="6" *ngIf="orderInfo.yyjdTime">
393
             <div nz-col nzSpan="6" *ngIf="orderInfo.yyjdTime">
394
               预约时间:{{orderInfo.yyjdTime|date:'MM-dd HH:mm'}}</div>
394
               预约时间:{{orderInfo.yyjdTime|date:'MM-dd HH:mm'}}</div>
395
-            <div nz-col nzSpan="6">
395
+            <div nz-col nzSpan="6" *ngIf="orderInfo.taskType.associationType.value=='inspect'">
396
               是否半程陪检:{{orderInfo.isHalfInspect===1?'是':'否'}}</div>
396
               是否半程陪检:{{orderInfo.isHalfInspect===1?'是':'否'}}</div>
397
           </div>
397
           </div>
398
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
398
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">

+ 1 - 1
src/app/views/inspect-type-config/inspect-type-config.component.html

@@ -28,7 +28,7 @@
28
         <button class="btn default" *ngIf="coopBtns.add&&inspectTypeList.length" nzType="primary" nz-button
28
         <button class="btn default" *ngIf="coopBtns.add&&inspectTypeList.length" nzType="primary" nz-button
29
           (click)="showFloorModal($event,'add')">新增</button>
29
           (click)="showFloorModal($event,'add')">新增</button>
30
         <button class="btn default" *ngIf="coopBtns.del&&inspectTypeList.length" nzType="primary" nz-button
30
         <button class="btn default" *ngIf="coopBtns.del&&inspectTypeList.length" nzType="primary" nz-button
31
-          (click)="showDelFloorModal($event)" [disabled]="allKeyword.length===0">批量删除</button>
31
+          (click)="showDelFloorModal($event)" [disabled]="selectedFloor.length===0">批量删除</button>
32
       </div>
32
       </div>
33
     </div>
33
     </div>
34
     <div class="table" *ngIf="!buildingsLoading">
34
     <div class="table" *ngIf="!buildingsLoading">