src/app/components/configurationCenter/configuration-system-security/configuration-system-security.component.html

@@ -41,6 +41,12 @@
 									<nz-input-number [(ngModel)]="validity" [nzMin]="0" [nzMax]="99999" [nzStep]="1"></nz-input-number>&nbsp;&nbsp;分钟 
 								</div>
 								
+								<!-- 验证码干扰线数量 -->
+								<div class="display_flex align-items_center mb8" *ngIf="verificationCode[0].checked">
+									<nz-form-label class="label">验证码干扰线数量</nz-form-label>
+									<nz-input-number [(ngModel)]="verificationCodeNoiseLines" [nzMin]="1" [nzMax]="50" [nzStep]="1"></nz-input-number>
+								</div>
+								
                 <!-- 是否限制账户错误登录次数 -->
                 <div class="display_flex align-items_center mb8">
                   <nz-form-label class="label">是否限制账户错误登录次数</nz-form-label>

src/app/components/configurationCenter/configuration-system-security/configuration-system-security.component.ts

@@ -32,6 +32,7 @@ export class ConfigurationSystemSecurityComponent implements OnInit {
 	validity:any; //验证码有效期
   isErrorTime:any = [{ label:'是否开启', value: 0 }];//是否限制账户错误登录次数
   errorTime:any;//支持错误次数
+	verificationCodeNoiseLines:any;//验证码干扰线数量
   astrictIp:any = [{ label:'是否开启', value: 1 }];//终点科室支持核对
   drugsEndCheckScanIds:any = [];//是否限制单点登录ip
   rangeIp:any;//单点登录范围内IP
@@ -100,6 +101,10 @@ export class ConfigurationSystemSecurityComponent implements OnInit {
 				this.msg.error('验证码有效期不能为空')
 				return 
 			}
+			if(!this.verificationCodeNoiseLines){
+				this.msg.error('验证码干扰线数量不能为空')
+				return 
+			}
 		}
 		
 		if(this.isErrorTime[0].checked){
@@ -108,7 +113,7 @@ export class ConfigurationSystemSecurityComponent implements OnInit {
 				return 
 			}
 		}
-	
+		
 		// if(this.astrictIp[0].checked){
 		// 	let isEmpty = this.ipData.filter(i=>i.rangeIp=='')
 		// 	if(isEmpty.length>0){
@@ -131,6 +136,8 @@ export class ConfigurationSystemSecurityComponent implements OnInit {
 			  item.configValue = this.digit;
 			}else if (item.configKey === "verificationCodeDuration") {
 		    item.configValue = this.validity;
+		  }else if (item.configKey === "verificationCodeNoiseLines") {
+		    item.configValue = this.verificationCodeNoiseLines;
 		  }else if (item.configKey === "limitIncorrectLogin") {
 		    let value = null
 		    if(this.isErrorTime[0].checked){
@@ -209,6 +216,9 @@ export class ConfigurationSystemSecurityComponent implements OnInit {
 								case "verificationCodeDuration":
 									this.validity = c[1]
 									break;
+								case "verificationCodeNoiseLines":
+									this.verificationCodeNoiseLines = c[1]
+									break;
 								case "limitIncorrectLogin":
 									if(c[1]=='1'){
 										this.isErrorTime[0].checked = true

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/share/detail-bx/detail-bx.component.html

@@ -22,9 +22,10 @@
               <div class="thumb" *ngFor="let item of imgs_incident;let index = index;" (click)="previewImageHandler(imgs_incident, index)"><img [src]="item.thumbFilePath" alt=""></div>
             </div>
           </div>
-          <div nz-col nzSpan="8">维修人：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.name }}</ng-container></div>
-          <div nz-col nzSpan="8">维修人电话：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.phone }}</ng-container></div>
-          <div nz-col nzSpan="8">维修总金额：{{orderInfo.rsPrice === undefined ? '无' : orderInfo.rsPrice + '元'}}</div>
+					<div nz-col nzSpan="6">关联资产：<ng-container *ngIf="orderInfo.assetDTO">{{ orderInfo.assetDTO.name }}</ng-container></div>
+          <div nz-col nzSpan="6">维修人：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.name }}</ng-container></div>
+          <div nz-col nzSpan="6">维修人电话：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.phone }}</ng-container></div>
+          <div nz-col nzSpan="6">维修总金额：{{orderInfo.rsPrice === undefined ? '无' : orderInfo.rsPrice + '元'}}</div>
         </div>
       </div>
       <div class="center" *ngIf="amplificationShow">

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>
@@ -184,7 +184,7 @@
 <!-- 查看模态框 -->
 <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="lookModal">
   <div class="viewModalBody">
