shaojiahao
/
Jinan_project
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[完善]删除按钮

非煤矿山灾害智能感知和预警系统
邵佳豪 3 years ago
parent
50e19317ec
commit
7c2994e925
2 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/app/home/task/station-task-execution/station-task-execution.component.html
  2. 12
      src/app/home/task/station-weekly-plan/station-weekly-plan.component.html

8
src/app/home/task/station-task-execution/station-task-execution.component.html
Unescape View File

@ -189,10 +189,10 @@
<span> <span>
<a class="blue" (click)="look(item)" style="margin-right: 5px;">查看</a> <a class="blue" (click)="look(item)" style="margin-right: 5px;">查看</a>
<a class="blue" (click)="complete(item)" style="margin-right: 5px;">完成</a> <a class="blue" (click)="complete(item)" style="margin-right: 5px;">完成</a>
<a *ngIf="item.creationType != '自主任务' && item.approvalStatus != '已检查'" class="red" <a *ngIf="item.creationType != '自主任务' && item.approvalStatus != '已检查' && item.approvalStatus != '检查中'"
(click)="cancel(item)">驳回</a> class="red" (click)="cancel(item)">驳回</a>
<a *ngIf="item.creationType == '自主任务' && item.approvalStatus != '已检查'" class="red" <a *ngIf="item.creationType == '自主任务' && item.approvalStatus != '已检查' && item.approvalStatus != '检查中'"
(click)="delete(item)">删除</a> class="red" (click)="delete(item)">删除</a>
</span> </span>
<span> <span>
操作 操作

12
src/app/home/task/station-weekly-plan/station-weekly-plan.component.html
Unescape View File

@ -101,13 +101,13 @@
class="itemtwocontentitemp1name">{{i.company.companyName}}<span>({{i.creationType}})</span></span> class="itemtwocontentitemp1name">{{i.company.companyName}}<span>({{i.creationType}})</span></span>
<span class="marginr5"> <span class="marginr5">
<span class="green" <span class="green"
*ngIf="isExpand && i.approvalStatus!='已检查' && i.relatedTaskId&& i.approvalStatus!='待检查'" *ngIf="isExpand && i.approvalStatus!='已检查' && i.relatedTaskId&& i.approvalStatus!='待检查' && i.approvalStatus!='检查中'"
(click)="accept(i,item)">接受</span> (click)="accept(i,item)">接受</span>
<span class="red" <span class="red"
*ngIf="isExpand && i.approvalStatus!='已检查' && i.relatedTaskId && i.approvalStatus!='待检查'" *ngIf="isExpand && i.approvalStatus!='已检查' && i.relatedTaskId && i.approvalStatus!='待检查' && i.approvalStatus!='检查中'"
(click)="reject(i,item)">拒绝</span> (click)="reject(i,item)">拒绝</span>
<span class="red" <span class="red"
*ngIf="isExpand && i.creationType == '自主任务' && i.approvalStatus != '已检查'" *ngIf="isExpand && i.creationType == '自主任务' && i.approvalStatus != '已检查' && i.approvalStatus!='检查中'"
(click)="delete(i,item)">删除</span> (click)="delete(i,item)">删除</span>
<span *ngIf="isExpand">({{i.approvalStatus}})</span> <span *ngIf="isExpand">({{i.approvalStatus}})</span>
</span> </span>
@ -115,13 +115,13 @@
<p>{{i.company.organization.name}}</p> <p>{{i.company.organization.name}}</p>
<p class="marginr5"> <p class="marginr5">
<span class=" green" <span class=" green"
*ngIf="!isExpand && i.approvalStatus!='已检查' && i.relatedTaskId&& i.approvalStatus!='待检查'" *ngIf="!isExpand && i.approvalStatus!='已检查' && i.relatedTaskId && i.approvalStatus!='待检查' && i.approvalStatus!='检查中'"
(click)="accept(i,item)">接受</span> (click)="accept(i,item)">接受</span>
<span class="red" <span class="red"
*ngIf="!isExpand && i.approvalStatus!='已检查' && i.relatedTaskId && i.approvalStatus!='待检查'" *ngIf="!isExpand && i.approvalStatus!='已检查' && i.relatedTaskId && i.approvalStatus!='待检查' && i.approvalStatus!='检查中'"
(click)="reject(i,item)">拒绝</span> (click)="reject(i,item)">拒绝</span>
<span class="red" <span class="red"
*ngIf="!isExpand && i.creationType == '自主任务' && i.approvalStatus != '已检查'" *ngIf="!isExpand && i.creationType == '自主任务' && i.approvalStatus != '已检查' && i.approvalStatus!='检查中'"
(click)="delete(i,item)">删除</span> (click)="delete(i,item)">删除</span>
<span *ngIf="!isExpand">({{i.approvalStatus}})</span> <span *ngIf="!isExpand">({{i.approvalStatus}})</span>
</p> </p>

Write Preview
Loading…
Cancel
Save