解决冲突

src/app/views/common-document/common-document.component.html

@@ -134,9 +134,6 @@
   <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
     (confirmDelEvent)="confirmDel()" content="您确认要删除文档吗？"></app-dialog-delete>
 		
-	<!-- 删除模态框 -->
-	<app-dialog-delete [delModal]="delHistoryModal" (hideDelModalEvent)="hideHistoryModal()" [btnLoading]="btnLoading"
-		(confirmDelEvent)="confirmHistory()" content="您确认要删除吗？"></app-dialog-delete>
 </div>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"

src/app/views/common-document/common-document.component.ts

@@ -812,33 +812,5 @@ export class CommonDocumentComponent implements OnInit{
 		  }
 		);
 	}
-	
-  // 选中表格中科室
-  mapOfCheckedId: { [key: string]: boolean } = {};
-  checkedDepIds = []; //已选中科室id
-  refreshStatus(): void {
-    this.isAllDisplayDataChecked = this.listOfData.every(
-      (item) => this.mapOfCheckedId[item.id]
-    );
-    let arr = [];
-    for (var k in this.mapOfCheckedId) {
-      if (this.mapOfCheckedId[k]) {
-        arr.push(Number(k));
-      }
-    }
-    this.checkedDepIds = arr;
-    console.log(this.checkedDepIds);
-  }
-  //表格整行选中
-  selectedListData(id) {
-    this.mapOfCheckedId[id] = !this.mapOfCheckedId[id];
-    this.refreshStatus();
-  }
-  // 全选
-  isAllDisplayDataChecked = false; //当前页是否全选
-  checkAll(value: boolean): void {
-    this.listOfData.forEach((item) => (this.mapOfCheckedId[item.id] = value));
-    this.refreshStatus();
-  }
 
 }

src/app/views/fuwutai/fuwutai.component.html

@@ -1055,7 +1055,7 @@
           <div class="newTopItem" *ngIf="incidentModel.incomingPhone">
             <span class="grayFont">来电电话：{{incidentModel.incomingPhone}}</span>
           </div>
-          <div class="newTopItem" *ngIf="deptRepair && publicRepair">
+          <div class="newTopItem" *ngIf="deptRepair && publicRepair || !deptRepair && !publicRepair">
             <span class="grayFont">
               <nz-radio-group [nzDisabled]="buildType === '编辑事件'" [(ngModel)]="incidentModel.repairIncidentType" (ngModelChange)="changeRepairIncidentType($event)">
                 <label nz-radio [nzValue]="item.value" *ngFor="let item of repairIncidentTypeList">{{item.name}}</label>

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

@@ -2703,8 +2703,8 @@ export class FuwutaiComponent implements OnInit {
 	config:any;
 	hospitalModel:any; //院区模式 1:单院区 -1：多院区
 	applicantMustFillIn:any; //申请人是否必填 1是，0否
-	deptRepair:any; //科内报修
-	publicRepair:any; //公共报修
+	deptRepair:boolean = false; //科内报修
+	publicRepair:boolean = false; //公共报修
 	getSysConfig() {
 		const postData = { idx: 0, sum: 99 };
 		this.mainService
@@ -2736,13 +2736,19 @@ export class FuwutaiComponent implements OnInit {
 									this.hospitalModel = c[1]
 									if(this.hospitalModel==1){
 										this.incidentModel.hosId = this.tool.getCurrentHospital().id
-										console.log(777777,this.incidentModel.hosId)
 									}
 									break;	
 								case "applicantMustFillIn":
 									this.applicantMustFillIn = c[1]
 									break;	
 							}
+							if(this.publicRepair && !this.deptRepair){
+								this.incidentModel.repairIncidentType = 'public'
+								this.isRelatedDepartment = false
+							}
+							if(!this.publicRepair && this.deptRepair){
+								this.incidentModel.repairIncidentType = 'dept'
+							}
 						});
 					}
 				}

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

@@ -30,11 +30,10 @@
     <nz-header>
       <div class="app-header display_flex justify-content_space-between align-items_center">
         <div class="left">