-    <div class="title">查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    <div class="title">查看<i class="icon_transport transport-guanbi" (click)="close()"></i>
     </div>
     <overlay-scrollbars #osComponentRef1 class="content">
 			<div class="df view-item">

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.html

@@ -1,5 +1,5 @@
 <div class="fuwutai">
-  <div class="top" id="top" *ngIf="hurseInfoHiding != 1">
+  <div class="top" id="top" *ngIf="hurseInfoHiding != 1 && hsmsData.hsmsSwitch==1">
     <!-- 头部Tab -->
     <div class="tabBox">
       <div class="tab" #tabs>
@@ -1083,7 +1083,7 @@
             <ng-container *ngIf="buildType !== '报修转事件'">
               <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear (nzOpenChange)="openChangeApplyRequester($event)">
                 <ng-container *ngFor="let option of applicationRequesterList">
-                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name + '('+option.account+')'" [nzValue]="option.id"></nz-option>
                 </ng-container>
                 <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                   <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -1527,6 +1527,18 @@
                   </div>
 
                   <div class="row">
+										<div class="col" *ngIf="cmdbRepair">
+											<span class="name">资产：</span>
+											<nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择资产" (nzOnSearch)="changeAsset($event)" [(ngModel)]="incidentModel.assetId">
+												<ng-container *ngFor="let option of assetData">
+													<nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+												</ng-container>
+												<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+													<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+												</nz-option>
+											</nz-select>
+										</div>
+																			
                     <div class="col">
                       <span class="name required">故障现象：</span>
                       <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)" (nzOpenChange)="openChangeApplyCategory($event)">

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

@@ -177,7 +177,7 @@ export class FuwutaiComponent implements OnInit {
   searchHosDepartmentQtSubject = new Subject();
   searchPatientListSubject = new Subject();
   inspectSubject = new Subject();
-
+	changeAssetInpSubject = new Subject();
   // 运维相关
   incidentModel:any = {};
   incidentMsg:any = {};
@@ -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)
     //防抖
@@ -966,6 +968,9 @@ export class FuwutaiComponent implements OnInit {
     this.inspectSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.refreshInspectList();
     });
+		this.changeAssetInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.getAssetData(v);
+		});
     this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       if(v[0] === 'requester'){
         this.searchApplicationRequester(v[1]);
@@ -1936,6 +1941,7 @@ export class FuwutaiComponent implements OnInit {
       });
   }
   rightTitleHandler(i) {
+		console.log(4444, i)
     this.currentRTab = i;
     if (i === 0) {
       this.getWorkOrders(this.applyDept);
@@ -1996,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;
     }
@@ -2730,6 +2736,7 @@ export class FuwutaiComponent implements OnInit {
   // 获取配置文件写死的任务类型ID(转科，给转出院记录用6)
   patientLogTasktypeLoading: boolean = false;
 	showGovDutyConfig:any;
+	cmdbRepair:boolean = false;
   patientLogTasktype() {
     if(!this.hsmsData.hsmsSwitch){
       return;
@@ -2760,6 +2767,33 @@ export class FuwutaiComponent implements OnInit {
       }
     });
   }
+	
+	changeAsset(e){
+		this.changeAssetInpSubject.next(e);
+	}
+	
+	// 获取资产列表
+	assetData:any = [];
+	getAssetData(name?){
+		console.log('nimadede===========', this.hospitalModel)
+		let data = {
+		  idx: 0,
+		  sum: 20,
+		  asset: {
+		    downHosId: this.hospitalModel!=1 ? this.incidentModel.hosId : this.currentHospital.id,
+		    name: name
+		  },
+		};
+		
+		this.mainService
+		  .getFetchDataList("simple/data", "asset", data)
+		  .subscribe((data) => {
+		    if (data.status == 200) {
+		      this.assetData = data.list;
+		    }
+		  });
+	}
+	
   // 重置新建工单数据
   resetOrderData(){
     this.applicationRequesterList = [];
@@ -2826,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){
@@ -2841,6 +2882,9 @@ export class FuwutaiComponent implements OnInit {
 						if(this.hospitalModel==1){
 							this.searchApplicationBuilding()
 						}
+						if(this.cmdbRepair && this.hospitalModel==1){
+							this.getAssetData()
+						}
 					}
 				}
 			});
