优化

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

@@ -159,7 +159,7 @@ export class IncidentHandleComponent implements OnInit {
       idx: 0,
       sum: 9999,
       solution: {
-        category: categoryId,
+        categoryId,
 				status: this.solutionStatus,
 				type: this.solutionType,
       },

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

@@ -648,19 +648,17 @@ export class FuwutaiComponent implements OnInit {
     this.coopBtns = this.tool.initCoopBtns(this.route);
     //防抖
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
-      v[1] !== '' && this.searchApplicationDepartment(v[0], v[1]);
+      this.searchApplicationDepartment(v[0], v[1]);
     });
     this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
-      if(v[1] !== ''){
-        if(v[0] === 'requester'){
-          this.searchApplicationRequester(v[1]);
-        }else if(v[0] === 'category'){
-          this.searchApplicationCategory(v[1]);
-        }else if(v[0] === 'group'){
-          this.searchApplicationGroup(v[1]);
-        }else if(v[0] === 'user'){
-          this.searchApplicationUser(v[1]);
-        }
+      if(v[0] === 'requester'){
+        this.searchApplicationRequester(v[1]);
+      }else if(v[0] === 'category'){
+        this.searchApplicationCategory(v[1]);
+      }else if(v[0] === 'group'){
+        this.searchApplicationGroup(v[1]);
+      }else if(v[0] === 'user'){
+        this.searchApplicationUser(v[1]);
       }
     });
     this.onSearchTaskBuildSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -1640,7 +1638,7 @@ export class FuwutaiComponent implements OnInit {
       idx: 0,
       sum: 9999,
       solution: {
-        category: this.incidentModel.category,
+        categoryId: this.incidentModel.category,
 				status: this.solutionStatus,
 				type: this.solutionType,
       },
@@ -2228,12 +2226,18 @@ export class FuwutaiComponent implements OnInit {
       }
     });
   }
+  // 重置新建工单数据
+  resetOrderData(){
+    this.applicationRequesterList = [];
+    this.fileList = [];
+  }
   // 打开新建工单
   deathTasktypeId; //获取这个写死的任务类型的id,送病人回病房
   deathTasktypeIdPatient; //获取这个写死的任务类型的id,转出院记录
   async showNewOrder(des = '', phone = '', isInit = false, buildType = '') {
     this.buildType = buildType;
     if(this.itsmData.mdv2Switch){
+      this.resetOrderData();
       this.searchApplicationHospital();
       this.searchApplicationCategory();
       this.searchApplicationPriority();
@@ -2255,7 +2259,7 @@ export class FuwutaiComponent implements OnInit {
         this.incidentModel.department = isInit ? this.incidentModel.department : null;
 
         //正常初始化
-        this.getAutoWorkTypes(false);
+        this.getAutoWorkTypes(false, isInit);
         return;
       }
     }
@@ -2319,7 +2323,7 @@ export class FuwutaiComponent implements OnInit {
         this.searchTaskList.forEach((item) => {
           item.sid = item.associationTypeId + "_" + item.id;
         });
-        this.getAutoWorkTypes(true);
+        this.getAutoWorkTypes(false, isInit);
       }
     });
   }
@@ -2349,7 +2353,7 @@ export class FuwutaiComponent implements OnInit {
     }
   }
   // 点击tab切换
