Merge branch 'develop' into lmm

src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -1,6 +1,6 @@
 <div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
   <div class="modalBody" style="width: 1200px;">
-    <div class="title" *ngIf="(type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal');else elseTpl">药品详情<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="title" *ngIf="(type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal');else elseTpl">{{configs.drugsModel === 1 ? '药品详情' : '药包详情'}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
     <ng-template #elseTpl>
       <div class="title">业务数据查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
     </ng-template>
@@ -71,8 +71,8 @@
             <th nzWidth="10%">收取交接人</th>
             <th nzWidth="14%">收取时间</th>
             <th nzWidth="10%">送达人</th>
-            <th nzWidth="14%">送达交接人</th>
-            <th nzWidth="10%">送达时间</th>
+            <th nzWidth="10%">送达交接人</th>
+            <th nzWidth="14%">送达时间</th>
           </tr>
         </thead>
         <tbody>
@@ -81,12 +81,12 @@
             <td>{{ data.batchNo }}</td>
             <td>{{ data.drugsTypeCount }}</td>
             <td>{{ data.drugsCount }}</td>
-            <td><ng-container *ngIf="handoverStartObj">{{handoverStartObj.username}}</ng-container></td>
-            <td><ng-container *ngIf="handoverStartObj && handoverStartObj.handoverUserid">{{handoverStartObj.handoverUserid.name}}</ng-container></td>
-            <td><ng-container *ngIf="handoverStartObj">{{handoverStartObj.operationTime}}</ng-container></td>
-            <td><ng-container *ngIf="handoverEndObj">{{handoverEndObj.username}}</ng-container></td>
-            <td><ng-container *ngIf="handoverEndObj && handoverEndObj.handoverUserid">{{handoverEndObj.handoverUserid.name}}</ng-container></td>
-            <td><ng-container *ngIf="handoverEndObj">{{handoverEndObj.operationTime}}</ng-container></td>
+            <td><ng-container *ngIf="data.startLog">{{data.startLog.username}}</ng-container></td>
+            <td><ng-container *ngIf="data.startLog">{{data.startLog.handoverName}}</ng-container></td>
+            <td><ng-container *ngIf="data.startLog">{{data.startLog.operationTime | date:'yyyy-MM-dd HH:mm'}}</ng-container></td>
+            <td><ng-container *ngIf="data.endLog">{{data.endLog.username}}</ng-container></td>
+            <td><ng-container *ngIf="data.endLog">{{data.endLog.handoverName}}</ng-container></td>
+            <td><ng-container *ngIf="data.endLog">{{data.endLog.operationTime | date:'yyyy-MM-dd HH:mm'}}</ng-container></td>
           </tr>
         </tbody>
       </nz-table>

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -248,8 +248,6 @@ export class BusinessDataDetailModalComponent implements OnInit {
   // 获取新药品一单多码列表
   drugsBugMultipleList: any = [];// 药包列表
   workOrder:any = {};// 工单
-  handoverStartObj:any = {};// 接收人
-  handoverEndObj:any = {};// 送达人
   getDrugsBugMultiple(idx, drugsModel) {
     if (idx) {
       this.pageIndex = 1;
@@ -268,9 +266,6 @@ export class BusinessDataDetailModalComponent implements OnInit {
           this.workOrder = res.data.workOrder || {};
           this.total = this.drugsBugMultipleList.length;
 
-          this.handoverStartObj = this.workOrder.record.find(v => v.operation.value == 8);
-          this.handoverEndObj = this.workOrder.record.find(v => v.operation.value == 10);
-
           if(drugsModel === 1){
             // 一单一码
             if(this.drugsBugMultipleList.length){

src/app/views/fuwutai/fuwutai.component.ts

@@ -2386,6 +2386,7 @@ export class FuwutaiComponent implements OnInit {
         this.incidentMsg = isInit ? this.incidentMsg : {};
         this.isBuildOrderAgagin = false;
         this.applyDept = null;
+        this.countRemarkIndex = -1;
         this.incidentModel.department = isInit ? this.incidentModel.department : null;
 
         //正常初始化
@@ -2427,6 +2428,7 @@ export class FuwutaiComponent implements OnInit {
     this.incidentMsg = isInit ? this.incidentMsg : {};
     this.isBuildOrderAgagin = false;
     this.applyDept = null;
+    this.countRemarkIndex = -1;
     this.incidentModel.department = isInit ? this.incidentModel.department : null;
     console.log(des);
     if (des === "no") {