@@ -3441,7 +3485,10 @@ export class FuwutaiComponent implements OnInit {
 
     this.incidentModel.department = undefined;
     this.searchApplicationDepartment('itsm');
-
+		if(this.cmdbRepair){
+			this.incidentModel.assetId = null;
+			this.getAssetData()
+		}
     if(this.buildType !== '报修转事件'){
       this.incidentModel.requester = undefined;
       this.searchApplicationRequester();
@@ -3519,6 +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
         // simpleQuery: true,
       },
     };
@@ -3547,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()
+			}
 		}
   }
   // 故障现象列表
@@ -3622,7 +3680,6 @@ export class FuwutaiComponent implements OnInit {
           hosId: this.incidentModel.hosId,
         },
       };
-      console.log(postData);
       // return;
       this.isLoading = true;
       this.mainService
@@ -3643,23 +3700,32 @@ 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)
-						setTimeout(_=>{
-							this.incidentModel.priorityId = minNumber != Infinity ? minNumber : null
-						})
+						if(orders.length>0){
+							let minNumber = Math.min(...orders)
+							let index = orders.indexOf(minNumber)
+							console.log('最小值的orders', orders, minNumber)
+							setTimeout(_=>{
+								this.incidentModel.priorityId = minNumber != Infinity ? id[index] : null
+							})
+						}
+
             // 根据院区和故障现象带出责任部门，优先级，维修人/组
             this.incidentModel.duty = this.incidentCategoryConfig.dutyDTO;
             // this.incidentModel.priorityId = this.incidentCategoryConfig.priority;
@@ -3725,6 +3791,7 @@ export class FuwutaiComponent implements OnInit {
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
         "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
+				"assetId": this.incidentModel.assetId || undefined
       },
     };
 
@@ -4165,7 +4232,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: '近期配送' },
@@ -4196,22 +4266,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 = [
@@ -4542,6 +4618,7 @@ export class FuwutaiComponent implements OnInit {
         "candidateGroups": this.incidentModel.group || undefined,
         "assignee": this.incidentModel.user || undefined,
         "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
+				"assetId": this.incidentModel.assetId || undefined
       }
     };
     if(this.buildType){
@@ -4617,6 +4694,7 @@ export class FuwutaiComponent implements OnInit {
         "candidateGroups": this.incidentModel.group || undefined,
         "assignee": this.incidentModel.user || undefined,
         "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
+				"assetId": this.incidentModel.assetId || undefined
       }
     };
     if(this.buildType){
@@ -6609,7 +6687,6 @@ export class FuwutaiComponent implements OnInit {
     this.editOrder = cloneDeep(data);
     let incidentModel = cloneDeep(data);
     let incidentMsg:any = {};
-		
     // incidentModel.department && (this.applicationDeptList = [cloneDeep(incidentModel.department)]);
     incidentModel.department && (incidentMsg.deptManyPhone = incidentModel.department.manyPhone);
     incidentModel.department && (incidentMsg.deptName = incidentModel.department.dept);
@@ -6629,11 +6706,16 @@ export class FuwutaiComponent implements OnInit {
     incidentModel.category && (incidentModel.category = incidentModel.category.id);
     this.incidentModel = incidentModel;
     this.incidentMsg = incidentMsg;
+		// this.incidentModel.department && this.changeApply(this.incidentModel.department.id);
     this.incidentModel.category && this.changeApplyCategory(this.incidentModel.category, true);
     console.log('this.applicationDeptList:', this.applicationDeptList)
     console.log('incidentModel:', incidentModel)
     this.showNewOrder(0, '', '', true, '报修转事件');
 		console.log(2345,this.incidentModel.repairIncidentType)
+		if(incidentModel.assetId){
+			this.getAssetData()
+			incidentModel.assetId = Number(incidentModel.assetId)
+		}
     // 查询报修图片
     this.getRepairImgs(data.id);
   }
@@ -7014,8 +7096,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
@@ -7023,22 +7105,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

@@ -2413,7 +2413,33 @@
     </div>
     <div class="content">
       <form nz-form [formGroup]="validateBxForm" class="bxFormAdd" (ngSubmit)="confirmBx()">
-        <nz-form-item>
+        <nz-form-item *ngIf="cmdbRepair">
+          <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" (ngModelChange)="changeAssetData($event)">
+            	<ng-container *ngFor="let option of assetData">
+            		<nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+            	</ng-container>
+            	<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+            		<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            	</nz-option>
+            </nz-select>
+          </nz-form-control>
+        
+    <!--      <nz-form-label nzFor="contactsInformation">故障现象</nz-form-label>
+          <nz-form-control style="display: inline-block;">
+            <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>
+            	<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+            		<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            	</nz-option>
+            </nz-select>
+          </nz-form-control> -->
+        </nz-form-item>
+				
+				<nz-form-item>
           <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="description">故障描述</nz-form-label>
           <nz-form-control>
             <nz-input-group style="width:442px;">

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

@@ -118,6 +118,8 @@ export class HushijiandanComponent implements OnInit {
   searchTabInpSubject = new Subject(); //左侧查患者信息和检查信息防抖
   otherSearchChangeSubject = new Subject(); //其他建单搜索防抖
   inspectSubject = new Subject();
+	changeAssetInpSubject = new Subject();
+	changeCommonInpSubject = new Subject();
   isYyInspect = false; //需要预约检查
   inspectAndPatientTransportConfig:any = {timeMod: 30};
   constructor(
@@ -191,6 +193,7 @@ export class HushijiandanComponent implements OnInit {
     this.getUpdateTipsForNurses();
     this.getRefreshNurseWorkOrderTime();
     this.getCloseTimeFlag();
+		this.getCmdbRepairFlag();
     this.currentDept = this.tool.getCurrentUserDept();
     console.log(this.currentDept, this.tabSearchCont);
     this.currentDept.typeValue == 'surgery' && !this.tabSearchCont && this.getSurgeryConfig();
@@ -209,7 +212,12 @@ export class HushijiandanComponent implements OnInit {
     this.inspectSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.refreshInspectList();
     });
-
+		this.changeAssetInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.getAssetData(v);
+		});
+		this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.searchApplicationCategory(v);
+		});
     this.getTodayNum();
     this.initLogin();
     this.getDeptTaskType();
