Kaynağa Gözat

修改用户bug

maotao 2 ay önce
ebeveyn
işleme
3052249696
44 değiştirilmiş dosya ile 172 ekleme ve 49 silme
  1. 4 0
      src/app/share/hs-prompt-modal/hs-prompt-modal.component.ts
  2. 5 1
      src/app/views/clinical-users-management/clinical-users-management.component.ts
  3. 1 1
      src/app/views/fuwutai/fuwutai.component.html
  4. 17 2
      src/app/views/fuwutai/fuwutai.component.ts
  5. 1 0
      src/app/views/hushijiandan/hushijiandan.component.ts
  6. 15 11
      src/app/views/inspection-address/inspection-address.component.ts
  7. 1 1
      src/app/views/new-statistics/components/distribution-search-more/distribution-search-more.component.html
  8. 9 0
      src/app/views/new-statistics/components/query-range/query-range.component.html
  9. 4 1
      src/app/views/new-statistics/components/query-range/query-range.component.ts
  10. 1 1
      src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.html
  11. 1 1
      src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.html
  12. 1 1
      src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.html
  13. 1 1
      src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.html
  14. 1 1
      src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.html
  15. 1 1
      src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.html
  16. 1 1
      src/app/views/new-statistics/distribution-inspection-statistics/source-statistics/source-statistics.component.html
  17. 1 1
      src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.component.html
  18. 1 1
      src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.html
  19. 1 1
      src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.component.html
  20. 1 1
      src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.html
  21. 1 1
      src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.html
  22. 1 1
      src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.html
  23. 1 1
      src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.html
  24. 1 1
      src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.html
  25. 1 1
      src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.html
  26. 3 1
      src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.html
  27. 4 1
      src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.ts
  28. 1 1
      src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.html
  29. 1 1
      src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.html
  30. 1 1
      src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.component.html
  31. 1 1
      src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.html
  32. 1 1
      src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.component.html
  33. 1 1
      src/app/views/new-statistics/maintenance-statistics/user-statistics/user-statistics.component.html
  34. 1 1
      src/app/views/new-statistics/maintenance-statistics/work-hour-statistics/work-hour-statistics.component.html
  35. 1 1
      src/app/views/new-statistics/new-statistics.component.html
  36. 5 2
      src/app/views/new-statistics/new-statistics.component.ts
  37. 2 0
      src/app/views/pathology-communication-book/pathology-communication-book.component.ts
  38. 6 0
      src/app/views/pathology/pathology.component.ts
  39. 4 0
      src/app/views/pathologyScan/pathologyScan.component.ts
  40. 4 0
      src/app/views/specimen-room-view/specimen-room-view.component.ts
  41. 24 0
      src/app/views/sys-config/sys-config.component.html
  42. 31 2
      src/app/views/sys-config/sys-config.component.ts
  43. 1 1
      src/app/views/users-management/users-management.component.html
  44. 7 1
      src/app/views/users-management/users-management.component.ts

+ 4 - 0
src/app/share/hs-prompt-modal/hs-prompt-modal.component.ts

