From 2d4cbcc4f92edbc4f926d9710bdda64520039c2b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 05 Jan 2018 11:21:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/routes/users/installer/installer.component.html |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/app/routes/users/installer/installer.component.html b/src/app/routes/users/installer/installer.component.html
index 4e66c78..849b08c 100644
--- a/src/app/routes/users/installer/installer.component.html
+++ b/src/app/routes/users/installer/installer.component.html
@@ -82,10 +82,12 @@
       <td nz-td>{{format_date(i.expireTime)}}</td>
       <td nz-td>
         <a (click)="edit(i)">������</a>
+        <ng-container *ngIf="i.isDelete == '0'">
         <span nz-table-divider></span>
           <nz-popconfirm [nzTitle]="'���������������������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(i)" >
             <a nz-popconfirm>������</a>
           </nz-popconfirm>
+         </ng-container>
       </td>
     </tr>
     </tbody>

--
Gitblit v1.8.0