@@ -1027,6 +1035,100 @@ export class HushijiandanComponent implements OnInit {
         }
       });
   }
+	// 获取资产报修是否开启
+	cmdbRepair:Boolean = false;
+	getCmdbRepairFlag() {
+	  let postData = {
+	    idx: 0,
+	    sum: 1,
+	    systemConfiguration: { keyconfig: "cmdbRepair" },
+	  };
+	  this.mainService
+	    .getFetchDataList("simple/data", "systemConfiguration", postData)
+	    .subscribe((result) => {
+	      if (result.status == 200) {
+					if(result.list[0].valueconfig==1){
+						this.cmdbRepair = true
+						this.getAssetData();
+					}else{
+						this.cmdbRepair = false
+					}
+	      }
+	    });
+	}
+	
+	changeCommonInp(e) {
+		return
+	  this.changeCommonInpSubject.next(e);
+	}
+	changeApplyCategory(e){
+	  console.log(111, e)
+		if(e){
+		  // 根据故障现象带出故障描述
+		  if(this.validateBxForm.value.description){
+				this.validateBxForm.controls.description.setValue(this.validateBxForm.value.description +';'+this.applicationCategoryList.find(v => v.id == e).mutiCategory)
+		  }else{
+				this.validateBxForm.controls.description.setValue(this.applicationCategoryList.find(v => v.id == e).mutiCategory)
+		  }
+		}
+	}
+	// 故障现象列表
+	applicationCategoryList:any[] = [];
+	searchApplicationCategory(keyWord?) {
+		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;
+	  this.mainService
+	    .incidentPost("listIncidentCategory", postData)
+	    .subscribe((data) => {
+	      this.isLoading = false;
+	      if (data.status == 200) {
+	        this.applicationCategoryList = data.data;
+	      }
+	    });
+	}
+	
+	changeAsset(e){
+		this.changeAssetInpSubject.next(e);
+	}
+	// 选择资产
+	changeAssetData(e){
+		this.validateBxForm.controls.category.setValue(null)
+		this.searchApplicationCategory();
+	}
+	
+	// 获取资产列表
+	assetData:any = [];
+	getAssetData(name?){
+		let data = {
+		  idx: 0,
+		  sum: 20,
+		  asset: {
+		    downHosId: this.currentHospital.id,
+		    name: name
+		  },
+		};
+		
+		this.mainService
+		  .getFetchDataList("simple/data", "asset", data)
+		  .subscribe((data) => {
+		    if (data.status == 200) {
+		      this.assetData = data.list;
+		    }
+		  });
+	}
+	
   //获取综合日志
   rLoading = false;
   listDeptOrderRecords: any = [];
