ソースを参照

护士端一键建单弹窗优化

seimin 4 ヶ月 前
コミット
0dfd5c4bd9
共有2 個のファイルを変更した66 個の追加31 個の削除を含む
  1. 46 31
      src/app/views/hushijiandan/hushijiandan.component.html
  2. 20 0
      src/app/views/hushijiandan/hushijiandan.component.less

+ 46 - 31
src/app/views/hushijiandan/hushijiandan.component.html

@@ -1440,7 +1440,7 @@
1440 1440
             <!-- 提示 -->
1441 1441
             <nz-form-item class="pos-item pos-tip" *ngIf="checkedShowMsg.msg">
1442 1442
               <nz-form-control>
1443
-                <b class="pos-red">{{ checkedShowMsg.msg }}</b>
1443
+                <b class="pos-red ellipsis-oneline" [title]="checkedShowMsg.msg">{{ checkedShowMsg.msg }}</b>
1444 1444
               </nz-form-control>
1445 1445
             </nz-form-item>
1446 1446
             <nz-form-item class="datesControl">
@@ -1518,14 +1518,14 @@
1518 1518
               </nz-form-item>
1519 1519
             </div>
1520 1520
             <!-- 100009 科室任务类型状态码未配置 -->
1521
-            <nz-form-item *ngIf="checkedShowMsg.status != 200 && checkedShowMsg.status == 100009">
1521
+            <nz-form-item *ngIf="checkedShowMsg.status == 100009">
1522 1522
               <div class="txtC">{{ checkedShowMsg.msg }}</div>
1523 1523
             </nz-form-item>
1524 1524
             <!-- 100015 (护士端一键建单展策略)起点科室和终点科室下拉展示 -->
1525
-            <nz-form-item *ngIf="checkedShowMsg.status != 200 && (checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013)">
1526
-              <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="originOffice">起点科室</nz-form-label>
1527
-              <nz-form-control nzErrorTip="请选择起点科室!">
1528
-                <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', checkedShowMsg, $event)" nzPlaceHolder="请选择起点科室">
1525
+            <nz-form-item nz-row *ngIf="checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013">
1526
+              <nz-form-label [nzSpan]="4" nzRequired nzFor="originOffice">起点科室</nz-form-label>
1527
+              <nz-form-control [nzSpan]="20" nzErrorTip="请选择起点科室!">
1528
+                <nz-select formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', checkedShowMsg, $event)" nzPlaceHolder="请选择起点科室">
1529 1529
                   <ng-container *ngFor="let option of checkedShowMsg.start.start.list">
1530 1530
                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
1531 1531
                   </ng-container>
@@ -1536,8 +1536,21 @@
1536 1536
                 </nz-select>
1537 1537
               </nz-form-control>
1538 1538
             </nz-form-item>
1539
+            <!-- 其他情况 -->
1540
+            <nz-form-item nz-row *ngIf="checkedShowMsg.start && !(checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015)">
1541
+              <nz-form-label [nzSpan]="4" nzRequired nzFor="originOffice">起点科室</nz-form-label>
1542
+              <nz-form-control [nzSpan]="20" nzErrorTip="请选择起点科室!">
1543
+                <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.start.start.list[0].deptalias : checkedShowMsg.start.start.list[0].dept}}</span>
1544
+              </nz-form-control>
1545
+            </nz-form-item>
1546
+            <nz-form-item nz-row *ngIf="checkedShowMsg.end && !(checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013)">
1547
+              <nz-form-label [nzSpan]="4" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
1548
+              <nz-form-control [nzSpan]="20" nzErrorTip="请选择目标科室!">
1549
+                <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.end.end.list[0].deptalias : checkedShowMsg.end.end.list[0].dept}}</span>
1550
+              </nz-form-control>
1551
+            </nz-form-item>
1539 1552
             <!-- 100014 (护士端一键建单展示策略)取终点科室和msg 值展示 -->
1540
-            <nz-form-item nz-row *ngIf="checkedShowMsg.status != 200 && (checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015)">
1553
+            <nz-form-item nz-row *ngIf="checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015">
1541 1554
               <nz-form-label [nzSpan]="4" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
1542 1555
               <nz-form-control [nzSpan]="20" nzErrorTip="请选择目标科室!">
1543 1556
                 <nz-select formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target', checkedShowMsg, $event)" nzPlaceHolder="请选择目标科室">
@@ -1551,27 +1564,36 @@
1551 1564
                 </nz-select>
1552 1565
               </nz-form-control>
1553 1566
             </nz-form-item>
