修复

src/app/share/generate-floor/generate-floor.component.html

@@ -19,7 +19,7 @@
       <div class="mt8 red" *ngIf="(!building || !startFloor || !endFloor)">请填写楼栋，起始楼层和结束楼层！</div>
     </div>
     <div class="operate">
-      <button nz-button nzType="primary" (click)="confirmGenerate()">确认</button>
+      <button nz-button nzType="primary" (click)="confirmGenerate()" [nzLoading]="btnLoading">确认</button>
       <button class="btn cancel ml8" nz-button nzType="default" (click)="hideGenerateModal()">取消</button>
     </div>
   </div>

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

@@ -254,8 +254,8 @@
           <div class="info" nz-row>
             <div nz-col nzSpan="6">工单日期：{{orderInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
             <div nz-col nzSpan="6">总耗时：{{orderInfo.showTimeNum}}</div>
-            <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
-            <div nz-col nzSpan="4">支助人员信息：{{orderInfo.worker?orderInfo.worker.name:''}}</div>
+            <div nz-col nzSpan="6">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
+            <div nz-col nzSpan="6">支助人员信息：{{orderInfo.worker?orderInfo.worker.name:''}}</div>
           </div>
           <div class="info" nz-row>
             <div nz-col nzSpan="6">申请科室：{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:''}}
@@ -263,8 +263,10 @@
             <div nz-col nzSpan="6">
               目标科室：{{endDepts}}
             </div>
-            <div nz-col nzSpan="8" *ngIf="orderInfo.urgentDetails">加急状态：{{orderInfo.urgentDetails.checkStatus.name}}
+            <div nz-col nzSpan="6" *ngIf="orderInfo.urgentDetails">加急状态：{{orderInfo.urgentDetails.checkStatus.name}}
             </div>
+            <div nz-col nzSpan="6" *ngIf="orderInfo.drugs">
+              药包编码：{{orderInfo.drugs.batchNo}}</div>
           </div>
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
             <div nz-col nzSpan="24" class="jiaji">加急原因：{{orderInfo.urgentDetails.urgentReason}}</div>

src/app/views/building-floor/building-floor.component.ts

@@ -294,6 +294,8 @@ export class BuildingFloorComponent implements OnInit {
       .simplePost(flag ? "addListData" : "addData", "floor", postData)
       .subscribe((result) => {
         this.hideFloorModal();
+        this.generate1.delModal = false;
+        this.hideGenerateModal();
         this.btnLoading = false;
         if (result["status"] == 200) {
           this.showPromptModal(this.addFloor ? "新增" : "编辑", true, "");
@@ -408,8 +410,6 @@ export class BuildingFloorComponent implements OnInit {
       );
     });
     this.btnLoading = true;
-    this.generate1.delModal = false;
-    this.hideGenerateModal();
     this.addFloorHandler(arr, true);
   }
 }