增加文字说明

src/app/share/hs-prompt-modal/hs-prompt-modal.component.html

@@ -1,115 +1,59 @@
-<div
-  class="modal display_flex justify-content_flex-center align-items_center"
-  *ngIf="show"
->
+<div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
   <div class="modalBody" *ngIf="changeShow">
     <div class="title">
-      当前科室<i
-        *ngIf="closeTimeFlag <= 0 || (closeTimeFlag > 0 && closeTime === 0)"
-        class="icon_transport transport-guanbi"
-        (click)="hideModal()"
-      ></i>
+      当前科室<i *ngIf="closeTimeFlag <= 0 || (closeTimeFlag > 0 && closeTime === 0)"
+        class="icon_transport transport-guanbi" (click)="hideModal()"></i>
     </div>
     <div class="content">
+      <div class="tips">请您确认<strong class="red">当前科室</strong>，是否为您所在科室，如不是可点击<strong class="red">切换科室</strong>更换科室。
+      </div>
       <div class="defeat">
         <span *ngIf="!deptDisplayLoading">{{
           deptDisplay == 2 ? currentDept.deptalias : currentDept.dept
-        }}</span>
-        <img
-          *ngIf="deptDisplayLoading"
-          src="../../../assets/images/loading.gif"
-          alt=""
-        />
+          }}</span>
+        <img *ngIf="deptDisplayLoading" src="../../../assets/images/loading.gif" alt="" />
       </div>
-      <div
-        class="countDown"
-        *ngIf="closeTimeFlag < 0 || (closeTimeFlag > 0 && closeTime > 0)"
-      >
-        <span *ngIf="closeTimeFlag < 0">关闭</span>倒计时<em
-          >{{ closeTime }}s</em
-        >
+      <div class="countDown" *ngIf="closeTimeFlag < 0 || (closeTimeFlag > 0 && closeTime > 0)">
+        <span *ngIf="closeTimeFlag < 0">关闭</span>倒计时<em>{{ closeTime }}s</em>
       </div>
     </div>
     <div class="display_flex justify-content_flex-center">
-      <button
-        *ngIf="closeTimeFlag <= 0 || (closeTimeFlag > 0 && closeTime === 0)"
-        class="btn know"
-        nz-button
-        nzType="primary"
-        (click)="hideModal()"
-      >
+      <button *ngIf="closeTimeFlag <= 0 || (closeTimeFlag > 0 && closeTime === 0)" class="btn know" nz-button
+        nzType="primary" (click)="hideModal()">
         知道了
       </button>
-      <button
-        *ngIf="closeTimeFlag <= 0 || (closeTimeFlag > 0 && closeTime === 0)"
-        class="btn know"
-        nz-button
-        nzType="primary"
-        nzGhost
-        (click)="changeModal()"
-      >
+      <button *ngIf="closeTimeFlag <= 0 || (closeTimeFlag > 0 && closeTime === 0)" class="btn know" nz-button
+        nzType="primary" nzGhost (click)="changeModal()">
         切换科室
       </button>
     </div>
   </div>
   <div class="modalBody modalBody-search" *ngIf="!changeShow">
     <div class="title">
-      搜索当前科室<i
-        class="icon_transport transport-guanbi"
-        (click)="hideModal()"
-      ></i>
+      搜索当前科室<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
     </div>
     <div class="content content-search">
-      <div
-        class="
+      <div class="
           defeat-search
           display_flex
           justify-content_flex-center
           flex-direction_column
-        "
-      >
-        <span
-          >当前院区：<em>{{ currentHospital.hosName }}</em></span
-        >
-        <span
-          >当前科室：<em *ngIf="!deptDisplayLoading">{{
+        ">
+        <span>当前院区：<em>{{ currentHospital.hosName }}</em></span>
+        <span>当前科室：<em *ngIf="!deptDisplayLoading">{{
             deptDisplay == 2 ? currentDept.deptalias : currentDept.dept
-          }}</em
-          ><img
-            *ngIf="deptDisplayLoading"
-            src="../../../assets/images/loading.gif"
-            alt=""
-        /></span>
+            }}</em><img *ngIf="deptDisplayLoading" src="../../../assets/images/loading.gif" alt="" /></span>
       </div>
       <div class="form">
         <form nz-form [formGroup]="validateForm">
           <nz-form-item style="margin-bottom: 0">
-            <nz-form-label
-              class="label"
-              [nzSm]="24"
-              [nzXs]="24"
-              nzRequired
-              nzFor="hospital"
-              >搜索院区
+            <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="hospital">搜索院区
             </nz-form-label>
-            <nz-form-control
-              class="control"
-              [nzSm]="24"
-              [nzXs]="24"
-              nzErrorTip="请选择院区！"
-            >
-              <nz-select
-                formControlName="hospital"
-                [nzDropdownMatchSelectWidth]="false"
-                (ngModelChange)="searchHospital($event)"
-                nzPlaceHolder="请选择院区"
-              >
+            <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择院区！">
+              <nz-select formControlName="hospital" [nzDropdownMatchSelectWidth]="false"
+                (ngModelChange)="searchHospital($event)" nzPlaceHolder="请选择院区">
                 <ng-container *ngFor="let option of hospitals">