-					<!-- <i class="icon_transport transport-tianjiahover green" *ngIf='speediness' (click)="speedinessAdd()" nz-tooltip nzTooltipTitle="新增报修"></i> -->
           <div class="dropdown">
             <i class="icon_transport transport-tianjiahover green" (mouseenter)="showFastDropdown = true" (mouseleave)="showFastDropdown = false"></i>
             <div class="dropdown-content ct" [hidden]="!showFastDropdown" (mouseenter)="showFastDropdown = true" (mouseleave)="showFastDropdown = false">
-              <div class="dropdownItem" *ngIf="speediness" (click)="speedinessAdd()">新增报修</div>
+              <div class="dropdownItem" *ngIf="speediness" (click)="speedinessAdd()">新增故障工单</div>
           	</div>
           </div>
 					<i class="icon_transport transport-tiaodu-fill green" *ngIf='deskRole' (click)="toFuwutai()" nz-tooltip nzTooltipTitle="调度台"></i>
@@ -211,7 +210,7 @@
 				<div class="newTopItem" *ngIf="incidentModel.incomingPhone">
 					<span class="grayFont">来电电话：{{incidentModel.incomingPhone}}</span>
 				</div>
-				<div class="newTopItem" *ngIf="deptRepair && publicRepair">
+				<div class="newTopItem" *ngIf="deptRepair && publicRepair || !deptRepair && !publicRepair">
 					<span class="grayFont">
 						<nz-radio-group [nzDisabled]="buildType === '编辑事件'" [(ngModel)]="incidentModel.repairIncidentType" (ngModelChange)="changeRepairIncidentType($event)">
 							<label nz-radio [nzValue]="item.value" *ngFor="let item of repairIncidentTypeList">{{item.name}}</label>
@@ -610,9 +609,9 @@
 				<button nz-button class="btn" nzType="primary" (click)="assignOrder()">
 					建单并派单
 				</button>
-				<button nz-button class="btn" nzType="primary" (click)="temporaryStorage()">
+			<!-- 	<button nz-button class="btn" nzType="primary" (click)="temporaryStorage()">
 					暂存
-				</button>
+				</button> -->
 			</ng-container>
 			<ng-container *ngIf="currentTabIndex === '故障报修' && buildType === '编辑事件'">
 				<button nz-button class="btn" nzType="primary" (click)="saveOrder()">

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

@@ -1086,24 +1086,25 @@ export class MainComponent implements OnInit {
 	// 院区列表
 	applicationHospitalList:any[] = [];
 	searchApplicationHospital() {
-		console.log(666565)
-	  let dataObj = {
-	    idx: 0,
-	    sum: 9999,
-	    hospital: {
-	      selectType:'level1',
-	    },
-	  };
-	  this.isLoading = true;
-	  this.mainService
-	    .getFetchDataList("data", "hospital", dataObj)
-	    .subscribe((data) => {
-	      this.isLoading = false;
-	      if (data.status == 200) {
-	        this.applicationHospitalList = data.list;
-					this.incidentModel.hosId = this.currentHospital.id;
-	      }
-	    });
+		this.applicationHospitalList = this.tool.getHospitalList();
+		this.incidentModel.hosId = this.currentHospital.id;
+	  // let dataObj = {
+	  //   idx: 0,
+	  //   sum: 9999,
+	  //   hospital: {
+	  //     selectType:'level1',
+	  //   },
+	  // };
+	  // this.isLoading = true;
+	  // this.mainService
+	  //   .getFetchDataList("data", "hospital", dataObj)
+	  //   .subscribe((data) => {
+	  //     this.isLoading = false;
+	  //     if (data.status == 200) {
+	  //       this.applicationHospitalList = data.list;
+			// 		this.incidentModel.hosId = this.currentHospital.id;
+	  //     }
+	  //   });
 	}
 	// 选择院区
 	changeApplyHospital(e){
@@ -1214,19 +1215,22 @@ export class MainComponent implements OnInit {
 	// 故障现象列表
 	applicationCategoryList:any[] = [];
 	searchApplicationCategory(keyWord?) {
-	  let dutyIds;
-	  if(this.buildType === '编辑事件'){
-	    dutyIds = this.incidentModel.duty.id.toString();
-	  }else{
-	    dutyIds = this.itsmData.checkedHos.length ? (this.itsmData.checkedHos.map(v => v.id).toString() || undefined) : undefined;
-	  }
+		let list = this.tool.getUserInfoPermission().dutyList
+	  let dutyIds = list.map(i => {
+			return i.id
+		})
+	  // if(this.buildType === '编辑事件'){
+	  //   dutyIds = this.incidentModel.duty.id.toString();
+	  // }else{
+	  //   dutyIds = this.itsmData.checkedHos.length ? (this.itsmData.checkedHos.map(v => v.id).toString() || undefined) : undefined;
+	  // }
 	  let postData = {
 	    category: {
 				hosId: this.currentHospital.id,
 	      category: keyWord,
 	      selectType: 'mutlQuery',
 	      hierarchy: 3,//只差有三级的故障现象列表
-	      dutyIds,
+	      dutyIds: dutyIds.toString(),
 	    },
 	  };
 	  console.log(postData);
@@ -3837,8 +3841,8 @@ export class MainComponent implements OnInit {
 	config:any;
 	hospitalModel:any; //院区模式 1:单院区 -1：多院区
 	applicantMustFillIn:any; //申请人是否必填 1是，0否
-	deptRepair:any; //科内报修
-	publicRepair:any; //公共报修
+	deptRepair:boolean = false; //科内报修
+	publicRepair:boolean = false; ; //公共报修
 	getSysConfig() {
 		const postData = { idx: 0, sum: 99 };
 		this.mainService
@@ -3874,6 +3878,13 @@ export class MainComponent implements OnInit {
 									break;	
 							}
 						});
+						if(this.publicRepair && !this.deptRepair){
+							this.incidentModel.repairIncidentType = 'public'
+							this.isRelatedDepartment = false
+						}
+						if(!this.publicRepair && this.deptRepair){
+							this.incidentModel.repairIncidentType = 'dept'
+						}
 					}
 				}
 			});

