拉取代码

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.html

@@ -4,7 +4,7 @@
     <div class="address">
       <div class="contentHead">工时大类
 				<div>
-					<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="operation(1)">{{activeCategory1.disable==1?'停用':'启用'}}</button>
+					<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="operation(1)">{{activeCategory1.disableType==1?'停用':'启用'}}</button>
 					<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="addLogModal(1)">日志</button>
 					<button nz-button class="mar-rig-10 btn cancel" nzType="default" nzSize="small" *ngIf="activeCategory1.id && categoryList1.length" (click)="delCategoryModal(1)">删除</button>
           <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 @@
 			</div>
       <overlay-scrollbars #osComponentRef1 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading1" class="mt8 text_align_center"></nz-spin>
-        <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>
+        <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>
       </overlay-scrollbars>
     </div>
     <div class="address">
       <div class="contentHead">工时小类
 				<div>
-					<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>
+					<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>
 					<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory2.id && activeCategory1.id" (click)="addLogModal(2)">日志</button>
 					<button nz-button class="mar-rig-10 btn cancel" *ngIf="activeCategory2.id && activeCategory1.id" nzType="default" nzSize="small" (click)="delCategoryModal(2)">删除</button>
           <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 @@
 			</div>
       <overlay-scrollbars #osComponentRef2 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading2" class="mt8 text_align_center"></nz-spin>
-        <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>
+        <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>
       </overlay-scrollbars>
     </div>
   </div>
@@ -142,6 +142,7 @@
 	          [nzLoading]="loading2">
 	          <thead>
 	            <tr class="thead">
+								<th>事件单号</th>
 								<th>动作</th>
 	              <th>操作时间</th>
 	              <th>操作人</th>
@@ -150,6 +151,7 @@
 	          </thead>
 	          <tbody>
 	            <tr *ngFor="let data of listLogOfData">
+								<td>{{ data.incidentDTO ? data.incidentDTO.incidentsign : '-' }}</td>
 	            	<td>{{ data.operationType ? data.operationType.name : '-' }}</td>
 	            	<td>{{ data.operationTime|date:'yyyy-MM-dd HH:mm'}}</td>
 	            	<td>{{ data.operationUserDTO ? data.operationUserDTO.name : '-' }}</td>

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.ts

@@ -199,10 +199,14 @@ export class ConfigurationManHourComponent implements OnInit {
 	operationContent: string = null; 
 	operation(type:number){
 		if(type==1){
-			let msg = this.activeCategory1.disable==1?'停用':'启用'
-			this.operationContent = `您确认${msg}大类工时吗？${msg}后所有小类同时${msg}`
+			let msg = this.activeCategory1.disableType==1?'停用':'启用'
+			if(this.activeCategory1.disableType==1){
+				this.operationContent = `您确认${msg}大类工时吗？${msg}后所有小类同时${msg}`
+			}else{
+				this.operationContent = `您确认${msg}大类工时吗？`
+			}
 		}else{
-			let msg = this.activeCategory2.disable==1?'停用':'启用'
+			let msg = this.activeCategory2.disableType==1?'停用':'启用'
 			this.operationContent = `您确认${msg}小类工时吗？`
 		}
 		this.coopType = type;
@@ -221,17 +225,17 @@ export class ConfigurationManHourComponent implements OnInit {
 	// 确认启用/停用
 	confirmOperation() {
 	  let that = this;
-		let disable = null
+		let disableType = null
 	  that.btnLoading = true;
-		if(this['activeCategory' + this.coopType].disable==1){
-			disable = 0
+		if(this['activeCategory' + this.coopType].disableType==1){
+			disableType = 0
 		}else{
-			disable = 1
+			disableType = 1
 		}
 		let postData = {
 		  workHourManagement: {
 				...this['activeCategory' + this.coopType],
-				disable:disable,
+				disableType:disableType,
 				upType: 'disable'
 		  }
 		}
@@ -239,6 +243,11 @@ export class ConfigurationManHourComponent implements OnInit {
 	    .coopData('updData', 'workHourManagement', postData)
 	    .subscribe((data) => {
 	      that.btnLoading = false;
+				if(disableType==1){
+					this['activeCategory' + this.coopType].disableType = 1
+				}else{
+					this['activeCategory' + this.coopType].disableType = 0
+				}
 	      that.hideOperationModal();
 				if(this.coopType==1){
 					this.categoryList2 = []

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

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

src/app/views/assets-consumable/assets-consumable.component.html

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

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

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