拉取代码

src/app/components/incidentManagement/incident-handle-info-simple/incident-handle-info-simple.component.ts

@@ -36,14 +36,14 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
       if(v[0] === 'synergetic'){
         this.getSynergeticList(v[1]);
       }else if(v[0] === 'assetId'){
-        this.getAssetList(v[1]);
+        this.getAssetList('search', v[1]);
       }
     });
     this.init();
   }
 
   init(){
-    console.log('初始化')
+    console.log('初始化', this.incidentData)
     this.hosId = this.tool.getCurrentHospital().id;
     this.incidentDataCopy = cloneDeep(this.incidentData);
     this.incidentDataCopy.synergetic = [];
@@ -51,7 +51,7 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
     this.getHandleCategorys();
     this.getClosecodes();
     this.getSynergeticList();
-    this.getAssetList();
+    this.getAssetList('load', '');
   }
 
   // 边输边搜节流阀
@@ -141,10 +141,10 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
 
   // 获取资产列表
   assetList: any = [];
-  getAssetList(keyword = '') {
+  getAssetList(type, keyword = '') {
     let postData = {
       asset: {
-        hosId: this.hosId,
+        downHosId: this.hosId,
         name: keyword,
       },
       idx: 0,
@@ -153,7 +153,11 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
     this.mainService
       .getFetchDataList("simple/data", "asset", postData)
       .subscribe((data) => {
+				this.isLoading = false;
         this.assetList = data.list;
+				if(this.incidentDataCopy.assetDTO && type=='load'){
+					this.incidentDataCopy.assetId = Number(this.incidentDataCopy.assetId)
+				}
       });
   }
 

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

@@ -45,7 +45,7 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
       if(v[0] === 'synergetic'){
         this.getSynergeticList(v[1]);
       }else if(v[0] === 'assetId'){
-        this.getAssetList(v[1]);
+        this.getAssetList('search', v[1]);
       }else if(v[0] === 'category'){
         this.getIncidentCategoryList(v[1]);
       }
@@ -70,7 +70,7 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
     this.getHandleCategorys();
     this.getClosecodes();
     this.getSynergeticList();
-    this.getAssetList();
+    this.getAssetList('load');
     this.getIncidentCategoryList('', true);
   }
 
@@ -204,10 +204,10 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
 
   // 获取资产列表
   assetList: any = [];
-  getAssetList(keyword = '') {
+  getAssetList(type, keyword = '') {
     let postData = {
       asset: {
-        hosId: this.hosId,
+        downHosId: this.hosId,
         name: keyword,
       },
       idx: 0,
@@ -216,7 +216,11 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
     this.mainService
       .getFetchDataList("simple/data", "asset", postData)
       .subscribe((data) => {
+				this.isLoading = false;
         this.assetList = data.list;
+				if(this.incidentDataCopy.assetDTO && type=='load'){
+					this.incidentDataCopy.assetId = Number(this.incidentDataCopy.assetId)
+				}
       });
   }
 

src/app/views/emergency-info/emergency-info.component.html

@@ -97,7 +97,7 @@
 						<td>{{ data.alarmIp || '-' }}</td>
 						<td>{{ data.alarmUrgency?.name }}</td>
 						<td>{{ data.alarmActiveTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
-						<td class="text-underline" (click)="detail($event, data)">{{ data.incidentSign || '-' }}</td>
+						<td class="text-underline" (click)="detail($event, data)">{{ data.incidentSign }}</td>
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.view" (click)="look(data)">查看</span>

src/app/views/emergency-info/emergency-info.component.ts

@@ -363,6 +363,9 @@ export class EmergencyInfoComponent implements OnInit {
 	detailModalShow = false; //弹窗开关
 	detail(e, data) {
 	  e.stopPropagation();
+		if(!data.incidentSign){
+			return
+		}
 	  this.coopData = data;
 	  this.detailModalShow = true;
 	}

src/app/views/fuwutai/fuwutai.component.ts

@@ -954,9 +954,11 @@ export class FuwutaiComponent implements OnInit {
       });
   }
 	currentDept:any;
+	currentHospital:any;
   ngOnInit() {
     this.websocketLoading = true;
 		this.currentDept = this.tool.getCurrentUserDept();
+		this.currentHospital = this.tool.getCurrentHospital();
     this.coopBtns = this.tool.initCoopBtns(this.route);
 		// console.log(8989899,this.coopBtns)
     //防抖
@@ -1939,6 +1941,7 @@ export class FuwutaiComponent implements OnInit {
       });
   }
   rightTitleHandler(i) {
+		console.log(4444, i)
     this.currentRTab = i;
     if (i === 0) {
       this.getWorkOrders(this.applyDept);
@@ -1999,7 +2002,7 @@ export class FuwutaiComponent implements OnInit {
     if(!this.itsmData.mdv2Switch){
       return;
     }
-    if (id == -1 || id === null || id === undefined && this.incidentModel.repairIncidentType === 'dept') {
+    if ((id == -1 || id === null || id === undefined) && this.incidentModel.repairIncidentType === 'dept') {
       this.itsmOrders = [];
       return;
     }
@@ -2757,13 +2760,6 @@ export class FuwutaiComponent implements OnInit {
 						case "governmentDuty":
 							this.showGovDutyConfig =  c.valueconfig
 							break;
-						case "cmdbRepair":
-							if(c.valueconfig=='1'){
-								this.cmdbRepair = true
-							}else{
-								this.cmdbRepair = false
-							}
-							break;	
 					}
 				});
       } else {
@@ -2779,11 +2775,12 @@ export class FuwutaiComponent implements OnInit {
 	// 获取资产列表
 	assetData:any = [];
 	getAssetData(name?){
+		console.log('nimadede===========', this.hospitalModel)
 		let data = {
 		  idx: 0,
 		  sum: 20,
 		  asset: {
-		    hosId: this.incidentModel.hosId,
+		    downHosId: this.hospitalModel!=1 ? this.incidentModel.hosId : this.currentHospital.id,
 		    name: name
 		  },
 		};
@@ -2863,6 +2860,13 @@ export class FuwutaiComponent implements OnInit {
 									break;	
 								case "applicantMustFillIn":
 									this.applicantMustFillIn = c[1]
+									break;
+								case "cmdbRepair":
+									if(c[1]=='1'){
+										this.cmdbRepair = true
+									}else{
+										this.cmdbRepair = false
+									}
 									break;	
 							}
 							if(type==1){
@@ -2878,6 +2882,9 @@ export class FuwutaiComponent implements OnInit {
 						if(this.hospitalModel==1){
 							this.searchApplicationBuilding()
 						}
+						if(this.cmdbRepair && this.hospitalModel==1){
+							this.getAssetData()
+						}
 					}
 				}
 			});
@@ -3559,7 +3566,7 @@ export class FuwutaiComponent implements OnInit {
         hospital: this.isRelatedDepartment ? undefined : { id: this.incidentModel.hosId },
         dept: this.isRelatedDepartment ? { id: this.incidentModel.department } : undefined,
         name: keyWord,
-				phone: this.incidentModel.incomingPhone || undefined
+				// phone: this.incidentModel.incomingPhone || undefined
         // simpleQuery: true,
       },
     };
@@ -3588,25 +3595,35 @@ export class FuwutaiComponent implements OnInit {
 			this.userPriorityDTO = null
 		}
 		let orders = [];
-		if(this.addressDTO&&this.addressDTO.orders){
+		let id = [];
+		if(this.addressDTO&&this.addressDTO.id){
 			orders.push(this.addressDTO.orders)
+			id.push(this.addressDTO.id)
 		}
-		if(this.deptPriorityDTO&&this.deptPriorityDTO.orders){
+		if(this.deptPriorityDTO&&this.deptPriorityDTO.id){
 			orders.push(this.deptPriorityDTO.orders)
+			id.push(this.deptPriorityDTO.id)
 		}
-		if(this.userPriorityDTO&&this.userPriorityDTO.orders){
+		if(this.userPriorityDTO&&this.userPriorityDTO.id){
 			orders.push(this.userPriorityDTO.orders)
+			id.push(this.userPriorityDTO.id)
 		}
-		if(this.malPriorityDTO&&this.malPriorityDTO.orders){
+		if(this.malPriorityDTO&&this.malPriorityDTO.id){
 			orders.push(this.malPriorityDTO.orders)
+			id.push(this.malPriorityDTO.id)
 		}
 		let minNumber = Math.min(...orders)
+		let index = orders.indexOf(minNumber) 
 		console.log('最小值的orders', orders, minNumber)
 		setTimeout(_=>{
-			this.incidentModel.priorityId = minNumber != Infinity ? minNumber : null
+			this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
 		})
 		if(this.incidentModel.repairIncidentType === 'public'){
 			this.getItsmOrders('')
+			if(this.cmdbRepair){
+				this.incidentModel.assetId = null;
+				this.getAssetData()
+			}
 		}
   }
   // 故障现象列表
@@ -3684,22 +3701,28 @@ export class FuwutaiComponent implements OnInit {
 							this.malPriorityDTO = null
 						}
 						let orders = [];
-						if(this.addressDTO&&this.addressDTO.orders){
+						let id = [];
+						if(this.addressDTO&&this.addressDTO.id){
 							orders.push(this.addressDTO.orders)
+							id.push(this.addressDTO.id)
 						}
-						if(this.deptPriorityDTO&&this.deptPriorityDTO.orders){
+						if(this.deptPriorityDTO&&this.deptPriorityDTO.id){
 							orders.push(this.deptPriorityDTO.orders)
+							id.push(this.deptPriorityDTO.id)
 						}
-						if(this.userPriorityDTO&&this.userPriorityDTO.orders){
+						if(this.userPriorityDTO&&this.userPriorityDTO.id){
 							orders.push(this.userPriorityDTO.orders)
+							id.push(this.userPriorityDTO.id)
 						}
-						if(this.malPriorityDTO&&this.malPriorityDTO.orders){
+						if(this.malPriorityDTO&&this.malPriorityDTO.id){
 							orders.push(this.malPriorityDTO.orders)
+							id.push(this.malPriorityDTO.id)
 						}
 						let minNumber = Math.min(...orders)
-						console.log('最小值的orders', orders, minNumber)
+						let index = orders.indexOf(minNumber)
+						console.log('最小值的orders', minNumber)
 						setTimeout(_=>{
-							this.incidentModel.priorityId = minNumber != Infinity ? minNumber : null
+							this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
 						})
             // 根据院区和故障现象带出责任部门，优先级，维修人/组
             this.incidentModel.duty = this.incidentCategoryConfig.dutyDTO;
@@ -4207,7 +4230,10 @@ export class FuwutaiComponent implements OnInit {
   changeApply(e) {
     this.changeApplicationDepartment("&same&");
     this.defaultInspectFn();
-
+		if(this.cmdbRepair){
+			this.incidentModel.assetId = null;
+			this.getAssetData()
+		}
     if(this.applyDept && this.currentTabIndex !== '故障报修'){
       this.rightTitle_tab = [
         { id: 0, name: '近期配送' },
@@ -4238,22 +4264,28 @@ export class FuwutaiComponent implements OnInit {
 			this.deptPriorityDTO = null
 		}
 		let orders = [];
-		if(this.addressDTO&&this.addressDTO.orders){
+		let id = [];
+		if(this.addressDTO&&this.addressDTO.id){
 			orders.push(this.addressDTO.orders)
+			id.push(this.addressDTO.id)
 		}
-		if(this.deptPriorityDTO&&this.deptPriorityDTO.orders){
+		if(this.deptPriorityDTO&&this.deptPriorityDTO.id){
 			orders.push(this.deptPriorityDTO.orders)
+			id.push(this.deptPriorityDTO.id)
 		}
-		if(this.userPriorityDTO&&this.userPriorityDTO.orders){
+		if(this.userPriorityDTO&&this.userPriorityDTO.id){
 			orders.push(this.userPriorityDTO.orders)
+			id.push(this.userPriorityDTO.id)
 		}
-		if(this.malPriorityDTO&&this.malPriorityDTO.orders){
+		if(this.malPriorityDTO&&this.malPriorityDTO.id){
 			orders.push(this.malPriorityDTO.orders)
+			id.push(this.malPriorityDTO.id)
 		}
 		let minNumber = Math.min(...orders)
-		console.log('最小值的orders', orders, minNumber)
+		let index = orders.indexOf(minNumber) 
+		console.log('最小值的orders', index)
 		setTimeout(_=>{
-			this.incidentModel.priorityId = minNumber != Infinity ? minNumber : null
+			this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
 		})
     if(this.incidentModel.department && this.currentTabIndex === '故障报修'){
       this.rightTitle_tab = [
@@ -7062,8 +7094,8 @@ export class FuwutaiComponent implements OnInit {
 
   // 选择地址
 	addressDTO:any;
-  selectAddress(name, id){
-		let item = this.addressList.find(i=>i.id == id)
+  selectAddress(name, idx){
+		let item = this.addressList.find(i=>i.id == idx)
 		console.log('选中的地址11111',item);
 		if(item && item.priority){
 			this.addressDTO = item.priority
@@ -7071,22 +7103,28 @@ export class FuwutaiComponent implements OnInit {
 			this.addressDTO = null
 		}
 		let orders = [];
-		if(this.addressDTO&&this.addressDTO.orders){
+		let id = [];
+		if(this.addressDTO&&this.addressDTO.id){
 			orders.push(this.addressDTO.orders)
+			id.push(this.addressDTO.id)
 		}
-		if(this.deptPriorityDTO&&this.deptPriorityDTO.orders){
+		if(this.deptPriorityDTO&&this.deptPriorityDTO.id){
 			orders.push(this.deptPriorityDTO.orders)
+			id.push(this.deptPriorityDTO.id)
 		}
-		if(this.userPriorityDTO&&this.userPriorityDTO.orders){
+		if(this.userPriorityDTO&&this.userPriorityDTO.id){
 			orders.push(this.userPriorityDTO.orders)
+			id.push(this.userPriorityDTO.id)
 		}
-		if(this.malPriorityDTO&&this.malPriorityDTO.orders){
+		if(this.malPriorityDTO&&this.malPriorityDTO.id){
 			orders.push(this.malPriorityDTO.orders)
+			id.push(this.malPriorityDTO.id)
 		}
 		let minNumber = Math.min(...orders)
+		let index = orders.indexOf(minNumber) 
 		console.log('最小值的orders', orders, minNumber)
 		setTimeout(_=>{
-			this.incidentModel.priorityId = minNumber != Infinity ? minNumber : null
+			this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
 		})
     this.incidentModel.houseNumber = name;
     this.isShowAddressList = false;

src/app/views/hushijiandan/hushijiandan.component.html

@@ -2414,9 +2414,9 @@
     <div class="content">
       <form nz-form [formGroup]="validateBxForm" class="bxFormAdd" (ngSubmit)="confirmBx()">
         <nz-form-item *ngIf="cmdbRepair">
-          <nz-form-label [nzSm]="4" [nzXs]="4" nzFor="contacts">资产</nz-form-label>
+          <nz-form-label [nzSm]="4" [nzXs]="4" nzFor="assetId">资产</nz-form-label>
           <nz-form-control style="display: inline-block;">
-            <nz-select style="width:168px;margin-right: 8px;" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择资产" (nzOnSearch)="changeAsset($event)" formControlName="assetId">
+            <nz-select style="width:168px;margin-right: 8px;" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择资产" (nzOnSearch)="changeAsset($event)" formControlName="assetId" (ngModelChange)="changeAssetData($event)">
             	<ng-container *ngFor="let option of assetData">
             		<nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
             	</ng-container>
@@ -2428,7 +2428,7 @@
         
           <nz-form-label nzFor="contactsInformation">故障现象</nz-form-label>
           <nz-form-control style="display: inline-block;">
-            <nz-select style="width:185px;" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp($event)" nzPlaceHolder="请选择故障现象" formControlName="category" (ngModelChange)="changeApplyCategory($event)">
+            <nz-select style="width:185px;" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择故障现象" formControlName="category" (ngModelChange)="changeApplyCategory($event)">
             	<ng-container *ngFor="let option of applicationCategoryList">
             		<nz-option *ngIf="!isLoading" [nzLabel]="option.mutiCategory" [nzValue]="option.id"></nz-option>
             	</ng-container>

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -1050,7 +1050,6 @@ export class HushijiandanComponent implements OnInit {
 					if(result.list[0].valueconfig==1){
 						this.cmdbRepair = true
 						this.getAssetData();
-						this.searchApplicationCategory();
 					}else{
 						this.cmdbRepair = false
 					}
@@ -1059,6 +1058,7 @@ export class HushijiandanComponent implements OnInit {
 	}
 	
 	changeCommonInp(e) {
+		return
 	  this.changeCommonInpSubject.next(e);
 	}
 	changeApplyCategory(e){
@@ -1075,12 +1075,17 @@ export class HushijiandanComponent implements OnInit {
 	// 故障现象列表
 	applicationCategoryList:any[] = [];
 	searchApplicationCategory(keyWord?) {
-	  let postData = {
-	    category: {
-	      category: keyWord,
-	      selectType: 'mutlQuery',
-	      hierarchy: 3,//只差有三级的故障现象列表
-	    },
+		let item = this.assetData.find(i=> i.id == this.validateBxForm.value.assetId)
+		if(!item.assetProductDTO.incidentCategoryIds){
+			return
+		}
+		let postData = {
+			incidentCategoryIds: item.assetProductDTO.incidentCategoryIds,
+	   //  category: {
+	   //    category: keyWord,
+	   //    selectType: 'mutlQuery',
+				// hierarchy: 3,//只差有三级的故障现象列表
+	   //  },
 	  };
 	  console.log(postData);
 	  this.isLoading = true;
@@ -1097,6 +1102,11 @@ export class HushijiandanComponent implements OnInit {
 	changeAsset(e){
 		this.changeAssetInpSubject.next(e);
 	}
+	// 选择资产
+	changeAssetData(e){
+		this.validateBxForm.controls.category.setValue(null)
+		this.searchApplicationCategory();
+	}
 	
 	// 获取资产列表
 	assetData:any = [];
@@ -1105,7 +1115,7 @@ export class HushijiandanComponent implements OnInit {
 		  idx: 0,
 		  sum: 20,
 		  asset: {
-		    hosId: this.currentHospital.id,
+		    downHosId: this.currentHospital.id,
 		    name: name
 		  },
 		};

src/app/views/main/main.component.ts

@@ -956,7 +956,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	  // if(!this.itsmData.mdv2Switch){
 	  //   return;
 	  // }
-	  if (id == -1 || id === null || id === undefined && this.incidentModel.repairIncidentType === 'dept') {
+	  if ((id == -1 || id === null || id === undefined ) && this.incidentModel.repairIncidentType === 'dept') {
 	    this.itsmOrders = [];
 	    return;
 	  }
@@ -1264,6 +1264,10 @@ export class MainComponent implements OnInit, OnDestroy {
 	  }
 		if(this.incidentModel.repairIncidentType === 'public'){
 			this.getItsmOrders('')
+			if(this.cmdbRepair){
+				this.incidentModel.assetId = null;
+				this.getAssetData()
+			}
 		}
 	}
 	// 故障现象列表
@@ -1874,6 +1878,10 @@ export class MainComponent implements OnInit, OnDestroy {
 	// 配送-选择科室
 	changeApply(e) {
 	  console.log(e, this.applicationDepartmentList);
+		if(this.cmdbRepair){
+			this.incidentModel.assetId = null;
+			this.getAssetData()
+		}
 	  this.changeApplicationDepartment("&same&");
 	  if(this.applyDept && this.currentTabIndex !== '故障报修'){
 	    this.rightTitle_tab = [
@@ -3971,6 +3979,10 @@ export class MainComponent implements OnInit, OnDestroy {
 							}
 							this.searchApplicationBuilding()
 						}
+						
+						if(this.cmdbRepair && this.hospitalModel==1){
+							this.getAssetData()
+						}
 					}
 				}
 			});
@@ -3983,14 +3995,14 @@ export class MainComponent implements OnInit, OnDestroy {
   // 获取资产列表
 	assetData:any = [];
 	getAssetData(name?){
-		if(!this.incidentModel.hosId){
-			return
-		}
+		// if(!this.incidentModel.hosId){
+		// 	return
+		// }
 		let data = {
 		  idx: 0,
 		  sum: 20,
 		  asset: {
-		    hosId: this.incidentModel.hosId,
+		    hosId: this.hospitalModel!=1 ? this.incidentModel.hosId : this.currentHospital.id,
 		    name: name
 		  },
 		};