Merge branch 'master' into develop

src/app/views/common-document/common-document.component.html

@@ -10,10 +10,9 @@
 				<div class="item" (click)='editTree(3)'>修改</div>
 			</div>
 			<div class="tree-content">
-				<nz-tree [nzData]="nodes" 
+				<nz-tree [nzData]="nodes"
 				(nzClick)="nodeClick($event)"
 				(nzDblClick)="openFolder($event)"
-				[nzExpandedIcon]="mutiExpandedIconTpl"
 				[nzTreeTemplate]="nzTreeTemplate"
 				[nzTreeTemplate]="nzTreeTemplate"
 				>
@@ -179,7 +178,7 @@
 <!-- 删除树结构模态框 -->
   <app-dialog-delete [delModal]="delTreeModal" (hideDelModalEvent)="hideTreeModal()" [btnLoading]="btnLoading"
     (confirmDelEvent)="confirmTree()" content="您确认要删除目录吗？"></app-dialog-delete>
-		
+
 <!-- 新增一级目录 -->
 <div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="addModal">
 	<div class="modalAddBody">
@@ -210,4 +209,4 @@
 			<button class="btn cancel" nz-button nzType="default" (click)="hideAddModal()">取消</button>
 		</div>
 	</div>
-</div>
+</div>

src/app/views/web-repairs/web-repairs.component.html

@@ -172,7 +172,7 @@
 						</nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item>
 				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="floorId">楼层</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择楼层!">
@@ -183,7 +183,7 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
 				<nz-form-item>
 				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="address">详细地址</nz-form-label>
 				  <nz-form-control>
@@ -192,7 +192,7 @@
 				    </nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				
+
         <nz-form-item>
           <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="phone">联系电话</nz-form-label>
           <nz-form-control>
@@ -228,18 +228,18 @@
 					<div class="form-title"><span class="font-weight-500">患者信息：</span>{{detailsData.patientDTO.patientName}} ({{detailsData.patientDTO.bedNum}}床)</div>
 					<div class="form-title"><span class="font-weight-500">年龄：</span>{{detailsData.patientDTO.age||'-'}}岁</div>
 				</div>
-				
+
 				<div class="form-title-box">
 					<div class="form-title"><span class="font-weight-500">检验项目：</span>{{project||'无'}}</div>
 				</div>
-				
+
 				<div class="form-list">
 					<div class="form-title font-weight-500">诊断：</div>
 					<div class="indent">
 						{{detailsData.diagnose||'无'}}
 					</div>
 				</div>
-				
+
 				<div class="form-list">
 					<div class="form-title font-weight-500">病历摘要：</div>
 					<div class="indent">{{detailsData.medicalRecords||'无'}}</div>
@@ -254,13 +254,13 @@
 					<div class="form-title"><span class="font-weight-500">标本数量：</span>{{detailsData.specimenNum||'无'}}</div>
 					<div class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
 				</div>
-				
+
 				<div class="form-title-box">
 					<div class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
 					<div class="form-title"><span class="font-weight-500">离体时间：</span>{{detailsData.inVitroTime?(detailsData.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
 					<div class="form-title"><span class="font-weight-500">固定时间：</span>{{detailsData.fixationTime?(detailsData.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
 				</div>
-				
+
 				<div class="form-list">
 					<div class="form-title font-weight-500">标本：</div>
 					<div class="form-title specimen-list">
@@ -271,7 +271,7 @@
 				</div>
 
 			</div>
-			
+
 			<div class="content-item-right">
 				<div class="step-title">病理闭环</div>
 				<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
@@ -303,13 +303,13 @@
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
-	
+
 
 <div class="mask-style" *ngIf="isSpinning">
 	<nz-spin nzSimple class="spin-style"></nz-spin>
 </div>
 
-<router-outlet (deactivate)="getConnectList($event)"></router-outlet>
+<router-outlet (deactivate)="getConnectList()"></router-outlet>
 
 <!-- 快速报修 -->
 <div class="commonModal display_flex justify-content_flex-center align-items_center" *ngIf="bxModal" (click)="clickExtra($event)">
@@ -419,4 +419,4 @@
   [btnLoading]="btnLoading"
   (confirmDelEvent)="confirmDelBx()"
   content="您确认要撤销吗？"
-></app-dialog-delete>
+></app-dialog-delete>