护士端一键建单弹窗优化

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1440,7 +1440,7 @@
             <!-- 提示 -->
             <nz-form-item class="pos-item pos-tip" *ngIf="checkedShowMsg.msg">
               <nz-form-control>
-                <b class="pos-red">{{ checkedShowMsg.msg }}</b>
+                <b class="pos-red ellipsis-oneline" [title]="checkedShowMsg.msg">{{ checkedShowMsg.msg }}</b>
               </nz-form-control>
             </nz-form-item>
             <nz-form-item class="datesControl">
@@ -1518,14 +1518,14 @@
               </nz-form-item>
             </div>
             <!-- 100009 科室任务类型状态码未配置 -->
-            <nz-form-item *ngIf="checkedShowMsg.status != 200 && checkedShowMsg.status == 100009">
+            <nz-form-item *ngIf="checkedShowMsg.status == 100009">
               <div class="txtC">{{ checkedShowMsg.msg }}</div>
             </nz-form-item>
             <!-- 100015 （护士端一键建单展策略）起点科室和终点科室下拉展示 -->
-            <nz-form-item *ngIf="checkedShowMsg.status != 200 && (checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013)">
+            <nz-form-item nz-row *ngIf="checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013">
-              <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="originOffice">起点科室</nz-form-label>
+              <nz-form-label [nzSpan]="4" nzRequired nzFor="originOffice">起点科室</nz-form-label>
-              <nz-form-control nzErrorTip="请选择起点科室!">
+              <nz-form-control [nzSpan]="20" nzErrorTip="请选择起点科室!">
-                <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', checkedShowMsg, $event)" nzPlaceHolder="请选择起点科室">
+                <nz-select formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', checkedShowMsg, $event)" nzPlaceHolder="请选择起点科室">
                   <ng-container *ngFor="let option of checkedShowMsg.start.start.list">
                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
                   </ng-container>
@@ -1536,8 +1536,21 @@
                 </nz-select>
               </nz-form-control>
             </nz-form-item>
+            <!-- 其他情况 -->
+            <nz-form-item nz-row *ngIf="checkedShowMsg.start && !(checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015)">
+              <nz-form-label [nzSpan]="4" nzRequired nzFor="originOffice">起点科室</nz-form-label>
+              <nz-form-control [nzSpan]="20" nzErrorTip="请选择起点科室!">
+                <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.start.start.list[0].deptalias : checkedShowMsg.start.start.list[0].dept}}</span>
+              </nz-form-control>
+            </nz-form-item>
+            <nz-form-item nz-row *ngIf="checkedShowMsg.end && !(checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013)">
+              <nz-form-label [nzSpan]="4" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
+              <nz-form-control [nzSpan]="20" nzErrorTip="请选择目标科室!">
+                <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.end.end.list[0].deptalias : checkedShowMsg.end.end.list[0].dept}}</span>
+              </nz-form-control>
+            </nz-form-item>
             <!-- 100014 （护士端一键建单展示策略）取终点科室和msg 值展示 -->
-            <nz-form-item nz-row *ngIf="checkedShowMsg.status != 200 && (checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015)">
+            <nz-form-item nz-row *ngIf="checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015">
               <nz-form-label [nzSpan]="4" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
               <nz-form-control [nzSpan]="20" nzErrorTip="请选择目标科室!">
                 <nz-select formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target', checkedShowMsg, $event)" nzPlaceHolder="请选择目标科室">
@@ -1551,27 +1564,36 @@
                 </nz-select>
               </nz-form-control>
             </nz-form-item>