@@ -1532,7 +1634,22 @@ export class HushijiandanComponent implements OnInit {
       officeAddress: [null, [Validators.required]],
       contacts: [this.loginUser.name, [Validators.required]],
       contactsInformation: [this.loginUser.phone, [Validators.required]],
+			assetId: [null, []],
+			// category: [null, []],
     });
+		if(this.cmdbRepair){
+			this.validateBxForm.addControl(
+				'assetId',
+				new FormControl(null, [])
+			);
+			// this.validateBxForm.addControl(
+			// 	'category',
+			// 	new FormControl(null, [])
+			// );
+		}else{
+			this.validateBxForm.removeControl('assetId');
+			// this.validateBxForm.removeControl('category');
+		}
     this.getDeptById(this.currentDept.id);
   }
   // 根据科室ID获取详情
@@ -1711,11 +1828,13 @@ export class HushijiandanComponent implements OnInit {
               requester: this.loginUser,
               acceptUser: this.loginUser,
               deleteFlag: 0,
+							assetId: this.validateBxForm.value.assetId || undefined,
+							// category: this.validateBxForm.value.category ? { id: this.validateBxForm.value.category } : undefined,
             },
           };
-          if (this.coopBx.category) {
-            postData.incident.category = this.coopBx.categoryDTO;
-          }
+          // if (this.coopBx.category) {
+          //   postData.incident.category = this.coopBx.categoryDTO;
+          // }
           this.mainService.flowPost("incident/task/request", postData).subscribe((res) => {
             this.btnLoading = false;
             this.cancenlLoading = false;

src/app/views/login/login.component.ts

@@ -294,6 +294,7 @@ export class LoginComponent implements OnInit {
     let roleMenus = data.user.menu;
     let canLogin = false; //是否可以进入系统主页面(无护士端，调度台，药房端权限)
     let successLoginMsg = true; //登录成功提示,true是提示，false不提示
+		let sy = false;
     let fwt = false;
     let ddt = false;
 		let bbj = false;
@@ -302,8 +303,13 @@ export class LoginComponent implements OnInit {
 		let blk = false;
 		let web = false;
     let yfang = false;
+		let gglb = false;
+		let gzgd = false;
     roleMenus.forEach((e) => {
-      if (e.link == "pharmacy") {
+			if (e.link == "home") {
+			  sy = true;
+			  console.log("首页");
+			}else if (e.link == "pharmacy") {
         yfang = true;
         console.log("药房端");
       } else if (e.link == "nurse") {
@@ -328,6 +334,12 @@ export class LoginComponent implements OnInit {
       } else if (e.link == "webRepairs") {
         web = true;
         console.log("web报修");
+      }else if (e.link == "orderManagement") {
+        gglb = true;
+        console.log("工单列表");
+      }else if (e.link == "incidentManagement") {
+        gzgd = true;
+        console.log("故障工单");
       }
       canLogin = true;
     });
@@ -445,18 +457,36 @@ export class LoginComponent implements OnInit {
     }
     // 有菜单可以进入系统主页面
     if (!canLogin) {
-      this.msg.success("暂无权限进入系统！", {
+      this.msg.error("暂无权限进入系统！", {
         nzDuration: 2000,
       });
     } else {
+			if(!gglb && !gzgd && !sy){
+				this.msg.error("暂无权限进入系统！", {
+				  nzDuration: 2000,
+				});
+				return
+			}
       if (successLoginMsg) {
         this.msg.success("登录成功！", {
           nzDuration: 2000,
         });
       }
       successLoginMsg = false;
-      localStorage.setItem("user", JSON.stringify(data.user));
-      this.router.navigateByUrl("/main/home");
+			localStorage.setItem("user", JSON.stringify(data.user));
+			if(gglb){
+				this.router.navigateByUrl("/main/orderManagement");
+				return
+			}else if(gzgd){
+				this.router.navigateByUrl("/main/incidentManagement");
+				return
+			}
+			if(gglb && gzgd && sy){
+				this.router.navigateByUrl("/main/home");
+			}
+			if(!gglb && !gzgd && sy){
+				this.router.navigateByUrl("/main/home");
+			}
     }
   }
   // 处理树数据（parent格式转为children格式）

src/app/views/main/main.component.html

@@ -7,7 +7,7 @@
     </div>
     <!-- 导航重写，兼容chrome39 -->
     <ul id="ds-menu">
-      <li class="mainMenuOne" (click)="totoMenu('首页')" [ngClass]="{mainMenuSelected:indexFlag}">
+      <li class="mainMenuOne" *ngIf="homeRole" (click)="totoMenu('首页')" [ngClass]="{mainMenuSelected:indexFlag}">
         <i nz-icon nzType="home"></i>
         <span nzTooltipPlacement="right" nz-tooltip nzTooltipTitle="首页">首页</span>
       </li>
@@ -199,7 +199,7 @@
 					<ng-container *ngIf="buildType !== '报修转事件'">
 						<nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear (nzOpenChange)="openChangeApplyRequester($event)">
 							<ng-container *ngFor="let option of applicationRequesterList">
-								<nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+								<nz-option *ngIf="!isLoading" [nzLabel]="option.name + '('+option.account+')'" [nzValue]="option.id"></nz-option>
 							</ng-container>
 							<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
 								<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -304,6 +304,18 @@
 								</div>
 
 								<div class="row">
+									<div class="col" *ngIf="cmdbRepair">
+										<span class="name">资产：</span>
+										<nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择资产" (nzOnSearch)="changeAsset($event)" [(ngModel)]="incidentModel.assetId">
+											<ng-container *ngFor="let option of assetData">
+												<nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+											</ng-container>
+											<nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+												<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+											</nz-option>
+										</nz-select>
+									</div>
+									
 									<div class="col">
 										<span class="name required">故障现象：</span>
 										<nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)" (nzOpenChange)="openChangeApplyCategory($event)">

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

@@ -40,7 +40,7 @@ export class MainComponent implements OnInit, OnDestroy {
   menus: any = JSON.parse(localStorage.getItem("menu"));
   currentHospital; //当前院区
   routerEventsListener; //监听路由
-
+	homeRole: boolean = false; //首页权限
 	speediness: boolean = false; //新增报修权限
   deskRole: boolean = false; //调度台权限
   nurseRole: boolean = false; //护士端权限
@@ -316,6 +316,10 @@ export class MainComponent implements OnInit, OnDestroy {
     let menus = JSON.parse(localStorage.getItem("menu"));
     let arr = [];
     menus.forEach((e) => {
+			if (e.link == "home") {
+			  this.homeRole = true;
+			  console.log("首页权限");
+			}
       if (e.link == "nurse") {
         this.nurseRole = true;
         console.log("护士端权限");
@@ -544,7 +548,8 @@ export class MainComponent implements OnInit, OnDestroy {
 	searchHosDepartmentQtSubject = new Subject();
 	searchPatientListSubject = new Subject();
 	inspectSubject = new Subject();
-
+	changeAssetInpSubject = new Subject();
+	
 	// 运维相关
 	incidentModel:any = {};
 	incidentMsg:any = {};
@@ -654,9 +659,9 @@ export class MainComponent implements OnInit, OnDestroy {
 
 	// 获取院区配置配置，是否核酸打印
 	getHospitalConfigList(key) {
-	  if(!this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  let postData = { idx: 0, sum: 1, hospitalConfig: { hosId: this.checkedHos, key } };
 	  this.mainService.getFetchDataList("simple/data", "hospitalConfig", postData).subscribe(result=>{
 	    if(result.status == 200){
@@ -670,9 +675,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	// 获取配置文件写死的任务类型ID(送病人回病房9)，选择此任务类型的话，患者信息从终点科室获取
 	getConfigTasktypeLoading: boolean = false;
 	getConfigTasktype() {
-	  if(!this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  let postData = {
 	    idx: 0,
 	    sum: 1,
@@ -694,9 +699,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	// 获取配置文件写死的任务类型ID(转科，给转出院记录用6)
 	patientLogTasktypeLoading: boolean = false;
 	patientLogTasktype() {
-	  if(!this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  let postData = {
 	    idx: 0,
 	    sum: 1,
@@ -857,9 +862,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	searchTaskList;
 	searchTaskLoading = false;
 	getSearchTaskList(keyword, countRemark = '') {
-	  if(!this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  this.searchTaskLoading = true;
 	  return this.mainService.getTaskTypeBySearchKey({
 	    searchKey: keyword || undefined,
@@ -883,9 +888,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	patientLogList:any;
 	loading5:boolean = false
 	getPatientLog(id) {
-	  if(!this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  if (id == -1 || id === null || id === undefined) {
 	    this.patientLogList = [];
 	    return;
@@ -911,9 +916,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	// 服务台新建工单—根据申请科室id来查询未到达工单(科室id)
 	loading4 = false;
 	getWorkOrders(id) {
-	  if(!this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  if (id == -1 || id === null || id === undefined) {
 	    this.noArrives = [];
 	    return;
@@ -952,10 +957,10 @@ export class MainComponent implements OnInit, OnDestroy {
 	loading6 = false;
 	itsmOrders:any[] = [];
 	getItsmOrders(id) {
-	  if(!this.itsmData.mdv2Switch){
-	    return;
-	  }
-	  if (id == -1 || id === null || id === undefined && this.incidentModel.repairIncidentType === 'dept') {
+	  // if(!this.itsmData.mdv2Switch){
+	  //   return;
+	  // }
+	  if ((id == -1 || id === null || id === undefined ) && this.incidentModel.repairIncidentType === 'dept') {
 	    this.itsmOrders = [];
 	    return;
 	  }
@@ -1019,9 +1024,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	loading7 = false;
 	knowageList:any[] = [];
 	getKnowageList() {
-	  if(!this.itsmData.mdv2Switch){
-	    return;
-	  }
+	  // if(!this.itsmData.mdv2Switch){
+	  //   return;
+	  // }
 
 	  if(!(this.incidentModel.category && this.solutionStatus && this.solutionType)){
 	    this.loading7 = false;
@@ -1159,7 +1164,10 @@ export class MainComponent implements OnInit, OnDestroy {
 
 	//   this.incidentModel.department = undefined;
 	  this.searchApplicationDepartment('itsm');
-
+		if(this.cmdbRepair){
+			this.incidentModel.assetId = null;
+			this.getAssetData()
+		}
 	  if(this.buildType !== '报修转事件'){
 	    this.incidentModel.requester = undefined;
 	    this.searchApplicationRequester();
@@ -1260,6 +1268,10 @@ export class MainComponent implements OnInit, OnDestroy {
 	  }
 		if(this.incidentModel.repairIncidentType === 'public'){
 			this.getItsmOrders('')
+			if(this.cmdbRepair){
+				this.incidentModel.assetId = null;
+				this.getAssetData()
+			}
 		}
 	}
 	// 故障现象列表
@@ -1401,6 +1413,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	      "callID": this.incidentModel.callID || undefined,
 	      "incomingPhone": this.incidentModel.incomingPhone || undefined,
 	      "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
+				"assetId": this.incidentModel.assetId || undefined
 	    },
 	  };
 
@@ -1750,9 +1763,9 @@ export class MainComponent implements OnInit, OnDestroy {
 	applicationDeptList:any[] = [];
 	applyStartDept:any;
 	searchApplicationDepartment(type, e?, phone?, deptId?, isInit?) {
-	  if(!this.hsmsData.hsmsSwitch && !this.itsmData.mdv2Switch){
-	    return;
-	  }
+	  // if(!this.hsmsData.hsmsSwitch && !this.itsmData.mdv2Switch){
+	  //   return;
+	  // }
 	  let keyWord = "";
 	  if (e && e !== "&ks&" && e !== "&go&") {
 	    keyWord = e;
@@ -1869,6 +1882,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 = [
@@ -2207,6 +2224,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	      "candidateGroups": this.incidentModel.group || undefined,
 	      "assignee": this.incidentModel.user || undefined,
 	      "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
+				"assetId": this.incidentModel.assetId || undefined
 	    }
 	  };
 	  if(this.buildType){
@@ -2496,53 +2514,14 @@ export class MainComponent implements OnInit, OnDestroy {
 	getAutoWorkTypes(isFirst, isInit) {
 	  this.workTypesArrange = [];
 	  // 运维
-	  if(this.itsmData.mdv2Switch){
+	  // if(this.itsmData.mdv2Switch){
 	    this.workTypesArrange = [{key:'故障报修', value: []}];
-	    if(!this.hsmsData.hsmsSwitch){
-	      console.log('workTypesArrange', this.workTypesArrange);
-	      // 是否显示操作项
-	      this.workTypesFlag = this.workTypesArrange.length >= 5;
-	    }
-	  }
-	  // 配送
-	  if(this.hsmsData.hsmsSwitch){
-	    this.newLoading = true;
-	    this.mainService.getTaskTypeBySearchKey({
-	      hosId: this.checkedHos,
-	    }).subscribe((data) => {
-	      this.newLoading = false;
-	      if (data["status"] == 200) {
-	        this.workTypes = data["data"];
-	        // 整理后的任务类型
-	        this.isShowResidenceNo = false;
-	        this.workTypes.forEach((item) => {
-	          if(item.associationTypeValue === 'patientTransport' || item.associationTypeValue === 'inspect'){
-	            // 患者其他服务
-	            let obj = this.workTypesArrange.find(v => v.key === '患者转运');
-	            if(obj){
-	              obj.value.push(item);
-	            }else{
-	              this.workTypesArrange.unshift({ key: '患者转运', value: [item] });
-	              this.isShowResidenceNo = true;
-	            }
-	          }else if(item.associationTypeValue === 'other' || item.associationTypeValue === 'specimen' || item.associationTypeValue === 'ordinary'){
-	            // 物品配送
-	            let obj = this.workTypesArrange.find(v => v.key === '物品配送');
-	            if(obj){
-	              obj.value.push(item);
-	            }else{
-	              this.workTypesArrange.unshift({ key: '物品配送', value: [item] });
-	            }
-	          }
-	        });
-	        console.log('workTypesArrange', this.workTypesArrange);
-	        // 任务类型是否显示操作项
-	        let arr = this.workTypesArrange;
-	        this.workTypesFlag = arr.length >= 5;
-	      }
-	    });
-	    this.getTaskTypeCountRemarkList();
-	  }
+	    // if(!this.hsmsData.hsmsSwitch){
+	    //   console.log('workTypesArrange', this.workTypesArrange);
+	    //   // 是否显示操作项
+	    //   this.workTypesFlag = this.workTypesArrange.length >= 5;
+	    // }
+	  // }
 	}
 	// 查类型
 	getTaskTypeCountRemarkList(){
@@ -3701,12 +3680,12 @@ export class MainComponent implements OnInit, OnDestroy {
 
 	// 运维、配送工单切换
 	filterOrderList(type, state){
-	  if(!this.itsmData.mdv2Switch && this.hsmsData.hsmsSwitch){
-	    return;
-	  }
-	  if(this.itsmData.mdv2Switch && !this.hsmsData.hsmsSwitch){
-	    return;
-	  }
+	  // if(!this.itsmData.mdv2Switch && this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
+	  // if(this.itsmData.mdv2Switch && !this.hsmsData.hsmsSwitch){
+	  //   return;
+	  // }
 	  this.flagList[`${type}Flag${state}`] = !this.flagList[`${type}Flag${state}`];
 	  // this.getOrderList(state, state === 1);
 	}
@@ -3907,6 +3886,11 @@ export class MainComponent implements OnInit, OnDestroy {
 		    this.getPatientByResidenceNo(v[1]);
 		  }
 		});
+		
+		this.changeAssetInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.getAssetData(v);
+		});
+		
 		this.onSearchTaskBuildSubject.pipe(debounceTime(500)).subscribe((v) => {
 		  this.getTasktypeByPhone(v);
 		});
@@ -3937,6 +3921,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	applicantMustFillIn:any; //申请人是否必填 1是，0否
 	deptRepair:boolean = false; //科内报修
 	publicRepair:boolean = false; ; //公共报修
+	cmdbRepair:boolean = false; ; //是否支持资产报修
 	getSysConfig() {
 		const postData = { idx: 0, sum: 99 };
 		this.mainService
@@ -3970,6 +3955,13 @@ export class MainComponent implements OnInit, OnDestroy {
 								case "applicantMustFillIn":
 									this.applicantMustFillIn = c[1]
 									break;
+								case "cmdbRepair":
+									if(c[1]=='1'){
+										this.cmdbRepair = true
+									}else{
+										this.cmdbRepair = false
+									}
+									break;	
 							}
 						});
 						if(this.eventData){
@@ -3991,11 +3983,43 @@ export class MainComponent implements OnInit, OnDestroy {
 							}
 							this.searchApplicationBuilding()
 						}
+						
+						if(this.cmdbRepair && this.hospitalModel==1){
+							this.getAssetData()
+						}
 					}
 				}
 			});
 	 }
-
+	
+	changeAsset(e){
+		this.changeAssetInpSubject.next(e);
+	}
+	
+  // 获取资产列表
+	assetData:any = [];
+	getAssetData(name?){
+		// if(!this.incidentModel.hosId){
+		// 	return
+		// }
+		let data = {
+		  idx: 0,
+		  sum: 20,
+		  asset: {
+		    downHosId: this.hospitalModel!=1 ? this.incidentModel.hosId : this.currentHospital.id,
+		    name: name
+		  },
+		};
+		
+		this.mainService
+		  .getFetchDataList("simple/data", "asset", data)
+		  .subscribe((data) => {
+		    if (data.status == 200) {
+		      this.assetData = data.list;
+		    }
+		  });
+	}
+	
 	// 新增报修
 	speedinessAdd(): void {
 		this.addOrder();