Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/views/hushijiandan/hushijiandan.component.html

@@ -535,7 +535,8 @@
                         </div>
                         <overlay-scrollbars #osComponentRef2 class="otherBox-nav__main" [ngStyle]="{ height: '100%' }">
                           <div class="otherBox-nav__mainInner" *ngIf="!oLoading && othersList[checkedTableType]?.length > 0">
-                            <div [sortablejs]="othersList[checkedTableType]" [sortablejsOptions]="othersListOptions" class="w100">
+                            <!-- <div [sortablejs]="othersList[checkedTableType]" [sortablejsOptions]="othersListOptions" class="w100"> -->
+                            <div class="w100">
                               <div class="otherBox-nav__mainItem" *ngFor="let item of othersList[checkedTableType]" (click)="otherClick(item)" [ngClass]="{ active: selectOtherId == item.id }" [title]="item.taskName">
                                 {{ item.taskName }}
                               </div>
@@ -2387,11 +2388,11 @@
 				<nz-form-item>
 					<nz-form-label [nzSm]="4" [nzXs]="4" nzFor="description">图片上传</nz-form-label>
 					<nz-form-control style="display: inline-block;" *ngIf="repairImgs.length === 0">
-					  <nz-upload nzListType="picture-card" [(nzFileList)]="fileList" 
-						[nzShowUploadList]="showUploadList" [nzPreview]="handlePreview" 
-						nzFileType="image/jpeg,image/png" nzAccept="image/jpeg,image/png" 
-						[nzShowButton]="fileList.length < 3" 
-						[nzBeforeUpload]="beforeUpload" [nzAction]="temporarilyUrl" 
+					  <nz-upload nzListType="picture-card" [(nzFileList)]="fileList"
+						[nzShowUploadList]="showUploadList" [nzPreview]="handlePreview"
+						nzFileType="image/jpeg,image/png" nzAccept="image/jpeg,image/png"
+						[nzShowButton]="fileList.length < 3"
+						[nzBeforeUpload]="beforeUpload" [nzAction]="temporarilyUrl"
 						[nzSize]="10240">
 					    <i nz-icon nzType="plus"></i>
 					    <div class="ant-upload-text">上传照片</div>