浏览代码

拉取代码

maotao 1 月之前
父节点
当前提交
59501be2d2

+ 6 - 4
src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.html

@@ -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>

+ 17 - 8
src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.ts

@@ -199,10 +199,14 @@ export class ConfigurationManHourComponent implements OnInit {
199 199
 	operationContent: string = null; 
200 200
 	operation(type:number){
201 201
 		if(type==1){
202
-			let msg = this.activeCategory1.disable==1?'停用':'启用'
203
-			this.operationContent = `您确认${msg}大类工时吗?${msg}后所有小类同时${msg}`
202
+			let msg = this.activeCategory1.disableType==1?'停用':'启用'
203
+			if(this.activeCategory1.disableType==1){
204
+				this.operationContent = `您确认${msg}大类工时吗?${msg}后所有小类同时${msg}`
205
+			}else{
206
+				this.operationContent = `您确认${msg}大类工时吗?`
207
+			}
204 208
 		}else{
205
-			let msg = this.activeCategory2.disable==1?'停用':'启用'
209
+			let msg = this.activeCategory2.disableType==1?'停用':'启用'
206 210
 			this.operationContent = `您确认${msg}小类工时吗?`
207 211
 		}
208 212
 		this.coopType = type;
@@ -221,17 +225,17 @@ export class ConfigurationManHourComponent implements OnInit {
221 225
 	// 确认启用/停用
222 226
 	confirmOperation() {
223 227
 	  let that = this;
224
-		let disable = null
228
+		let disableType = null
225 229
 	  that.btnLoading = true;
226
-		if(this['activeCategory' + this.coopType].disable==1){
227
-			disable = 0
230
+		if(this['activeCategory' + this.coopType].disableType==1){
231
+			disableType = 0
228 232
 		}else{
229
-			disable = 1
233
+			disableType = 1
230 234
 		}
231 235
 		let postData = {
232 236
 		  workHourManagement: {
233 237
 				...this['activeCategory' + this.coopType],
234
-				disable:disable,
238
+				disableType:disableType,
235 239
 				upType: 'disable'
236 240
 		  }
237 241
 		}
@@ -239,6 +243,11 @@ export class ConfigurationManHourComponent implements OnInit {
239 243
 	    .coopData('updData', 'workHourManagement', postData)
240 244
 	    .subscribe((data) => {
241 245
 	      that.btnLoading = false;
246
+				if(disableType==1){
247
+					this['activeCategory' + this.coopType].disableType = 1
248
+				}else{
249
+					this['activeCategory' + this.coopType].disableType = 0
250
+				}
242 251
 	      that.hideOperationModal();
243 252
 				if(this.coopType==1){
244 253
 					this.categoryList2 = []

+ 1 - 1
src/app/components/incidentManagement/incident-handle-order/incident-handle-order.component.ts

@@ -386,7 +386,7 @@ export class IncidentHandleOrderComponent implements OnInit {
386 386
       workHourManagement: {
387 387
         hosId: this.hosId,
388 388
         showSecond: 1,
389
-				disable:1
389
+				disableType:1
390 390
       },
391 391
       idx: 0,
392 392
       sum: 9999,

+ 2 - 0
src/app/views/assets-consumable/assets-consumable.component.html

@@ -147,6 +147,7 @@
147 147
 	          [nzLoading]="loading2">
148 148
 	          <thead>
149 149
 	            <tr class="thead">
150
+								<th>事件单号</th>
150 151
 								<th>动作</th>
151 152
 	              <th>操作时间</th>
152 153
 	              <th>操作人</th>
@@ -155,6 +156,7 @@
155 156
 	          </thead>
156 157
 	          <tbody>
157 158
 	            <tr *ngFor="let data of listLogOfData">
159
+								<td>{{data.incidentDTO?data.incidentDTO.incidentsign:'-'}}</td>
158 160
 								<td>{{ data.operationType ? data.operationType.name : '-' }}</td>
159 161
 	              <td>{{ data.time|date:'yyyy-MM-dd HH:mm'}}</td>
160 162
 	              <td>{{ data.operator ? data.operator.name : '-' }}</td>

+ 1 - 1
src/app/views/assets-consumable/assets-consumable.component.ts

@@ -203,7 +203,7 @@ export class AssetsConsumableComponent implements OnInit {
203 203
 	// 查看日志
204 204
 	itemData:any = {};
205 205
 	logModal:boolean = false;
206
-	showLogModal(data, e){
206
+	showLogModal(e, data){
207 207
 		this.itemData = data;
208 208
 		this.getLogList(1)
209 209
 	}