瀏覽代碼

标本配送备注优化

seimin 3 年之前
父節點
當前提交
a5e3affa81

+ 5 - 7
src/app/views/hushijiandan/hushijiandan.component.html

@@ -178,7 +178,8 @@
178 178
                     </div>
179 179
                     <div nz-col nzSpan="6" class="borderR h100p">
180 180
                       <div class="quick">
181
-                        <button class="btn txtC" (click)="newShortcutOrder1(bbMsg,'bb')">
181
+                        <button [nzLoading]="bLoading" nz-button nzType="primary" class="btn txtC"
182
+                          (click)="newShortcutOrder1(bbMsg,'bb')">
182 183
                           收取标本
183 184
                         </button>
184 185
                         <!-- <button class="btn txtC" (click)="newShortcutOrder1(bbMsg,'bb',true)">
@@ -1052,16 +1053,13 @@
1052 1053
       </div>
1053 1054
     </div>
1054 1055
     <!-- 标本配送备注 -->
1055
-    <!-- baba -->
1056 1056
     <div *ngIf="buildMsg1.remarksSwitch == 1">
1057
-      <p>工单备注:</p>
1058
-      <textarea nz-input [placeholder]="workOrderRemarkTips1"
1059
-        [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100"
1057
+      <p class="mt8 mb8">工单备注:</p>
1058
+      <textarea nz-input [placeholder]="workOrderRemarkTips1" [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100"
1060 1059
         [(ngModel)]="workOrderRemark1" #remarksEle1></textarea>
1061 1060
       <p class="mt8 mb8" *ngIf="customRemarks1.length">快捷输入:</p>
1062 1061
       <div *ngIf="customRemarks1.length">
1063
-        <span class="addRemarks" *ngFor="let item of customRemarks1"
1064
-          (click)="addRemarks1(item)">【{{item}}】</span>
1062
+        <span class="addRemarks" *ngFor="let item of customRemarks1" (click)="addRemarks1(item)">【{{item}}】</span>
1065 1063
       </div>
1066 1064
       <p class="mt8 mb8" *ngIf="historyCustomRemarks1.length">历史输入:</p>
1067 1065
       <div *ngIf="historyCustomRemarks1.length">

+ 5 - 0
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -1765,6 +1765,7 @@ export class HushijiandanComponent implements OnInit {
1765 1765
   shortcutMsg1; //一键发起信息
1766 1766
   buildMsg1: any = {}; //一键发起返回信息
1767 1767
   urgentFlag = false;
1768
+  bLoading = false;//收取标本的loading
1768 1769
   // 打开一键发起建单模态框,urgent为true的时候是紧急
1769 1770
   historyCustomRemarks1 = [];
1770 1771
   newShortcutOrder1(msg, type, urgent?) {
@@ -1781,6 +1782,7 @@ export class HushijiandanComponent implements OnInit {
1781 1782
       taskTypeId: msg.id,
1782 1783
       deptId: JSON.parse(localStorage.getItem("user")).user.dept.id,
1783 1784
     };
1785
+    this.bLoading = true;
1784 1786
     this.mainService
1785 1787
       .postCustom("nurse", "workOrder/buildTrip", postData)
1786 1788
       .subscribe((result) => {
@@ -1801,10 +1803,13 @@ export class HushijiandanComponent implements OnInit {
1801 1803
               taskTypeId: msg.id,
1802 1804
             })
1803 1805
             .subscribe((result1) => {
1806
+              this.bLoading = false;
1804 1807
               if (result1.state == 200) {
1805 1808
                 this.historyCustomRemarks1 = result1.data;
1806 1809
               }
1807 1810
             });
1811
+        }else{
1812
+          this.bLoading = false;
1808 1813
         }
1809 1814
       });
1810 1815
   }