-  tabClick(key) {
+  tabClick(key, isInit = false) {
     let preCurrentTabIndex = this.currentTabIndex;
     this.currentTabIndex = key;
     this.radioValueQt = null;
@@ -2381,7 +2385,7 @@ export class FuwutaiComponent implements OnInit {
 
       let deptObj = this.applicationDeptList.find(v => v.id == this.incidentModel.department);
 
-      if(this.applyDept != this.incidentModel.department){
+      if(this.applyDept !== this.incidentModel.department){
         this.applyDept = this.incidentModel.department;
         this.searchApplicationDepartment('hsms', deptObj ? deptObj.dept : '', undefined, this.incidentModel.department);
       }
@@ -2402,7 +2406,7 @@ export class FuwutaiComponent implements OnInit {
 
       let deptObj = this.applicationDepartmentList.find(v => v.id == this.applyDept);
 
-      if(this.incidentModel.department != this.applyDept){
+      if(this.incidentModel.department !== this.applyDept && !isInit){
         this.incidentModel.department = this.applyDept;
         this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, this.applyDept);
       }
@@ -2472,11 +2476,13 @@ export class FuwutaiComponent implements OnInit {
   // 选择院区
   changeApplyHospital(e){
     console.log(e);
+
     this.incidentModel.department = undefined;
     this.searchApplicationDepartment('itsm');
 
     if(this.buildType !== '报修转事件'){
       this.incidentModel.requester = undefined;
+      this.searchApplicationRequester();
     }
     this.applicationRequesterList = [];
 
@@ -2530,6 +2536,16 @@ export class FuwutaiComponent implements OnInit {
   applicationRequesterList:any[] = [];
   isRelatedDepartment:boolean = true;
   searchApplicationRequester(keyWord?) {
+    // 关联查询，且没选择申请科室
+    if(this.isRelatedDepartment && !this.incidentModel.department){
+      this.applicationRequesterList = [];
+      return;
+    }
+    // 不关联查询，且没选择院区
+    if(!this.isRelatedDepartment && !this.incidentModel.hosId){
+      this.applicationRequesterList = [];
+      return;
+    }
     let postData = {
       idx: 0,
       sum: 20,
@@ -2588,15 +2604,16 @@ export class FuwutaiComponent implements OnInit {
     console.log(e)
     // 知识库
     this.getKnowageList();
-    // 根据院区和故障现象带出责任部门，优先级，维修人/组，故障描述
-    if(this.incidentModel.hosId && e){
-      // 带出故障描述
+    if(e){
+      // 根据故障现象带出故障描述
       if(this.incidentModel.description){
-        this.incidentModel.description = this.incidentModel.description + ' ' + this.applicationCategoryList.find(v => v.id == e).mutiCategory;
+        this.incidentModel.description = this.incidentModel.description + '；' + this.applicationCategoryList.find(v => v.id == e).mutiCategory;
       }else{
         this.incidentModel.description = this.applicationCategoryList.find(v => v.id == e).mutiCategory;
       }
-
+    }
+    // 根据院区和故障现象带出责任部门，优先级，维修人/组
+    if(this.incidentModel.hosId && e){
       let postData = {
         idx: 0,
         sum: 9999,
@@ -2847,7 +2864,7 @@ export class FuwutaiComponent implements OnInit {
       group2: {
         groupName: keyWord,
         hospitals: this.incidentModel.duty ? this.incidentModel.duty.id.toString() : undefined,
-        type: 1,
+        type: 3,
       },
     };
     this.isLoading = true;
@@ -2918,7 +2935,7 @@ export class FuwutaiComponent implements OnInit {
   }
   // 楼栋列表
   applicationBuildingList:any[] = [];
-  searchApplicationBuilding(keyWord?) {
+  searchApplicationBuilding(keyWord?, buildingId?) {
     let postData = {
       idx: 0,
       sum: 9999,
@@ -2933,6 +2950,10 @@ export class FuwutaiComponent implements OnInit {
         this.isLoading = false;
         if (data.status == 200) {
           this.applicationBuildingList = data.list;
+          if(buildingId){
+            let hasBuildingId = this.applicationBuildingList.some(v => v.id == buildingId);
+            hasBuildingId && (this.incidentModel.area = buildingId);
+          }
         }
       });
   }
@@ -2944,7 +2965,7 @@ export class FuwutaiComponent implements OnInit {
   }
   // 楼层列表
   applicationFloorList:any[] = [];
-  searchApplicationFloor(keyWord?) {
+  searchApplicationFloor(keyWord?, floorId?) {
     let postData = {
       idx: 0,
       sum: 9999,
@@ -2960,6 +2981,10 @@ export class FuwutaiComponent implements OnInit {
         this.isLoading = false;
         if (data.status == 200) {
           this.applicationFloorList = data.list;
+          if(floorId){
+            let hasFloorId = this.applicationFloorList.some(v => v.id == floorId);
+            hasFloorId && (this.incidentModel.place = floorId);
+          }
         }
       });
   }
@@ -3043,6 +3068,7 @@ export class FuwutaiComponent implements OnInit {
             this.applicationDeptList = data.list;
             let ids = this.applicationDeptList.map(v => v.id);
             isInit && !ids.includes(this.incidentModel.department) && (this.applicationDeptList.unshift({id: this.incidentModel.department, dept: this.incidentMsg.deptName}))
+            console.log(this.applicationDeptList);
             deptId && this.changeApplyDept(deptId);
           }
         }
@@ -3075,7 +3101,7 @@ export class FuwutaiComponent implements OnInit {
 
     let deptObj = this.applicationDepartmentList.find(v => v.id == e);
 
-    if(this.incidentModel.department != e){
+    if(this.incidentModel.department !== e){
       this.incidentModel.department = e;
       this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, e);
     }
@@ -3094,7 +3120,7 @@ export class FuwutaiComponent implements OnInit {
 
     let deptObj = this.applicationDeptList.find(v => v.id == e);
 
-    if(this.applyDept != e){
+    if(this.applyDept !== e){
       this.applyDept = e;
       this.searchApplicationDepartment('hsms', deptObj ? deptObj.dept : '', undefined, e);
     }
@@ -3116,10 +3142,10 @@ export class FuwutaiComponent implements OnInit {
     if(deptObj){
       console.log('deptObj:', deptObj)
       this.incidentMsg.deptManyPhone = deptObj.manyPhone;
-      this.incidentModel.area = deptObj.building ? deptObj.building.id : undefined;
-      this.incidentModel.area && this.searchApplicationBuilding();
-      this.incidentModel.place = deptObj.floor ? deptObj.floor.id : undefined;
-      this.incidentModel.place && this.searchApplicationFloor();
+      let buildingId = deptObj.building ? deptObj.building.id : undefined;
+      buildingId && this.searchApplicationBuilding('', buildingId);
+      let floorId = deptObj.floor ? deptObj.floor.id : undefined;
+      floorId && this.searchApplicationFloor('', floorId);
       this.incidentModel.houseNumber = deptObj.address;
     }
 
@@ -3460,7 +3486,7 @@ export class FuwutaiComponent implements OnInit {
   }
 
   // 新建工单->获取新建类型
-  getAutoWorkTypes(isFirst) {
+  getAutoWorkTypes(isFirst, isInit) {
     this.workTypesArrange = {};
     // 运维
     if(this.itsmData.mdv2Switch){
@@ -3471,7 +3497,7 @@ export class FuwutaiComponent implements OnInit {
         this.workTypesFlag = Object.keys(this.workTypesArrange).length >= 5;
         // 默认选中第一项
         if (Object.keys(this.workTypesArrange).length > 0) {
-          this.tabClick(Object.keys(this.workTypesArrange)[0]);
+          this.tabClick(Object.keys(this.workTypesArrange)[0], isInit);
         }
       }
     }
@@ -3497,7 +3523,7 @@ export class FuwutaiComponent implements OnInit {
           this.workTypesFlag = arr.length >= 5;
           // 默认选中第一项
           if (arr.length > 0) {
-            isFirst ? this.tabClick(arr[0]) : this.tabClick(arr[arr.length - 1]);
+            isFirst ? this.tabClick(arr[0], isInit) : this.tabClick(arr[arr.length - 1], isInit);
           }
         }
       });

src/app/views/inspection-plan-config/inspection-plan-config.component.ts

@@ -207,7 +207,7 @@ export class InspectionPlanConfigComponent implements OnInit, AfterViewInit {
       group2: {
         groupName: keyword,
         hospitals: this.currentHospital.id,
-        type: 1,
+        type: 3,
       },
       idx: 0,
       sum: 10,

src/app/views/repository-manage/repository-manage.component.ts

@@ -41,7 +41,7 @@ export class RepositoryManageComponent implements OnInit {
   ) {}
   ngOnInit() {
     this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
-			
+
     });
 		this.hosId = this.tool.getCurrentHospital().id;
     this.coopBtns = this.tool.initCoopBtns(this.route);
@@ -58,7 +58,7 @@ export class RepositoryManageComponent implements OnInit {
   validateForm: FormGroup; //新增/编辑表单
   coopId: number; //表格中执行操作的id
   department: number; //所属科室
-	hosId: number; 
+	hosId: number;
 	loadAllConsumeDept: boolean = true;//是否加载所有消耗科室
   solutionNumber; //编号
 	title; //标题
@@ -115,7 +115,7 @@ export class RepositoryManageComponent implements OnInit {
   hideDelModal1() {
     this.editModal = false;
   }
-	
+
   // 编辑保存
   confirmDel1() {
     var that = this;
@@ -180,7 +180,7 @@ export class RepositoryManageComponent implements OnInit {
         that.listLength = data.totalNum;
       });
   }
-	
+
 	// 版本号点击
 	versionsClick(data, index){
 		this.vIndex = index
@@ -192,14 +192,14 @@ export class RepositoryManageComponent implements OnInit {
 			this.richText = ''
 		}
 	}
-	
+
 	// 点击附件
 	fileClick(data){
 		console.log(222,data)
 		let a: any = document.createElement('a') // 创建一个元素
 		a.style = 'display: none' // 不能在页面中被看到，把他隐藏起来
 		a.style.height = '0px' // 给个0高度，避免影响页面布局
-		a.download = data.name; 
+		a.download = data.name;
 		a.href = data.url // 文件url地址
 		document.body.appendChild(a)  //  将其绑定在body上才能发挥作用
 		a.click() // 触发a标签的click事件
@@ -209,7 +209,7 @@ export class RepositoryManageComponent implements OnInit {
   hideModal() {
     this.modal = false;
   }
-	
+
 	// 审核通过
 	confirmDel4() {
 		let data: any = {
@@ -229,16 +229,16 @@ export class RepositoryManageComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	hideDelModal4() {
 	  this.auditModal = false;
 	}
-	
+
 	// 审核驳回
 	rejectCancel(){
 		this.rejectModal = false
 	}
-	
+
 	// 审核驳回
 	rejectOk(){
 		if(this.rejectData==null){
@@ -263,11 +263,11 @@ export class RepositoryManageComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	closeModel(){
 		this.hideModal()
 	}
-	
+
   // 表单提交
 	auditModal = false;
   submitForm(type): void {
@@ -279,18 +279,18 @@ export class RepositoryManageComponent implements OnInit {
 			this.rejectModal = true
 		}
   }
-	
+
 	// 升级
 	upgrade(e, data){
 		e.stopPropagation();
 		this.router.navigateByUrl(`/repositoryManageAdd/${data.id}?type=upgrade`);
 	}
-	
+
 	// 新增
 	addForm(){
 		this.router.navigateByUrl(`/repositoryManageAdd/0`);
 	}
-	
+
 	// 查看
 	look(e, data){
 		e.stopPropagation();
@@ -334,7 +334,7 @@ export class RepositoryManageComponent implements OnInit {
 				this.isSpinning = false
 			});
 	}
-	
+
 	getFile(){
 		this.mainService
 			.getPreviewImage('solution', this.rowId)
@@ -347,7 +347,7 @@ export class RepositoryManageComponent implements OnInit {
 				});
 			});
 	}
-	
+
 	// 审核
 	rowId=null;
 	audit(e, data){
@@ -375,22 +375,22 @@ export class RepositoryManageComponent implements OnInit {
 				this.detailData = data
 				this.richText = this.sanitizer.bypassSecurityTrustHtml(data[0].content);
 				for(let i of data[0].solutionLogs){
-					i.time = format(i.operationTime, 'yyyy-MM-dd HH:mm') 
+					i.time = format(i.operationTime, 'yyyy-MM-dd HH:mm')
 				}
 				this.lookData = data[0]
 				this.solutionLogs = data[0].solutionLogs
 				this.stepLength = this.solutionLogs.length
 				this.isSpinning = false
 			});
-	
+
 	}
-	
+
 	// 编辑
 	edit(e, data) {
 	  e.stopPropagation();
 	  this.router.navigateByUrl(`/repositoryManageAdd/${data.id}?type=edit`);
 	}
-	
+
 	// 停用
 	pauseModal = false;
 	pause(e, data){
@@ -398,7 +398,7 @@ export class RepositoryManageComponent implements OnInit {
 		this.pauseModal = true;
 		this.coopId = data.id;
 	}
-	
+
 	// 确认停用
 	confirmDel2() {
 	  var that = this;
@@ -419,12 +419,12 @@ export class RepositoryManageComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	hideDelModal2() {
 	  this.pauseModal = false;
 	}
-	
-	
+
+
 	// 恢复
 	renewModal = false;
 	renew(e, data){
@@ -432,7 +432,7 @@ export class RepositoryManageComponent implements OnInit {
 		this.renewModal = true;
 		this.coopId = data.id;
 	}
-	
+
 	// 确认恢复
 	confirmDel3() {
 	  var that = this;
@@ -453,11 +453,11 @@ export class RepositoryManageComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	hideDelModal3() {
 	  this.renewModal = false;
 	}
-	
+
 
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?) {

src/app/views/users-management/users-management.component.ts

@@ -257,7 +257,7 @@ export class UsersManagementComponent implements OnInit {
     let groupData = {
       group2: {
         hospitals: hid,
-        type:1
+        typeIds: '1,3',
       },
       idx: 0,
       sum: 9999,
@@ -303,7 +303,7 @@ export class UsersManagementComponent implements OnInit {
     let groupData = {
       group2: {
         hospitals: id,
-        type:1
+        typeIds: '1,3',
       },
       idx: 0,
       sum: 9999,
@@ -469,7 +469,7 @@ export class UsersManagementComponent implements OnInit {
     let groupData = {
       group2: {
         hospitals: hid,
-        type:1
+        typeIds: '1,3',
       },
       idx: 0,
       sum: 9999,