src/app/views/monthly-task/monthly-task.component.ts

@@ -169,8 +169,8 @@ export class MonthlyTaskComponent implements OnInit {
 	
 	// 搜索责任人
 	isLoading = false;
-	changeUser(e,type) {
-	  this.searchParentDeptSubject.next([e,type]);
+	changeUser(e) {
+	  this.searchParentDeptSubject.next([e]);
 	}
 	
 	// 获取优先级

src/app/views/personage-document/personage-document.component.html

@@ -134,9 +134,6 @@
   <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
     (confirmDelEvent)="confirmDel()" content="您确认要删除文档吗？"></app-dialog-delete>
 		
-	<!-- 删除模态框 -->
-	<app-dialog-delete [delModal]="delHistoryModal" (hideDelModalEvent)="hideHistoryModal()" [btnLoading]="btnLoading"
-		(confirmDelEvent)="confirmHistory()" content="您确认要删除吗？"></app-dialog-delete>
 </div>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"

src/app/views/personage-document/personage-document.component.ts

@@ -800,33 +800,5 @@ export class PersonageDocumentComponent implements OnInit{
 		  }
 		);
 	}
-	
-  // 选中表格中科室
-  mapOfCheckedId: { [key: string]: boolean } = {};
-  checkedDepIds = []; //已选中科室id
-  refreshStatus(): void {
-    this.isAllDisplayDataChecked = this.listOfData.every(
-      (item) => this.mapOfCheckedId[item.id]
-    );
-    let arr = [];
-    for (var k in this.mapOfCheckedId) {
-      if (this.mapOfCheckedId[k]) {
-        arr.push(Number(k));
-      }
-    }
-    this.checkedDepIds = arr;
-    console.log(this.checkedDepIds);
-  }
-  //表格整行选中
-  selectedListData(id) {
-    this.mapOfCheckedId[id] = !this.mapOfCheckedId[id];
-    this.refreshStatus();
-  }
-  // 全选
-  isAllDisplayDataChecked = false; //当前页是否全选
-  checkAll(value: boolean): void {
-    this.listOfData.forEach((item) => (this.mapOfCheckedId[item.id] = value));
-    this.refreshStatus();
-  }
 
 }

src/app/views/task-inventory/task-inventory.component.html

@@ -87,57 +87,10 @@
       </div>
     </div>
   </div>
-  <!-- 删除模态框 -->
-  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
-    (confirmDelEvent)="confirmDel()" content="您确认要删除文档吗？"></app-dialog-delete>
-		
-	<!-- 删除模态框 -->
-	<app-dialog-delete [delModal]="delHistoryModal" (hideDelModalEvent)="hideHistoryModal()" [btnLoading]="btnLoading"
-		(confirmDelEvent)="confirmHistory()" content="您确认要删除吗？"></app-dialog-delete>
 </div>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo"></app-prompt-modal>
 
 <!-- 查看详情 -->