@@ -38,6 +38,7 @@ export class HsPromptModalComponent implements OnInit {
38 38
   searchDeptSubject = new Subject();
39 39
   deptDisplay; //护士端是否显示可以别名,1是显示科室名称,2是显示科室别名
40 40
   deptDisplayLoading: boolean = false;
41
+	user:any;
41 42
   ngOnInit() {
42 43
     this.deptDisplayLoading = true;
43 44
     this.tool.getDeptDisplay().subscribe((result) => {
@@ -52,6 +53,7 @@ export class HsPromptModalComponent implements OnInit {
52 53
     this.hospitals = this.tool.getHospitalList();
53 54
     this.currentHospital = this.tool.getCurrentHospital();
54 55
     this.currentDept = this.tool.getCurrentUserDept();
56
+		this.user = this.tool.getCurrentUserInfo();
55 57
     this.initForm();
56 58
   }
57 59
   initForm() {
@@ -110,6 +112,8 @@ export class HsPromptModalComponent implements OnInit {
110 112
       if (result.status == 200) {
111 113
         let dataObj = {
112 114
           user: {
115
+						account: this.user.account,
116
+						upType: "changeDept",
113 117
             dept: {
114 118
               id: this.validateForm.controls.dutyDeptFc.value,
115 119
             },

+ 5 - 1
src/app/views/clinical-users-management/clinical-users-management.component.ts

@@ -326,6 +326,7 @@ export class ClinicalUsersManagementComponent implements OnInit {
326 326
     });
327 327
     let data = {
328 328
       user: {
329
+				upType: "changeDept",
329 330
         name: that.validateForm.value.name,
330 331
         account: that.validateForm.value.account,
331 332
         gradeId: that.validateForm.value.gradeId,
@@ -347,7 +348,10 @@ export class ClinicalUsersManagementComponent implements OnInit {
347 348
     }
348 349
     if (!that.add) {
349 350
       data.user["id"] = that.coopId;
350
-    }
351
+			data.user.upType = "changeDept";
352
+    }else{
353
+			delete data.user.upType;
354
+		}
351 355
     that.mainService
352 356
       .coopData(that.add ? "addData" : "updData", "user", data)
353 357
       .subscribe((data) => {

+ 1 - 1
src/app/views/fuwutai/fuwutai.component.html

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

+ 17 - 2
src/app/views/fuwutai/fuwutai.component.ts

@@ -3738,7 +3738,12 @@ export class FuwutaiComponent implements OnInit {
3738 3738
       this.msg.warning('请选择优先级!');
3739 3739
       return;
3740 3740
     }
3741
-
3741
+		
3742
+		if(!this.incidentModel.source){
3743
+		  this.msg.warning('请选择事件来源!');
3744
+		  return;
3745
+		}
3746
+		
3742 3747
     if(!this.incidentModel.description){
3743 3748
       this.msg.warning('请选择故障描述!');
3744 3749
       return;
@@ -3790,6 +3795,11 @@ export class FuwutaiComponent implements OnInit {
3790 3795
       return;
3791 3796
     }
3792 3797
 
3798
+		if(!this.incidentModel.source){
3799
+		  this.msg.warning('请选择事件来源!');
3800
+		  return;
3801
+		}
3802
+		
3793 3803
     if(!this.incidentModel.description){
3794 3804
       this.msg.warning('请选择故障描述!');
3795 3805
       return;
@@ -3976,7 +3986,12 @@ export class FuwutaiComponent implements OnInit {
3976 3986
       this.msg.warning('请选择优先级!');
3977 3987
       return;
3978 3988
     }
3979
-
3989
+		
3990
+		if(!this.incidentModel.source){
3991
+		  this.msg.warning('请选择事件来源!');
3992
+		  return;
3993
+		}
3994
+		
3980 3995
     if(!this.incidentModel.description){
3981 3996
       this.msg.warning('请选择故障描述!');
3982 3997
       return;

+ 1 - 0
src/app/views/hushijiandan/hushijiandan.component.ts

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

+ 15 - 11
src/app/views/inspection-address/inspection-address.component.ts

@@ -140,17 +140,21 @@ export class InspectionAddressComponent implements OnInit {
140 140
     this.mainService
141 141
       .inspectionPost("getNodeQrCode", batch ? { nodeIds: this.checkedDepIds.toString() } : [id])
142 142
       .subscribe((data) => {
143
-        this.codes = data.data;
144
-        this.printLoading = false;
145
-        setTimeout(() => {
146
-          const printContent = document.getElementById("report");
147
-          const WindowPrt = window.open("", "", "width=700,height=900");
148
-          WindowPrt.document.write(printContent.innerHTML);
149
-          WindowPrt.document.close();
150
-          WindowPrt.focus();
151
-          WindowPrt.print();
152
-          WindowPrt.close();
153
-        }, 100);
143
+				if(data.status==200){
144
+					this.codes = data.data;
145
+					this.printLoading = false;
146
+					setTimeout(() => {
147
+					  const printContent = document.getElementById("report");
148
+					  const WindowPrt = window.open("", "", "width=700,height=900");
149
+					  WindowPrt.document.write(printContent.innerHTML);
150
+					  WindowPrt.document.close();
151
+					  WindowPrt.focus();
152
+					  WindowPrt.print();
153
+					  WindowPrt.close();
154
+					}, 100);
155
+				}else{
156
+					this.showPromptModal('打印', false, data.msg)
157
+				}
154 158
       });
155 159
   }
156 160
 

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

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

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

@@ -42,6 +42,15 @@
42 42
             </nz-select>
43 43
           </nz-form-control>
44 44
         </nz-form-item>
45
+	<!-- 			<nz-form-item class="mb0">
46
+				  <nz-form-label [nzSpan]="7" nzRequired nzFor="parent">是否显示父级科室</nz-form-label>
47
+				  <nz-form-control [nzSpan]="15" nzErrorTip="请选择是否显示父级科室!">
48
+				    <nz-radio-group formControlName="parent">
49
+				      <label nz-radio [nzValue]="1">是</label>
50
+				      <label nz-radio [nzValue]="0">否</label>
51
+				    </nz-radio-group>
52
+				  </nz-form-control>
53
+				</nz-form-item> -->
45 54
       </form>
46 55
     </div>
47 56
     <div class="display_flex justify-content_flex-center">

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

@@ -15,6 +15,7 @@ export class QueryRangeComponent implements OnInit {
15 15
   @Input() queryType: number;
16 16
   @Input() hospital: any;
17 17
   @Input() duty: any;
18
+	@Input() parent: any;
18 19
   validateForm: FormGroup;//表单
19 20
   constructor(
20 21
     private fb: FormBuilder,
@@ -39,6 +40,7 @@ export class QueryRangeComponent implements OnInit {
39 40
       hospital: [(this.hospital && (this.queryType == 2 || this.queryType == 3)) ? this.hospital.id : null],
40 41
       duty: [(this.duty && this.queryType == 3) ? this.duty.id : null],
41 42
       dutyOne: [(this.duty && this.queryType == 4) ? this.duty.id : null],
43
+			parent :[this.parent, [Validators.required]]
42 44
     });
43 45
   }
44 46
   // 表单提交
@@ -51,6 +53,7 @@ export class QueryRangeComponent implements OnInit {
51 53
     let queryType = this.validateForm.value.queryType;
52 54
     let hospital;
53 55
     let duty;
56
+		let parent = this.validateForm.value.parent;
54 57
     switch (queryType) {
55 58
       case 1:
56 59
         break;
@@ -66,7 +69,7 @@ export class QueryRangeComponent implements OnInit {
66 69
         duty = this.dutyOneList.find(v => v.id == this.validateForm.value.dutyOne);
67 70
         break;
68 71
     }
69
-    this.submitQueryRange.emit({queryType, hospital, duty});
72
+    this.submitQueryRange.emit({queryType, hospital, duty, parent});
70 73
     this.hideModal();
71 74
   }
72 75
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 4 - 1
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
61 61
   queryType:any;
62 62
   hosId:any;
63 63
   dutyId:any;
64
+	parent:any;
64 65
   parentDutyId:any;
65 66
   initSessionData(){
66 67
     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
67 68
     let queryType:any = newStatistics.queryType;
68 69
     let hosId:any = newStatistics.hospitalId;
69 70
     let dutyId:any = newStatistics.dutyId;
70
-
71
+		this.parent = newStatistics.parent;
72
+		
71 73
     queryType = queryType ? +queryType : undefined;
72 74
     hosId = hosId ? +hosId : undefined;
73 75
     dutyId = dutyId ? +dutyId : undefined;
@@ -105,6 +107,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
105 107
     let postData:any = {
106 108
       idx: this.pageIndex - 1,
107 109
       sum: this.pageSize,
110
+			// showParentDept: this.parent==1 ? 'true' : undefined,
108 111
       startDate: this.dateRange[0] || undefined,
109 112
       endDate: this.dateRange[1] || undefined,
110 113
       hosId: this.hosId || undefined,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 5 - 2
src/app/views/new-statistics/new-statistics.component.ts

@@ -35,6 +35,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
35 35
   hospital;
36 36
   duty;
37 37
   queryType;//查询范围
38
+	parent;
38 39
   // 初始化院区、部门显示
39 40
   initHospitalAndDuty(hospitalOrDuty){
40 41
     let sessionData = JSON.parse(sessionStorage.getItem('newStatistics'));
@@ -43,6 +44,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
43 44
       this.hospital = sessionData.hospital;
44 45
       this.duty = sessionData.duty;
45 46
       this.queryType = sessionData.queryType;
47
+			this.parent = sessionData.parent;
46 48
       return;
47 49
     }
48 50
     let type = 'hospital';//默认是院区
@@ -83,7 +85,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
83 85
 
84 86
   // 缓存数据
85 87
   sessionSave(){
86
-    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}));
88
+    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}));
87 89
   }
88 90
 
89 91
   // 查询范围
@@ -91,13 +93,14 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
91 93
   queryRangeClick(){
92 94
     this.queryRangeFlag = true;
93 95
   }
94
-  submitQueryRange({queryType, hospital, duty}) {
96
+  submitQueryRange({queryType, hospital, duty, parent}) {
95 97
     console.log('queryType:', queryType)
96 98
     console.log('hospital:', hospital)
97 99
     console.log('duty:', duty)
98 100
     this.queryType = queryType;
99 101
     this.hospital = hospital;
100 102
     this.duty = duty;
103
+		this.parent = parent;
101 104
     this.queryRangeFlag = false;
102 105
 
103 106
     this.sessionSave();

+ 2 - 0
src/app/views/pathology-communication-book/pathology-communication-book.component.ts

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

+ 6 - 0
src/app/views/pathology/pathology.component.ts

@@ -166,6 +166,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
166 166
 	toDayData:any = null;
167 167
 	toDayTime:any = null;
168 168
 	backType='list';
169
+	user:any;
169 170
 	loginUserDeptId: number = JSON.parse(localStorage.getItem("user")).user.dept
170 171
 	  .id; //登录人所属科室
171 172
   ngOnDestroy() {
@@ -191,6 +192,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
191 192
 		this.hosId = this.tool.getCurrentHospital().id;
192 193
 		this.userId = this.tool.getCurrentUserId()
193 194
 		this.deptId = this.tool.getCurrentUserDept().id
195
+		this.user = this.tool.getCurrentUserInfo();
194 196
 		if(localStorage.getItem("pathologyActiveIndex")){
195 197
 			this.activeIndex = localStorage.getItem("pathologyActiveIndex")
196 198
 			if(this.activeIndex==0){
@@ -1024,6 +1026,8 @@ export class PathologyComponent implements OnInit, OnDestroy {
1024 1026
 		let deptArr = this.validateForm.value.operation.join(',')
1025 1027
 		let data = {
1026 1028
 		  user: {
1029
+				upType: "changeDept",
1030
+				account: this.user.account,
1027 1031
 		    autoCreateOrder: this.validateForm.value.generate,
1028 1032
 				dept:{
1029 1033
 					id:this.validateForm.value.specimen
@@ -1056,6 +1060,8 @@ export class PathologyComponent implements OnInit, OnDestroy {
1056 1060
 		  if (result.status == 200) {
1057 1061
 		    let dataObj = {
1058 1062
 		      user: {
1063
+						upType: "changeDept",
1064
+						account: JSON.parse(localStorage.getItem("user")).user.account,
1059 1065
 		        dept: {
1060 1066
 		          id: this.validateForm.value.specimen,
1061 1067
 		        },

+ 4 - 0
src/app/views/pathologyScan/pathologyScan.component.ts

@@ -729,6 +729,8 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
729 729
 		let deptArr = this.validateForm.value.operation.join(',')
730 730
 		let data = {
731 731
 		  user: {
732
+				upType: "changeDept",
733
+				account: JSON.parse(localStorage.getItem("user")).user.account,
732 734
 		    autoCreateOrder: this.validateForm.value.generate,
733 735
 				dept:{
734 736
 					id:this.validateForm.value.specimen
@@ -761,6 +763,8 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
761 763
 		  if (result.status == 200) {
762 764
 		    let dataObj = {
763 765
 		      user: {
766
+						upType: "changeDept",
767
+						account: JSON.parse(localStorage.getItem("user")).user.account,
764 768
 		        dept: {
765 769
 		          id: this.validateForm.value.specimen,
766 770
 		        },

+ 4 - 0
src/app/views/specimen-room-view/specimen-room-view.component.ts

@@ -124,6 +124,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
124 124
 	searchMsg:any = null;
125 125
 	changeInpSubject = new Subject(); //防抖
126 126
 	changeInpSubjectSpecimen = new Subject(); //防抖
127
+	user:any;
127 128
   ngOnDestroy() {
128 129
     clearTimeout(this.timer);
129 130
     clearTimeout(this.logTimer);
@@ -138,6 +139,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
138 139
 		});
139 140
 		this.hosId = this.tool.getCurrentHospital().id;
140 141
 		this.userId = this.tool.getCurrentUserId()
142
+		this.user = this.tool.getCurrentUserInfo();
141 143
 		// 手术间列表
142 144
 		this.getPharmacyList(this.printPharmacyIdx, 'surgeryDept', this.printPharmacySearchKey);
143 145
 		// 标本间列表
@@ -506,6 +508,8 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
506 508
 		let deptArr = this.validateForm.value.operation.join(',')
507 509
 		let data = {
508 510
 		  user: {
511
+				upType: "changeDept",
512
+				account: this.user.account,
509 513
 		    autoCreateOrder: this.validateForm.value.generate,
510 514
 				showFrozen: this.validateForm.value.showFrozen,
511 515
 				dept:{

+ 24 - 0
src/app/views/sys-config/sys-config.component.html

@@ -214,6 +214,30 @@
214 214
 				    <input nz-input formControlName="supportAppVersion" id="supportAppVersion" placeholder="请输入支助APP版本号">
215 215
 				  </nz-form-control>
216 216
 				</nz-form-item>
217
+				<nz-form-item class="formItem">
218
+				  <nz-form-label [nzSpan]="24" nzFor="autoIncidentDegree" nzRequired class="label">事件默认评价</nz-form-label>
219
+				  <nz-form-control [nzSpan]="24" nzErrorTip="事件默认评价是必填项!">
220
+				    <nz-select nzPlaceHolder="请选择事件默认评价" formControlName="autoIncidentDegree">
221
+				      <nz-option nzValue="{{item.id}}" nzLabel="{{item.name}}" *ngFor="let item of evaluateData"></nz-option>
222
+				    </nz-select>
223
+				  </nz-form-control>
224
+				</nz-form-item>
225
+				<nz-form-item class="formItem">
226
+				  <nz-form-label [nzSpan]="24" nzFor="autoWechatDegree" nzRequired class="label">微信默认评价</nz-form-label>
227
+				  <nz-form-control [nzSpan]="24" nzErrorTip="微信默认评价是必填项!">
228
+				    <nz-select nzPlaceHolder="请选择微信默认评价" formControlName="autoWechatDegree">
229
+				      <nz-option nzValue="{{item.id}}" nzLabel="{{item.name}}" *ngFor="let item of evaluateData"></nz-option>
230
+				    </nz-select>
231
+				  </nz-form-control>
232
+				</nz-form-item>
233
+				<nz-form-item class="formItem">
234
+				  <nz-form-label [nzSpan]="24" nzFor="workorderEvaluation" nzRequired class="label">转运默认评价</nz-form-label>
235
+				  <nz-form-control [nzSpan]="24" nzErrorTip="转运默认评价是必填项!">
236
+				    <nz-select nzPlaceHolder="请选择转运默认评价" formControlName="workorderEvaluation">
237
+				      <nz-option nzValue="{{item.id}}" nzLabel="{{item.name}}" *ngFor="let item of workorderEvaluation"></nz-option>
238
+				    </nz-select>
239
+				  </nz-form-control>
240
+				</nz-form-item>
217 241
       </div>
218 242
     </form>
219 243
   </overlay-scrollbars>

+ 31 - 2
src/app/views/sys-config/sys-config.component.ts

@@ -75,6 +75,9 @@ export class SysConfigComponent implements OnInit {
75 75
 			repairs: [null, [Validators.required]],
76 76
 			cmdbRepair: [null, [Validators.required]],
77 77
 			supportAppVersion: [null, [Validators.required]],
78
+			autoIncidentDegree: [null, [Validators.required]],
79
+			autoWechatDegree: [null, [Validators.required]],
80
+			workorderEvaluation: [null, [Validators.required]]
78 81
     });
79 82
     this.getDeptType();
80 83
     this.coopBtns = this.tool.initCoopBtns(this.route);
@@ -154,7 +157,10 @@ export class SysConfigComponent implements OnInit {
154 157
 				item.keyconfig === "deptRepair" ||
155 158
 				item.keyconfig === "publicRepair" ||
156 159
 				item.keyconfig === "cmdbRepair" ||
157
-				item.keyconfig === "supportAppVersion"
160
+				item.keyconfig === "supportAppVersion" ||
161
+				item.keyconfig === "autoIncidentDegree" ||
162
+				item.keyconfig === "autoWechatDegree" ||
163
+				item.keyconfig === "workorderEvaluation"
158 164
     );
159 165
 		console.log(7777,this.validateForm.controls.repairs.value)
160 166
     filterData.forEach((item) => {
@@ -210,6 +216,12 @@ export class SysConfigComponent implements OnInit {
210 216
         item.valueconfig = this.validateForm.controls.cmdbRepair.value;
211 217
       }else if (item.keyconfig === "supportAppVersion") {
212 218
         item.valueconfig = this.validateForm.controls.supportAppVersion.value;
219
+      }else if (item.keyconfig === "autoIncidentDegree") {
220
+        item.valueconfig = this.validateForm.controls.autoIncidentDegree.value;
221
+      }else if (item.keyconfig === "autoWechatDegree") {
222
+        item.valueconfig = this.validateForm.controls.autoWechatDegree.value;
223
+      }else if (item.keyconfig === "workorderEvaluation") {
224
+        item.valueconfig = this.validateForm.controls.workorderEvaluation.value;
213 225
       }
214 226
     });
215 227
     const postData = filterData;
@@ -231,12 +243,20 @@ export class SysConfigComponent implements OnInit {
231 243
   }
232 244
   // 获取科室类型
233 245
   deptTypes: any = [];
246
+	evaluateData: any = [];
247
+	workorderEvaluation: any = [];
234 248
   getDeptType() {
235 249
     this.loading1 = true;
236 250
     this.mainService.getDictionary("list", "dept_type").subscribe((result) => {
237 251
       this.deptTypes = result;
238
-      this.getSysConfig();
239 252
     });
253
+		this.mainService.getDictionary("list", "incident_degree").subscribe((result) => {
254
+		  this.evaluateData = result;
255
+		});
256
+		this.mainService.getDictionary("list", "workorderEvaluation").subscribe((result) => {
257
+		  this.workorderEvaluation = result;
258
+		  this.getSysConfig();
259
+		});
240 260
   }
241 261
   // 格式化自动关闭工单设置的数字选择框
242 262
   formatterPercent = (value: number) => `${value}小时`;
@@ -341,6 +361,15 @@ export class SysConfigComponent implements OnInit {
341 361
 								case "supportAppVersion":
342 362
 								  this.validateForm.controls.supportAppVersion.setValue(c[1]);
343 363
 								  break;
364
+								case "autoIncidentDegree":
365
+								  this.validateForm.controls.autoIncidentDegree.setValue(c[1] + "");
366
+								  break;
367
+								case "autoWechatDegree":
368
+								  this.validateForm.controls.autoWechatDegree.setValue(c[1] + "");
369
+								  break;
370
+								case "workorderEvaluation":
371
+								  this.validateForm.controls.workorderEvaluation.setValue(c[1] + "");
372
+								  break;
344 373
               }
345 374
             });
346 375
           } else {

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

@@ -233,7 +233,7 @@
233 233
 
234 234
 <!-- 恢复账号 -->
235 235
 <app-dialog-delete [delModal]="recoverModal" (hideDelModalEvent)="hideRecoverModal()" [btnLoading]="recoverLoading"
236
-  (confirmDelEvent)="confirmRecover()" [content]="recoverContent" confirmTxt="恢复账号" >
236
+  (confirmDelEvent)="confirmRecover()" [content]="recoverContent" [isShowConfirm]="false">
237 237
 </app-dialog-delete>
238 238
 
239 239
 <!-- 重置密码模态框 -->

+ 7 - 1
src/app/views/users-management/users-management.component.ts

@@ -416,6 +416,7 @@ export class UsersManagementComponent implements OnInit {
416 416
     });
417 417
     let data = {
418 418
       user: {
419
+				upType: "changeDept",
419 420
         name: that.validateForm.value.name,
420 421
         account: that.validateForm.value.account,
421 422
         gradeId: that.validateForm.value.gradeId,
@@ -438,7 +439,10 @@ export class UsersManagementComponent implements OnInit {
438 439
     }
439 440
     if (!that.add) {
440 441
       data.user["id"] = that.coopId;
441
-    }
442
+			data.user.upType = "changeDept"
443
+    }else{
444
+			delete data.user.upType
445
+		}
442 446
     that.mainService
443 447
       .coopData(that.add ? "addData" : "updData", "user", data)
444 448
       .subscribe((data) => {
@@ -629,6 +633,8 @@ export class UsersManagementComponent implements OnInit {
629 633
 	
630 634
 	// 确认恢复
631 635
 	confirmRecover() {
636
+		this.hideRecoverModal();
637
+		return
632 638
 	  let that = this;
633 639
 		let query = {
634 640
 			account:'',