Merge branch 'develop' into lmm

src/app/components/order-scope/order-scope.component.html

@@ -49,6 +49,15 @@
             </nz-radio-group>
           </div>
         </div>
+				<div nz-row>
+				  <div nz-col nzSpan="5">是否展示重新指派：</div>
+				  <div nz-col nzSpan="19">
+				    <nz-radio-group class="w100" [(ngModel)]="showReassign" [nzDisabled]="!activeScopeTab.checked">
+				      <label nz-radio [nzValue]="1">是</label>
+				      <label nz-radio [nzValue]="0">否</label>
+				    </nz-radio-group>
+				  </div>
+				</div>
       </div>
       <!-- 配送 -->
       <div class="conditions" *ngIf="scopeTabs.length>0 && activeScopeTab.value == 2">

src/app/components/order-scope/order-scope.component.ts

@@ -45,6 +45,7 @@ export class OrderScopeComponent implements OnInit {
 	activeScopeTab:any;
 	//#region 工单范围-运维start
 	allDuty:number = 1;
+	showReassign:number = 0;
 	menuList:any;
 	
   ngOnInit() {
@@ -99,7 +100,8 @@ export class OrderScopeComponent implements OnInit {
     itsmGetOrderScope() {
       // 是否不限制部门
       this.allDuty = this.itsmData.allDuty === undefined ? 1 : this.itsmData.allDuty;
-      // 权限内的院区和组
+      this.showReassign = this.itsmData.showReassign;
+			// 权限内的院区和组
       let hosList = this.user.infoPermission.dutyList || [];
       let groups = this.user.infoPermission.dutyGroupList || [];
 
@@ -383,6 +385,7 @@ export class OrderScopeComponent implements OnInit {
 
       if(itsm && itsm.checked){
         postData.workerOrderScope.allDuty = this.allDuty;
+				postData.workerOrderScope.showReassign = this.showReassign;
         postData.workerOrderScope.dutyIds = this.itsmCheckedHos.filter(v => v.checked).map(v => v.value).toString() || undefined;
         postData.workerOrderScope.dutyGroupIds = this.itsmCheckedGroup.filter(v => v.checked).map(v => v.value).toString() || undefined;
         postData.workerOrderScope.dutyRange = this.itsmOrderScopeRadio - 0;

src/app/services/main.service.ts

@@ -1107,5 +1107,11 @@ export class MainService {
 			responseType: "arraybuffer",
 		});
 	}
+	// 恢复删除的用户
+	recoveryUser(data){
+		return this.http.post(host.host + `/user/data/recoveryUser`, data, {
+		  headers: this.headers,
+		});
+	}
 	
 }

src/app/share/hs-prompt-modal/hs-prompt-modal.component.ts

@@ -38,6 +38,7 @@ export class HsPromptModalComponent implements OnInit {
   searchDeptSubject = new Subject();
   deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
   deptDisplayLoading: boolean = false;
+	user:any;
   ngOnInit() {
     this.deptDisplayLoading = true;
     this.tool.getDeptDisplay().subscribe((result) => {
@@ -52,6 +53,7 @@ export class HsPromptModalComponent implements OnInit {
     this.hospitals = this.tool.getHospitalList();
     this.currentHospital = this.tool.getCurrentHospital();
     this.currentDept = this.tool.getCurrentUserDept();
+		this.user = this.tool.getCurrentUserInfo();
     this.initForm();
   }
   initForm() {
@@ -110,6 +112,8 @@ export class HsPromptModalComponent implements OnInit {
       if (result.status == 200) {
         let dataObj = {
           user: {
+						account: this.user.account,
+						upType: "changeDept",
             dept: {
               id: this.validateForm.controls.dutyDeptFc.value,
             },

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

@@ -326,6 +326,7 @@ export class ClinicalUsersManagementComponent implements OnInit {
     });
     let data = {
       user: {
+				upType: "changeDept",
         name: that.validateForm.value.name,
         account: that.validateForm.value.account,
         gradeId: that.validateForm.value.gradeId,
@@ -347,7 +348,10 @@ export class ClinicalUsersManagementComponent implements OnInit {
     }
     if (!that.add) {
       data.user["id"] = that.coopId;
-    }
+			data.user.upType = "changeDept";
+    }else{
+			delete data.user.upType;
+		}
     that.mainService
       .coopData(that.add ? "addData" : "updData", "user", data)
       .subscribe((data) => {

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

@@ -1446,7 +1446,7 @@
                       </nz-select>
                     </div>
                     <div class="col">
-                      <span class="name">事件来源：</span>
+                      <span class="name required">事件来源：</span>
                       <nz-select class="w100" [(ngModel)]="incidentModel.source" nzAllowClear nzPlaceHolder="请选择事件来源">
                         <nz-option [nzValue]="item.id" [nzLabel]="item.name" *ngFor="let item of applicationSourceList"></nz-option>
                       </nz-select>

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

@@ -1377,7 +1377,6 @@ export class FuwutaiComponent implements OnInit {
   itsmCheckedHos;// 运维-院区选择
   itsmScopeGroups = []; //运维-当前所属人员分组
   itsmOrderScopeRadio;// 运维-工单范围
-
   hsmsData: any = {
     checkedHos: undefined,
     scopeGroups: [],
@@ -1423,6 +1422,7 @@ export class FuwutaiComponent implements OnInit {
       orderScopeRadio: this.itsmOrderScopeRadio || '0',
       mdv2Switch: scopeInfo.mdv2Switch === 1,
       allDuty: scopeInfo.allDuty === undefined ? 1 : scopeInfo.allDuty,
+			showReassign: scopeInfo.showReassign == null || scopeInfo.showReassign == 0 ? 0 : 1,
     }
     this.flagList.itsmFlag1 = this.itsmData.mdv2Switch;
     this.flagList.itsmFlag2 = this.itsmData.mdv2Switch;
@@ -1456,6 +1456,7 @@ export class FuwutaiComponent implements OnInit {
   }
 
   showOrderScope() {
+		console.log(1111,this.itsmData)
     this.showInitModal = true;
   }
 
@@ -2137,12 +2138,11 @@ export class FuwutaiComponent implements OnInit {
             range: this.orderScopeRadio,
             platform: 3,
             searchDays: 1,
-            keyWord: keyWords,
+            keyWord: keyWords
           },
           idx: 0,
-          sum: 1,
+          sum: 1
         }
-
         if (this.unassignedBuilding.length && stateId == 1) {
           postData.workOrderQuery.workOrder["deptIds"] = this.unassignedBuilding.toString();
         }
@@ -2162,7 +2162,9 @@ export class FuwutaiComponent implements OnInit {
           "queryTask": "storageAcceptReassign",
           "assignee": this.tool.getCurrentUserId(),
           "deleteFlag": 0,
+					"showReassign":null
         }
+				postData.incidentQuery.incident.showReassign = this.user.user.scope.showReassign==0 || !this.user.user.scope.showReassign ? undefined : this.user.user.scope.showReassign
       }else if(stateId == 2){
         postData.incidentQuery.incident = {
           // "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
@@ -3736,7 +3738,12 @@ export class FuwutaiComponent implements OnInit {
       this.msg.warning('请选择优先级!');
       return;
     }
-
+		
+		if(!this.incidentModel.source){
+		  this.msg.warning('请选择事件来源!');
+		  return;
+		}
+		
     if(!this.incidentModel.description){
       this.msg.warning('请选择故障描述!');
       return;
@@ -3788,6 +3795,11 @@ export class FuwutaiComponent implements OnInit {
       return;
     }
 
+		if(!this.incidentModel.source){
+		  this.msg.warning('请选择事件来源!');
+		  return;
+		}
+		
     if(!this.incidentModel.description){
       this.msg.warning('请选择故障描述!');
       return;
@@ -3974,7 +3986,12 @@ export class FuwutaiComponent implements OnInit {
       this.msg.warning('请选择优先级!');
       return;
     }
-
+		
+		if(!this.incidentModel.source){
+		  this.msg.warning('请选择事件来源!');
+		  return;
+		}
+		
     if(!this.incidentModel.description){
       this.msg.warning('请选择故障描述!');
       return;

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

@@ -1607,6 +1607,7 @@ export class HushijiandanComponent implements OnInit {
     if(type == 1){
       this.btnLoading = true;
       let loginUser:any = cloneDeep(this.loginUser);
+			// loginUser.upType = "changeDept";
       if(this.deptDto.hospital){
         loginUser.hospital = { id: this.deptDto.hospital.id };
       }

src/app/views/inspection-address/inspection-address.component.ts

@@ -140,17 +140,21 @@ export class InspectionAddressComponent implements OnInit {
     this.mainService
       .inspectionPost("getNodeQrCode", batch ? { nodeIds: this.checkedDepIds.toString() } : [id])
       .subscribe((data) => {
-        this.codes = data.data;
-        this.printLoading = false;
-        setTimeout(() => {
-          const printContent = document.getElementById("report");
-          const WindowPrt = window.open("", "", "width=700,height=900");
-          WindowPrt.document.write(printContent.innerHTML);
-          WindowPrt.document.close();
-          WindowPrt.focus();
-          WindowPrt.print();
-          WindowPrt.close();
-        }, 100);
+				if(data.status==200){
+					this.codes = data.data;
+					this.printLoading = false;
+					setTimeout(() => {
+					  const printContent = document.getElementById("report");
+					  const WindowPrt = window.open("", "", "width=700,height=900");
+					  WindowPrt.document.write(printContent.innerHTML);
+					  WindowPrt.document.close();
+					  WindowPrt.focus();
+					  WindowPrt.print();
+					  WindowPrt.close();
+					}, 100);
+				}else{
+					this.showPromptModal('打印', false, data.msg)
+				}
       });
   }
 

src/app/views/new-statistics/components/distribution-search-more/distribution-search-more.component.html

@@ -1,6 +1,6 @@
 <div class="save add display_flex align-items_center justify-content_flex-center">
   <div class="modalBody">
-    <div class="title">详细搜索<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    <div class="title">更多搜索<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
     </div>
     <div class="content">
       <form nz-form [formGroup]="validateForm" class="addForm">

src/app/views/new-statistics/components/query-range/query-range.component.html

@@ -42,6 +42,15 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
+	<!-- 			<nz-form-item class="mb0">
+				  <nz-form-label [nzSpan]="7" nzRequired nzFor="parent">是否显示父级科室</nz-form-label>
+				  <nz-form-control [nzSpan]="15" nzErrorTip="请选择是否显示父级科室!">
+				    <nz-radio-group formControlName="parent">
+				      <label nz-radio [nzValue]="1">是</label>
+				      <label nz-radio [nzValue]="0">否</label>
+				    </nz-radio-group>
+				  </nz-form-control>
+				</nz-form-item> -->
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">

src/app/views/new-statistics/components/query-range/query-range.component.ts

@@ -15,6 +15,7 @@ export class QueryRangeComponent implements OnInit {
   @Input() queryType: number;
   @Input() hospital: any;
   @Input() duty: any;
+	@Input() parent: any;
   validateForm: FormGroup;//表单
   constructor(
     private fb: FormBuilder,
@@ -39,6 +40,7 @@ export class QueryRangeComponent implements OnInit {
       hospital: [(this.hospital && (this.queryType == 2 || this.queryType == 3)) ? this.hospital.id : null],
       duty: [(this.duty && this.queryType == 3) ? this.duty.id : null],
       dutyOne: [(this.duty && this.queryType == 4) ? this.duty.id : null],
+			parent :[this.parent, [Validators.required]]
     });
   }
   // 表单提交
@@ -51,6 +53,7 @@ export class QueryRangeComponent implements OnInit {
     let queryType = this.validateForm.value.queryType;
     let hospital;
     let duty;
+		let parent = this.validateForm.value.parent;
     switch (queryType) {
       case 1:
         break;
@@ -66,7 +69,7 @@ export class QueryRangeComponent implements OnInit {
         duty = this.dutyOneList.find(v => v.id == this.validateForm.value.dutyOne);
         break;
     }
-    this.submitQueryRange.emit({queryType, hospital, duty});
+    this.submitQueryRange.emit({queryType, hospital, duty, parent});
     this.hideModal();
   }
 

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.html

@@ -7,7 +7,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/distribution-inspection-statistics/source-statistics/source-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" accesskey=""(click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.component.html

@@ -7,7 +7,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.html

@@ -7,7 +7,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.html

@@ -7,7 +7,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.html

@@ -27,7 +27,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.html

@@ -17,7 +17,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
@@ -36,6 +36,7 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
+			<!-- <th nzWidth="10%" *ngIf="parent==1">父级科室</th> -->
       <th nzWidth="10%">科室名称(编码)</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
@@ -51,6 +52,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
+			<!-- <td *ngIf="parent==1">{{ data.parentName }}</td> -->
       <td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
       <td>{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.ts

@@ -61,13 +61,15 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
   queryType:any;
   hosId:any;
   dutyId:any;
+	parent:any;
   parentDutyId:any;
   initSessionData(){
     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
     let queryType:any = newStatistics.queryType;
     let hosId:any = newStatistics.hospitalId;
     let dutyId:any = newStatistics.dutyId;
-
+		this.parent = newStatistics.parent;
+		
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;
     dutyId = dutyId ? +dutyId : undefined;
@@ -105,6 +107,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
+			// showParentDept: this.parent==1 ? 'true' : undefined,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.hosId || undefined,

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.component.html

@@ -7,7 +7,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/user-statistics/user-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/maintenance-statistics/work-hour-big-statistics/work-hour-big-statistics.component.html

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div class="operation">
-    <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
     <button nz-button class="btn default" (click)="search()">查询</button>
     <button nz-button class="btn default ml8" (click)="reset()">重置</button>
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>

src/app/views/new-statistics/new-statistics.component.html

@@ -12,4 +12,4 @@
 <router-outlet></router-outlet>
 
 <!-- 查询范围 -->
-<app-query-range [hospital]="hospital" [duty]="duty" [queryType]="queryType" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>
+<app-query-range [hospital]="hospital" [duty]="duty" [queryType]="queryType" [parent]="parent" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>

src/app/views/new-statistics/new-statistics.component.ts

@@ -35,6 +35,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
   hospital;
   duty;
   queryType;//查询范围
+	parent;
   // 初始化院区、部门显示
   initHospitalAndDuty(hospitalOrDuty){
     let sessionData = JSON.parse(sessionStorage.getItem('newStatistics'));
@@ -43,6 +44,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
       this.hospital = sessionData.hospital;
       this.duty = sessionData.duty;
       this.queryType = sessionData.queryType;
+			this.parent = sessionData.parent;
       return;
     }
     let type = 'hospital';//默认是院区
@@ -83,7 +85,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
 
   // 缓存数据
   sessionSave(){
-    sessionStorage.setItem('newStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined, hospital: this.hospital, duty: this.duty}));
+    sessionStorage.setItem('newStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined, hospital: this.hospital, duty: this.duty, parent:this.parent}));
   }
 
   // 查询范围
@@ -91,13 +93,14 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
   queryRangeClick(){
     this.queryRangeFlag = true;
   }
-  submitQueryRange({queryType, hospital, duty}) {
+  submitQueryRange({queryType, hospital, duty, parent}) {
     console.log('queryType:', queryType)
     console.log('hospital:', hospital)
     console.log('duty:', duty)
     this.queryType = queryType;
     this.hospital = hospital;
     this.duty = duty;
+		this.parent = parent;
     this.queryRangeFlag = false;
 
     this.sessionSave();

src/app/views/pathology-communication-book/pathology-communication-book.component.ts

@@ -655,6 +655,8 @@ export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
 		  if (result.status == 200) {
 		    let dataObj = {
 		      user: {
+						upType: "changeDept",
+						account: JSON.parse(localStorage.getItem("user")).user.account,
 		        dept: {
 		          id: this.validateForm.value.specimen,
 		        },

src/app/views/pathology/pathology.component.ts

@@ -166,6 +166,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	toDayData:any = null;
 	toDayTime:any = null;
 	backType='list';
+	user:any;
 	loginUserDeptId: number = JSON.parse(localStorage.getItem("user")).user.dept
 	  .id; //登录人所属科室
   ngOnDestroy() {
@@ -191,6 +192,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.hosId = this.tool.getCurrentHospital().id;
 		this.userId = this.tool.getCurrentUserId()
 		this.deptId = this.tool.getCurrentUserDept().id
+		this.user = this.tool.getCurrentUserInfo();
 		if(localStorage.getItem("pathologyActiveIndex")){
 			this.activeIndex = localStorage.getItem("pathologyActiveIndex")
 			if(this.activeIndex==0){
@@ -1024,6 +1026,8 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		let deptArr = this.validateForm.value.operation.join(',')
 		let data = {
 		  user: {
+				upType: "changeDept",
+				account: this.user.account,
 		    autoCreateOrder: this.validateForm.value.generate,
 				dept:{
 					id:this.validateForm.value.specimen
@@ -1056,6 +1060,8 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		  if (result.status == 200) {
 		    let dataObj = {
 		      user: {
+						upType: "changeDept",
+						account: JSON.parse(localStorage.getItem("user")).user.account,
 		        dept: {
 		          id: this.validateForm.value.specimen,
 		        },

src/app/views/pathologyScan/pathologyScan.component.ts

@@ -729,6 +729,8 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		let deptArr = this.validateForm.value.operation.join(',')
 		let data = {
 		  user: {
+				upType: "changeDept",
+				account: JSON.parse(localStorage.getItem("user")).user.account,
 		    autoCreateOrder: this.validateForm.value.generate,
 				dept:{
 					id:this.validateForm.value.specimen
@@ -761,6 +763,8 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		  if (result.status == 200) {
 		    let dataObj = {
 		      user: {
+						upType: "changeDept",
+						account: JSON.parse(localStorage.getItem("user")).user.account,
 		        dept: {
 		          id: this.validateForm.value.specimen,
 		        },

src/app/views/specimen-room-view/specimen-room-view.component.ts

@@ -124,6 +124,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	searchMsg:any = null;
 	changeInpSubject = new Subject(); //防抖
 	changeInpSubjectSpecimen = new Subject(); //防抖
+	user:any;
   ngOnDestroy() {
     clearTimeout(this.timer);
     clearTimeout(this.logTimer);
@@ -138,6 +139,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		});
 		this.hosId = this.tool.getCurrentHospital().id;
 		this.userId = this.tool.getCurrentUserId()
+		this.user = this.tool.getCurrentUserInfo();
 		// 手术间列表
 		this.getPharmacyList(this.printPharmacyIdx, 'surgeryDept', this.printPharmacySearchKey);
 		// 标本间列表
@@ -506,6 +508,8 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		let deptArr = this.validateForm.value.operation.join(',')
 		let data = {
 		  user: {
+				upType: "changeDept",
+				account: this.user.account,
 		    autoCreateOrder: this.validateForm.value.generate,
 				showFrozen: this.validateForm.value.showFrozen,
 				dept:{

src/app/views/sys-config/sys-config.component.html

@@ -214,6 +214,30 @@
 				    <input nz-input formControlName="supportAppVersion" id="supportAppVersion" placeholder="请输入支助APP版本号">
 				  </nz-form-control>
 				</nz-form-item>
+				<nz-form-item class="formItem">
+				  <nz-form-label [nzSpan]="24" nzFor="autoIncidentDegree" nzRequired class="label">事件默认评价</nz-form-label>
+				  <nz-form-control [nzSpan]="24" nzErrorTip="事件默认评价是必填项!">
+				    <nz-select nzPlaceHolder="请选择事件默认评价" formControlName="autoIncidentDegree">
+				      <nz-option nzValue="{{item.id}}" nzLabel="{{item.name}}" *ngFor="let item of evaluateData"></nz-option>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				<nz-form-item class="formItem">
+				  <nz-form-label [nzSpan]="24" nzFor="autoWechatDegree" nzRequired class="label">微信默认评价</nz-form-label>
+				  <nz-form-control [nzSpan]="24" nzErrorTip="微信默认评价是必填项!">
+				    <nz-select nzPlaceHolder="请选择微信默认评价" formControlName="autoWechatDegree">
+				      <nz-option nzValue="{{item.id}}" nzLabel="{{item.name}}" *ngFor="let item of evaluateData"></nz-option>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				<nz-form-item class="formItem">
+				  <nz-form-label [nzSpan]="24" nzFor="workorderEvaluation" nzRequired class="label">转运默认评价</nz-form-label>
+				  <nz-form-control [nzSpan]="24" nzErrorTip="转运默认评价是必填项!">
+				    <nz-select nzPlaceHolder="请选择转运默认评价" formControlName="workorderEvaluation">
+				      <nz-option nzValue="{{item.id}}" nzLabel="{{item.name}}" *ngFor="let item of workorderEvaluation"></nz-option>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
       </div>
     </form>
   </overlay-scrollbars>

src/app/views/sys-config/sys-config.component.ts

@@ -75,6 +75,9 @@ export class SysConfigComponent implements OnInit {
 			repairs: [null, [Validators.required]],
 			cmdbRepair: [null, [Validators.required]],
 			supportAppVersion: [null, [Validators.required]],
+			autoIncidentDegree: [null, [Validators.required]],
+			autoWechatDegree: [null, [Validators.required]],
+			workorderEvaluation: [null, [Validators.required]]
     });
     this.getDeptType();
     this.coopBtns = this.tool.initCoopBtns(this.route);
@@ -154,7 +157,10 @@ export class SysConfigComponent implements OnInit {
 				item.keyconfig === "deptRepair" ||
 				item.keyconfig === "publicRepair" ||
 				item.keyconfig === "cmdbRepair" ||
-				item.keyconfig === "supportAppVersion"
+				item.keyconfig === "supportAppVersion" ||
+				item.keyconfig === "autoIncidentDegree" ||
+				item.keyconfig === "autoWechatDegree" ||
+				item.keyconfig === "workorderEvaluation"
     );
 		console.log(7777,this.validateForm.controls.repairs.value)
     filterData.forEach((item) => {
@@ -210,6 +216,12 @@ export class SysConfigComponent implements OnInit {
         item.valueconfig = this.validateForm.controls.cmdbRepair.value;
       }else if (item.keyconfig === "supportAppVersion") {
         item.valueconfig = this.validateForm.controls.supportAppVersion.value;
+      }else if (item.keyconfig === "autoIncidentDegree") {
+        item.valueconfig = this.validateForm.controls.autoIncidentDegree.value;
+      }else if (item.keyconfig === "autoWechatDegree") {
+        item.valueconfig = this.validateForm.controls.autoWechatDegree.value;
+      }else if (item.keyconfig === "workorderEvaluation") {
+        item.valueconfig = this.validateForm.controls.workorderEvaluation.value;
       }
     });
     const postData = filterData;
@@ -231,12 +243,20 @@ export class SysConfigComponent implements OnInit {
   }
   // 获取科室类型
   deptTypes: any = [];
+	evaluateData: any = [];
+	workorderEvaluation: any = [];
   getDeptType() {
     this.loading1 = true;
     this.mainService.getDictionary("list", "dept_type").subscribe((result) => {
       this.deptTypes = result;
-      this.getSysConfig();
     });
+		this.mainService.getDictionary("list", "incident_degree").subscribe((result) => {
+		  this.evaluateData = result;
+		});
+		this.mainService.getDictionary("list", "workorderEvaluation").subscribe((result) => {
+		  this.workorderEvaluation = result;
+		  this.getSysConfig();
+		});
   }
   // 格式化自动关闭工单设置的数字选择框
   formatterPercent = (value: number) => `${value}小时`;
@@ -341,6 +361,15 @@ export class SysConfigComponent implements OnInit {
 								case "supportAppVersion":
 								  this.validateForm.controls.supportAppVersion.setValue(c[1]);
 								  break;
+								case "autoIncidentDegree":
+								  this.validateForm.controls.autoIncidentDegree.setValue(c[1] + "");
+								  break;
+								case "autoWechatDegree":
+								  this.validateForm.controls.autoWechatDegree.setValue(c[1] + "");
+								  break;
+								case "workorderEvaluation":
+								  this.validateForm.controls.workorderEvaluation.setValue(c[1] + "");
+								  break;
               }
             });
           } else {

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

@@ -230,6 +230,12 @@
 <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" [cancenlLoading]="cancenlLoading"
   (confirmDelEvent)="confirmDel()" (cancelDelEvent)="cancelDel()" content="是否删除企业微信同用户？" confirmTxt="是" cancelTxt="否">
 </app-dialog-delete>
+
+<!-- 恢复账号 -->
+<app-dialog-delete [delModal]="recoverModal" (hideDelModalEvent)="hideRecoverModal()" [btnLoading]="recoverLoading"
+  (confirmDelEvent)="confirmRecover()" [content]="recoverContent" [isShowConfirm]="false">
+</app-dialog-delete>
+
 <!-- 重置密码模态框 -->
 <app-dialog-delete [delModal]="resetModal" (hideDelModalEvent)="hideResetModal()" [btnLoading]="btnLoading" [cancenlLoading]="cancenlLoading"
   (confirmDelEvent)="confirmReset()" (cancelDelEvent)="cancelReset()" content="是否重置密码？">

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

@@ -63,6 +63,8 @@ export class UsersManagementComponent implements OnInit {
   promptModalShow: boolean; //操作提示框是否展示
 
   btnLoading: boolean = false; //提交按钮loading状态
+	recoverLoading: boolean = false; //提交按钮loading状态
+	recoverModal: boolean = false; //恢复模态框
   wxRequired = false; //新增或编辑用户的时候，微信号是否必填
   changeInpSubject = new Subject(); //防抖
   changeInpCompanySubject = new Subject(); //防抖
@@ -392,6 +394,8 @@ export class UsersManagementComponent implements OnInit {
     }
   }
   // 表单提交
+	recoverContent:any;
+	userData:any;
   submitForm(): void {
     var that = this;
     for (const i in that.validateForm.controls) {
@@ -412,6 +416,7 @@ export class UsersManagementComponent implements OnInit {
     });
     let data = {
       user: {
+				upType: "changeDept",
         name: that.validateForm.value.name,
         account: that.validateForm.value.account,
         gradeId: that.validateForm.value.gradeId,
@@ -434,7 +439,10 @@ export class UsersManagementComponent implements OnInit {
     }
     if (!that.add) {
       data.user["id"] = that.coopId;
-    }
+			data.user.upType = "changeDept"
+    }else{
+			delete data.user.upType
+		}
     that.mainService
       .coopData(that.add ? "addData" : "updData", "user", data)
       .subscribe((data) => {
@@ -443,9 +451,13 @@ export class UsersManagementComponent implements OnInit {
         that.initForm();
         if (data.status == 200) {
           that.showPromptModal(that.add ? "新增" : "编辑", true, "");
-        } else {
-          that.showPromptModal(that.add ? "新增" : "编辑", false, data.msg);
-        }
+        } else if(data.status == 2002 || data.status == 2004){
+					this.userData = data
+					this.recoverContent = data.msg
+					this.recoverModal = true;
+        }else{
+					that.showPromptModal(that.add ? "新增" : "编辑", false, data.msg);
+				}
       });
   }
 
@@ -618,6 +630,42 @@ export class UsersManagementComponent implements OnInit {
         }
       });
   }
+	
+	// 确认恢复
+	confirmRecover() {
+		this.hideRecoverModal();
+		return
+	  let that = this;
+		let query = {
+			account:'',
+			weiXin:''
+		}
+		if(this.userData.status==2002){
+			query.account = this.userData.data.account
+			delete query.weiXin
+		}else if (this.userData.status==2004){
+			query.weiXin = this.userData.data.weixin
+			delete query.account
+		}
+	  that.recoverLoading = true;
+	  that.mainService
+	    .recoveryUser(query)
+	    .subscribe((data) => {
+	      that.recoverLoading = false;
+	      that.hideRecoverModal();
+	      if (data["status"] == 200) {
+	        that.showPromptModal("恢复", true, "");
+	      } else {
+	        that.showPromptModal("恢复", false, data["msg"]);
+	      }
+	    });
+	}
+	
+	// 关闭恢复模态框
+	hideRecoverModal() {
+	  this.recoverModal = false;
+	}
+	
   // 关闭删除模态框
   hideDelModal() {
     this.delModal = false;