1554
-            <!-- 自动送回 -->
1555
-            <nz-form-item *ngIf="checkedShowMsg.status != 200 && checkedShowMsg.isRemand == 1">
1556
-              <nz-form-control>
1557
-                <label nz-checkbox [(ngModel)]="isRemand" [ngModelOptions]="{ standalone: true }">自动送回</label>
1558
-              </nz-form-control>
1559
-            </nz-form-item>
1560
-            <!-- 是否加急 -->
1561
-            <nz-form-item *ngIf="current_allowUrgent">
1562
-              <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="allowUrgent" class="goods">是否加急</nz-form-label>
1567
+            <div class="display_flex">
1568
+              <!-- 自动送回 -->
1569
+              <nz-form-item class="isRemand" *ngIf="checkedShowMsg.status != 200 && checkedShowMsg.isRemand == 1">
1570
+                <nz-form-control>
1571
+                  <label nz-checkbox [(ngModel)]="isRemand" [ngModelOptions]="{ standalone: true }">自动送回</label>
1572
+                </nz-form-control>
1573
+              </nz-form-item>
1574
+              <!-- 是否加急 -->
1575
+              <nz-form-item nz-row *ngIf="current_allowUrgent" class="allowUrgent">
1576
+                <nz-form-label [nzSpan]="3" nzFor="allowUrgent" class="goods">是否加急</nz-form-label>
1577
+                <nz-form-control [nzSpan]="6" style="margin-left: 24px;">
1578
+                  <nz-radio-group [(ngModel)]="allowUrgent" (ngModelChange)="allowUrgentChange($event)" formControlName="allowUrgent">
1579
+                    <label nz-radio nzValue="1">是</label>
1580
+                    <label nz-radio nzValue="0">否</label>
1581
+                  </nz-radio-group>
1582
+                </nz-form-control>
1583
+              </nz-form-item>
1584
+            </div>
1585
+            <!-- 加急原因 -->
1586
+            <nz-form-item nz-row *ngIf="current_allowUrgent && allowUrgent == 1">
1587
+              <nz-form-label [nzSpan]="24" nzRequired nzFor="urgentReason" class="goods">加急原因</nz-form-label>
1563 1588
               <nz-form-control>
1564
-                <nz-radio-group [(ngModel)]="allowUrgent" (ngModelChange)="allowUrgentChange($event)" formControlName="allowUrgent">
1565
-                  <label nz-radio nzValue="1">是</label>
1566
-                  <label nz-radio nzValue="0">否</label>
1567
-                </nz-radio-group>
1589
+                <textarea rows="4" placeholder="请输入加急原因" nz-input [(ngModel)]="urgentReason" formControlName="urgentReason"></textarea>
1568 1590
               </nz-form-control>
1569 1591
             </nz-form-item>
1570 1592
             <!-- 工单备注 -->
1571 1593
             <ng-container *ngIf="isRemarks">
1572 1594
               <nz-form-item>
1573 1595
                 <div class="display_flex align-items_center">
1574
-                  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="workOrderRemark2" class="mt8 mb8">工单备注</nz-form-label>
1596
+                  <nz-form-label nzFor="workOrderRemark2" class="mt8 mb8">工单备注</nz-form-label>
1575 1597
                   <div *ngIf="customRemarks2.length" style="word-break: break-all;">
1576 1598
                     <span class="addRemarks" *ngFor="let item of customRemarks2" (click)="addRemarks2(item)">【{{ item }}】</span>
1577 1599
                   </div>
@@ -1582,19 +1604,12 @@
1582 1604
               </nz-form-item>
1583 1605
             </ng-container>
1584 1606
             <!-- 携带设备 -->
1585
-            <nz-form-item *ngIf="!isRemarks && goodsLis.length">
1586
-              <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="goods" class="goods">携带设备</nz-form-label>
1587
-              <nz-form-control>
1607
+            <nz-form-item nz-row *ngIf="!isRemarks && goodsLis.length">
1608
+              <nz-form-label [nzSpan]="4" nzFor="goods" class="goods">携带设备</nz-form-label>
1609
+              <nz-form-control [nzSpan]="20">
1588 1610
                 <nz-checkbox-group formControlName="goods" [(ngModel)]="goodsLis"></nz-checkbox-group>
1589 1611
               </nz-form-control>
1590 1612
             </nz-form-item>
1591
-            <!-- 加急原因 -->
1592
-            <nz-form-item *ngIf="current_allowUrgent && allowUrgent == 1">
1593
-              <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="urgentReason" class="goods">加急原因</nz-form-label>
1594
-              <nz-form-control>
1595
-                <textarea rows="4" placeholder="请输入加急原因" nz-input [(ngModel)]="urgentReason" formControlName="urgentReason"></textarea>
1596
-              </nz-form-control>
1597
-            </nz-form-item>
1598 1613
           </ng-container>
1599 1614
         </form>
1600 1615
       </div>

+ 20 - 0
src/app/views/hushijiandan/hushijiandan.component.less

@@ -2593,6 +2593,7 @@
2593 2593
 }
2594 2594
 .patient ::ng-deep .ant-form-item-label{
2595 2595
   line-height: 32px!important;
2596
+  flex-shrink: 0;
2596 2597
 }
2597 2598
 .patient{
2598 2599
   .modalBody{
@@ -2624,6 +2625,22 @@
2624 2625
       }
2625 2626
       .patientForm{
2626 2627
         padding: 16px 24px;
2628
+        .addRemarks{
2629
+          font-size: 18px;
2630
+        }
2631
+        .goods{
2632
+          margin-top: 5px;
2633
+        }
2634
+        .isRemand{
2635
+          margin-right: 98px;
2636
+        }
2637
+        .allowUrgent{
2638
+          flex: 1;
2639
+        }
2640
+        .readonly{
2641
+          line-height: 32px;
2642
+          font-size: 18px;
2643
+        }
2627 2644
         .radioGroup{
2628 2645
           line-height: normal;
2629 2646
         }
@@ -2631,8 +2648,11 @@
2631 2648
           left: 125px;
2632 2649
           &.pos-tip{
2633 2650
             left: 100px;
2651
+            width: calc(100% - 100px);
2634 2652
             .pos-red{
2635 2653
               margin-top: 13px;
2654
+              display: inline-block;
2655
+              width: 100%;
2636 2656
             }
2637 2657
           }
2638 2658
           .pos-red{