-            <!-- 自动送回 -->
+            <div class="display_flex">
-            <nz-form-item *ngIf="checkedShowMsg.status != 200 && checkedShowMsg.isRemand == 1">
+              <!-- 自动送回 -->
-              <nz-form-control>
+              <nz-form-item class="isRemand" *ngIf="checkedShowMsg.status != 200 && checkedShowMsg.isRemand == 1">
-                <label nz-checkbox [(ngModel)]="isRemand" [ngModelOptions]="{ standalone: true }">自动送回</label>
+                <nz-form-control>
-              </nz-form-control>
+                  <label nz-checkbox [(ngModel)]="isRemand" [ngModelOptions]="{ standalone: true }">自动送回</label>
-            </nz-form-item>
+                </nz-form-control>
-            <!-- 是否加急 -->
+              </nz-form-item>
-            <nz-form-item *ngIf="current_allowUrgent">
+              <!-- 是否加急 -->
-              <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="allowUrgent" class="goods">是否加急</nz-form-label>
+              <nz-form-item nz-row *ngIf="current_allowUrgent" class="allowUrgent">
+                <nz-form-label [nzSpan]="3" nzFor="allowUrgent" class="goods">是否加急</nz-form-label>
+                <nz-form-control [nzSpan]="6" style="margin-left: 24px;">
+                  <nz-radio-group [(ngModel)]="allowUrgent" (ngModelChange)="allowUrgentChange($event)" formControlName="allowUrgent">
+                    <label nz-radio nzValue="1">是</label>
+                    <label nz-radio nzValue="0">否</label>
+                  </nz-radio-group>
+                </nz-form-control>
+              </nz-form-item>
+            </div>
+            <!-- 加急原因 -->
+            <nz-form-item nz-row *ngIf="current_allowUrgent && allowUrgent == 1">
+              <nz-form-label [nzSpan]="24" nzRequired nzFor="urgentReason" class="goods">加急原因</nz-form-label>
               <nz-form-control>
-                <nz-radio-group [(ngModel)]="allowUrgent" (ngModelChange)="allowUrgentChange($event)" formControlName="allowUrgent">
+                <textarea rows="4" placeholder="请输入加急原因" nz-input [(ngModel)]="urgentReason" formControlName="urgentReason"></textarea>
-                  <label nz-radio nzValue="1">是</label>
-                  <label nz-radio nzValue="0">否</label>
-                </nz-radio-group>
               </nz-form-control>
             </nz-form-item>
             <!-- 工单备注 -->
             <ng-container *ngIf="isRemarks">
               <nz-form-item>
                 <div class="display_flex align-items_center">
-                  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="workOrderRemark2" class="mt8 mb8">工单备注</nz-form-label>
+                  <nz-form-label nzFor="workOrderRemark2" class="mt8 mb8">工单备注</nz-form-label>
                   <div *ngIf="customRemarks2.length" style="word-break: break-all;">
                     <span class="addRemarks" *ngFor="let item of customRemarks2" (click)="addRemarks2(item)">【{{ item }}】</span>
                   </div>
@@ -1582,19 +1604,12 @@
               </nz-form-item>
             </ng-container>
             <!-- 携带设备 -->
-            <nz-form-item *ngIf="!isRemarks && goodsLis.length">
+            <nz-form-item nz-row *ngIf="!isRemarks && goodsLis.length">
-              <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="goods" class="goods">携带设备</nz-form-label>
+              <nz-form-label [nzSpan]="4" nzFor="goods" class="goods">携带设备</nz-form-label>
-              <nz-form-control>
+              <nz-form-control [nzSpan]="20">
                 <nz-checkbox-group formControlName="goods" [(ngModel)]="goodsLis"></nz-checkbox-group>
               </nz-form-control>
             </nz-form-item>
-            <!-- 加急原因 -->
-            <nz-form-item *ngIf="current_allowUrgent && allowUrgent == 1">
-              <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="urgentReason" class="goods">加急原因</nz-form-label>
-              <nz-form-control>
-                <textarea rows="4" placeholder="请输入加急原因" nz-input [(ngModel)]="urgentReason" formControlName="urgentReason"></textarea>
-              </nz-form-control>
-            </nz-form-item>
           </ng-container>
         </form>
       </div>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -2593,6 +2593,7 @@
 }
 .patient ::ng-deep .ant-form-item-label{
   line-height: 32px!important;
+  flex-shrink: 0;
 }
 .patient{
   .modalBody{
@@ -2624,6 +2625,22 @@
       }
       .patientForm{
         padding: 16px 24px;
+        .addRemarks{
+          font-size: 18px;
+        }
+        .goods{
+          margin-top: 5px;
+        }
+        .isRemand{
+          margin-right: 98px;
+        }
+        .allowUrgent{
+          flex: 1;
+        }
+        .readonly{
+          line-height: 32px;
+          font-size: 18px;
+        }
         .radioGroup{
           line-height: normal;
         }
@@ -2631,8 +2648,11 @@
           left: 125px;
           &.pos-tip{
             left: 100px;
+            width: calc(100% - 100px);
             .pos-red{
               margin-top: 13px;
+              display: inline-block;
+              width: 100%;
             }
           }
           .pos-red{