-                  <nz-option
-                    *ngIf="!isLoading"
-                    [nzLabel]="option.hosName"
-                    [nzValue]="option.id"
-                  ></nz-option>
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
                 </ng-container>
                 <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                   <i nz-icon nzType="loading" class="loading-icon"></i>
@@ -119,40 +63,18 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label
-              class="label"
-              [nzSm]="24"
-              [nzXs]="24"
-              nzRequired
-              nzFor="dutyDeptFc"
-              >搜索当值科室<span class="red ml8"
-                >(可通过拼音首字母检索科室)</span
-              >
+            <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="dutyDeptFc">搜索当值科室<span
+                class="red ml8">(可通过拼音首字母检索科室)</span>
             </nz-form-label>
-            <nz-form-control
-              class="control"
-              [nzSm]="24"
-              [nzXs]="24"
-              nzErrorTip="请选择当值科室！"
-            >
-              <nz-select
-                formControlName="dutyDeptFc"
-                [nzDropdownMatchSelectWidth]="false"
-                nzServerSearch
-                nzShowSearch
+            <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择当值科室！">
+              <nz-select formControlName="dutyDeptFc" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
                 (nzOnSearch)="
                   searchDept(validateForm.controls.hospital.value, $event)
-                "
-                nzPlaceHolder="请选择当值科室"
-              >
+                " nzPlaceHolder="请选择当值科室">
                 <ng-container *ngFor="let option of dutyDepts">
-                  <nz-option
-                    *ngIf="!isLoading"
-                    [nzLabel]="
+                  <nz-option *ngIf="!isLoading" [nzLabel]="
                       deptDisplay == 2 ? option.deptalias : option.dept
-                    "
-                    [nzValue]="option.id"
-                  ></nz-option>
+                    " [nzValue]="option.id"></nz-option>
                 </ng-container>
                 <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                   <i nz-icon nzType="loading" class="loading-icon"></i>
@@ -168,26 +90,14 @@
       <button class="btn know" nz-button nzType="primary" (click)="ok()">
         确定
       </button>
-      <button
-        class="btn know"
-        nz-button
-        nzType="primary"
-        nzGhost
-        (click)="hideModal()"
-      >
+      <button class="btn know" nz-button nzType="primary" nzGhost (click)="hideModal()">
         取消
       </button>
     </div>
   </div>
 </div>
 <!-- 操作成功/失败提示框 -->
-<app-prompt-modal
-  *ngIf="promptModalShow"
-  [content]="promptContent"
-  [success]="ifSuccess"
-  [show]="promptModalShow"
-  [info]="promptInfo"
-  [isReLoad]="true"
-></app-prompt-modal>
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo" [isReLoad]="true"></app-prompt-modal>
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>

src/app/share/hs-prompt-modal/hs-prompt-modal.component.less

@@ -1,4 +1,5 @@
 @import "../../../../src/theme.less";
+
 .modal {
   position: fixed;
   left: 0;
@@ -15,6 +16,7 @@
     border-radius: 5px;
     padding: 10px 20px;
     color: #333;
+
     &.modalBody-search {
       width: 480px;
       min-height: 250px;
@@ -38,7 +40,8 @@
     }
 
     .content {
-      min-height: 117px;
+      padding: 16px;
+      min-height: 150px;
       background: #f9fafb;
       border: 1px solid #e5e9ed;
       border-radius: 5px;
@@ -46,11 +49,14 @@
       margin-top: 12px;
       display: flex;
       flex-direction: column;
-      justify-content: center;
+      justify-content: space-around;
       align-items: center;
+
       &.content-search {
+        padding: 0;
         min-height: 147px;
         justify-content: start;
+
         .defeat-search {
           width: 100%;
           height: 52px;
@@ -58,14 +64,17 @@
           justify-content: center;
           align-items: center;
           border-bottom: solid 1px #e5e9ed;
+
           em {
             color: #666;
             font-style: normal;
           }
         }
+
         .form {
           width: 100%;
           padding: 0 16px;
+
           .ant-form-item-label,
           .ant-form-explain {
             text-align: left !important;
@@ -79,10 +88,13 @@
         &.defeat {
           color: #333;
           font-size: 28px;
+          text-align: justify;
         }
+
         &.countDown {
           font-size: 14px;
           color: 666;
+
           em {
             font-style: normal;
             color: @primary-color;

src/app/views/task-type-management/task-type-management.component.html

@@ -695,6 +695,7 @@
           </div>
           <div *ngIf="depaShow3">
             <!-- 标本配送才有自动建单，重要！ -->
+            <div class="red">自动建单需配置检验科室的工作时间；任务类型的开通科室；关联班次的时间区间；配置是否急标；配置标本类型；</div>
             <nz-form-label class="label">自动建单</nz-form-label>
             <div class="item_type_cont">
               <div>