-<router-outlet></router-outlet>
-<!-- 遮罩 -->
-<app-mask *ngIf="maskFlag"></app-mask>
-
-<app-upload-file [isShow]="isShow" (hideFormHand)="hideExcelImport($event)" *ngIf="isShow" (submitFormHand)="submitExcelImport($event)"></app-upload-file>
-
-<!-- 删除树结构模态框 -->
-  <app-dialog-delete [delModal]="delTreeModal" (hideDelModalEvent)="hideTreeModal()" [btnLoading]="btnLoading"
-    (confirmDelEvent)="confirmTree()" content="您确认要删除目录吗？"></app-dialog-delete>
-		
-<!-- 新增一级目录 -->
-<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="addModal">
-	<div class="modalAddBody">
-		<div class="title">{{add?'新增':'编辑'}}<i class="icon_transport transport-guanbi" (click)="hideAddModal()"></i>
-		</div>
-		<div class="content">
-			<form nz-form [formGroup]="validateTreeForm" class="addForm" (ngSubmit)="submitForm()">
-				<nz-form-item *ngIf="treeType==2">
-					<nz-form-label [nzSpan]="7" nzFor="parent">父级目录名称</nz-form-label>
-					<nz-form-control [nzSpan]="17" nzErrorTip="请输入父级目录名称!">
-						<nz-input-group>
-							<input nz-input disabled formControlName="parent" placeholder="请输入父级目录名称" />
-						</nz-input-group>
-					</nz-form-control>
-				</nz-form-item>
-				<nz-form-item>
-					<nz-form-label [nzSpan]="7" nzRequired nzFor="folderName">目录名称</nz-form-label>
-					<nz-form-control [nzSpan]="17" nzErrorTip="请输入目录名称!">
-						<nz-input-group>
-							<input nz-input formControlName="folderName" placeholder="请输入目录名称" />
-						</nz-input-group>
-					</nz-form-control>
-				</nz-form-item>
-			</form>
-		</div>
-		<div class=" display_flex justify-content_flex-center">
-			<button nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitAddForm()">确认</button>
-			<button class="btn cancel" nz-button nzType="default" (click)="hideAddModal()">取消</button>
-		</div>
-	</div>
-</div>
+<router-outlet></router-outlet>

src/app/views/task-list/task-list.component.html

@@ -137,9 +137,6 @@
   <app-dialog-delete [delModal]="startModal" (hideDelModalEvent)="hideStartModal()" [btnLoading]="btnLoading"
     (confirmDelEvent)="confirmStart()" content="您确认要开始任务吗？"></app-dialog-delete>
 		
-	<!-- 删除模态框 -->
-	<app-dialog-delete [delModal]="delHistoryModal" (hideDelModalEvent)="hideHistoryModal()" [btnLoading]="btnLoading"
-		(confirmDelEvent)="confirmHistory()" content="您确认要删除吗？"></app-dialog-delete>
 </div>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
@@ -147,15 +144,7 @@
 
 <!-- 查看详情 -->
 <router-outlet></router-outlet>
-<!-- 遮罩 -->
-<app-mask *ngIf="maskFlag"></app-mask>
-
-<app-upload-file [isShow]="isShow" (hideFormHand)="hideExcelImport($event)" *ngIf="isShow" (submitFormHand)="submitExcelImport($event)"></app-upload-file>
-
-<!-- 删除树结构模态框 -->
-  <app-dialog-delete [delModal]="delTreeModal" (hideDelModalEvent)="hideTreeModal()" [btnLoading]="btnLoading"
-    (confirmDelEvent)="confirmTree()" content="您确认要删除目录吗？"></app-dialog-delete>
-		
+	
 <!-- 任务记录 -->
 <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="allocationModal">
   <div class="modalBody">

src/app/views/task-list/task-list.component.ts

@@ -203,8 +203,8 @@ export class TaskListComponent implements OnInit {
 	
 	// 搜索责任人
 	isLoading = false;
-	changeUser(e,type) {
-	  this.searchParentDeptSubject.next([e,type]);
+	changeUser(e) {
+	  this.searchParentDeptSubject.next([e]);
 	}
 	
 	// 搜索月度任务