|
@@ -4,7 +4,7 @@
|
4
|
4
|
<div class="address">
|
5
|
5
|
<div class="contentHead">工时大类
|
6
|
6
|
<div>
|
7
|
|
- <button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="operation(1)">{{activeCategory1.disable==1?'停用':'启用'}}</button>
|
|
7
|
+ <button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="operation(1)">{{activeCategory1.disableType==1?'停用':'启用'}}</button>
|
8
|
8
|
<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="addLogModal(1)">日志</button>
|
9
|
9
|
<button nz-button class="mar-rig-10 btn cancel" nzType="default" nzSize="small" *ngIf="activeCategory1.id && categoryList1.length" (click)="delCategoryModal(1)">删除</button>
|
10
|
10
|
<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id && categoryList1.length" (click)="editCategoryModal(1)">编辑</button>
|
|
@@ -13,13 +13,13 @@
|
13
|
13
|
</div>
|
14
|
14
|
<overlay-scrollbars #osComponentRef1 class="contentBody">
|
15
|
15
|
<nz-spin nzSimple [nzSpinning]="categoryLoading1" class="mt8 text_align_center"></nz-spin>
|
16
|
|
- <div [hidden]="categoryLoading1" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分 - {{item.disable==0?'禁用':'启用'}}</div>
|
|
16
|
+ <div [hidden]="categoryLoading1" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分 - {{item.disableType==0?'停用':'启用'}}</div>
|
17
|
17
|
</overlay-scrollbars>
|
18
|
18
|
</div>
|
19
|
19
|
<div class="address">
|
20
|
20
|
<div class="contentHead">工时小类
|
21
|
21
|
<div>
|
22
|
|
- <button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory2.id && activeCategory1.disable==1 && activeCategory1.id" (click)="operation(2)">{{activeCategory2.disable==1?'停用':'启用'}}</button>
|
|
22
|
+ <button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory2.id && activeCategory1.disableType==1 && activeCategory1.id" (click)="operation(2)">{{activeCategory2.disableType==1?'停用':'启用'}}</button>
|
23
|
23
|
<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory2.id && activeCategory1.id" (click)="addLogModal(2)">日志</button>
|
24
|
24
|
<button nz-button class="mar-rig-10 btn cancel" *ngIf="activeCategory2.id && activeCategory1.id" nzType="default" nzSize="small" (click)="delCategoryModal(2)">删除</button>
|
25
|
25
|
<button nz-button class="mar-rig-10 btn" *ngIf="activeCategory2.id && activeCategory1.id" nzType="primary" nzSize="small" (click)="editCategoryModal(2)">编辑</button>
|
|
@@ -28,7 +28,7 @@
|
28
|
28
|
</div>
|
29
|
29
|
<overlay-scrollbars #osComponentRef2 class="contentBody">
|
30
|
30
|
<nz-spin nzSimple [nzSpinning]="categoryLoading2" class="mt8 text_align_center"></nz-spin>
|
31
|
|
- <div [hidden]="categoryLoading2" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分 - {{item.disable==0?'禁用':'启用'}}</div>
|
|
31
|
+ <div [hidden]="categoryLoading2" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分 - {{item.disableType==0?'停用':'启用'}}</div>
|
32
|
32
|
</overlay-scrollbars>
|
33
|
33
|
</div>
|
34
|
34
|
</div>
|
|
@@ -142,6 +142,7 @@
|
142
|
142
|
[nzLoading]="loading2">
|
143
|
143
|
<thead>
|
144
|
144
|
<tr class="thead">
|
|
145
|
+ <th>事件单号</th>
|
145
|
146
|
<th>动作</th>
|
146
|
147
|
<th>操作时间</th>
|
147
|
148
|
<th>操作人</th>
|
|
@@ -150,6 +151,7 @@
|
150
|
151
|
</thead>
|
151
|
152
|
<tbody>
|
152
|
153
|
<tr *ngFor="let data of listLogOfData">
|
|
154
|
+ <td>{{ data.incidentDTO ? data.incidentDTO.incidentsign : '-' }}</td>
|
153
|
155
|
<td>{{ data.operationType ? data.operationType.name : '-' }}</td>
|
154
|
156
|
<td>{{ data.operationTime|date:'yyyy-MM-dd HH:mm'}}</td>
|
155
|
157
|
<td>{{ data.operationUserDTO ? data.operationUserDTO.name : '-' }}</td>
|