Browse Source

任务类型父子院区科室

seimin 2 years ago
parent
commit
9cfa40b6e6

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

@@ -1678,9 +1678,7 @@ export class FuwutaiComponent implements OnInit {
1678
       sum: 10,
1678
       sum: 10,
1679
       department: {
1679
       department: {
1680
         dept: value,
1680
         dept: value,
1681
-        hospital: {
1682
-          id: id,
1683
-        },
1681
+        cascadeHosId: id
1684
       },
1682
       },
1685
     };
1683
     };
1686
     if (type == "start" && this.deptZyList["startStatus"] == 205) {
1684
     if (type == "start" && this.deptZyList["startStatus"] == 205) {
@@ -1729,9 +1727,7 @@ export class FuwutaiComponent implements OnInit {
1729
       sum: 10,
1727
       sum: 10,
1730
       department: {
1728
       department: {
1731
         dept: value,
1729
         dept: value,
1732
-        hospital: {
1733
-          id: id,
1734
-        },
1730
+        cascadeHosId: id
1735
       },
1731
       },
1736
     };
1732
     };
1737
     if (type == "start" && this.deptQtList["startStatus"] == 205) {
1733
     if (type == "start" && this.deptQtList["startStatus"] == 205) {

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

@@ -1174,7 +1174,7 @@ export class HushijiandanComponent implements OnInit {
1174
       sum: 20,
1174
       sum: 20,
1175
       department: {
1175
       department: {
1176
         searchType: 1,
1176
         searchType: 1,
1177
-        hospital: { id: this.currentHospital.id },
1177
+        cascadeHosId: this.currentHospital.id
1178
       },
1178
       },
1179
     };
1179
     };
1180
     if (key) {
1180
     if (key) {

+ 1 - 3
src/app/views/task-type-management/task-type-management.component.ts

@@ -865,9 +865,7 @@ export class TaskTypeManagementComponent implements OnInit {
865
       sum: 10,
865
       sum: 10,
866
       department: {
866
       department: {
867
         dept: e,
867
         dept: e,
868
-        hospital: {
869
-          id: id,
870
-        },
868
+        cascadeHosId: id
871
       },
869
       },
872
     };
870
     };
873
     this.mainService
871
     this.mainService

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

@@ -81,7 +81,7 @@
81
                 -
81
                 -
82
               </div>
82
               </div>
83
             </td>
83
             </td>
84
-            <td>{{ data.usertype.name }}</td>
84
+            <td>{{ data.usertype ? data.usertype.name : '' }}</td>
85
             <td>
85
             <td>
86
               <div class="coop">
86
               <div class="coop">
87
                 <span *ngIf="coopBtns.look" (click)="detail(data.id)">查看</span>
87
                 <span *ngIf="coopBtns.look" (click)="detail(data.id)">查看</span>

+ 1 - 1
src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
8
   enableProdMode();
8
   enableProdMode();
9
   if (window) {
9
   if (window) {
10
     window.console.log = function () { };
10
     window.console.log = function () { };
11
-    console.info('v2.4.28');
11
+    console.info('v2.4.29');
12
   }
12
   }
13
 }
13
 }
14
 platformBrowserDynamic().bootstrapModule(AppModule)
14
 platformBrowserDynamic().bootstrapModule(AppModule)