Browse Source

任务类型优化

seimin 3 years ago
parent
commit
13386c0be8

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "/service": {
3
-    "target": "http://192.168.3.96",
3
+    "target": "http://192.168.3.108",
4 4
     "logLevel": "debug",
5 5
     "changeOrigin": true,
6 6
     "pathRewrite": {

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

@@ -39,7 +39,7 @@
39 39
       </div>
40 40
 
41 41
     </div>
42
-    <div class="list" *ngIf="!taskTypeLoading&&!loading4">
42
+    <div class="list" *ngIf="!taskTypeLoading&&!loading4&&((add&&allTaskType.length===0)||allTaskType.length)">
43 43
       <!-- 基础信息 -->
44 44
       <div *ngIf="tabModalName=='jcxx'">
45 45
         <nz-form-label class="label" nzRequired>类型名称</nz-form-label>
@@ -51,8 +51,8 @@
51 51
           </div>
52 52
         </div>
53 53
         <nz-form-label class="label" nzRequired>关联类型</nz-form-label>
54
-        <nz-select class="mb8 w100" [nzDisabled]="!add" nzShowSearch nzAllowClear nzPlaceHolder="请选择关联类型"
55
-          [(ngModel)]="association.id" (ngModelChange)="asso(association)">
54
+        <nz-select class="mb8 w100" nzShowSearch nzAllowClear nzPlaceHolder="请选择关联类型" [(ngModel)]="association.id"
55
+          (ngModelChange)="asso(association)">
56 56
           <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allAssociation"></nz-option>
57 57
         </nz-select>
58 58
         <nz-form-label *ngIf="association['id'] == 256" class="label" nzRequired>空单默认科室</nz-form-label>

+ 6 - 0
src/app/views/task-type-management/task-type-management.component.ts

@@ -414,6 +414,9 @@ export class TaskTypeManagementComponent implements OnInit {
414 414
         this.taskTypeLoading = false;
415 415
         if (data.status == 200) {
416 416
           this.allTaskType = data.list; //任务类型
417
+          if (this.allTaskType.length === 0) {
418
+            this.tabModalName = "jcxx";
419
+          }
417 420
           for (var i = 0; i < this.allTaskType.length; i++) {
418 421
             if (!this.allTaskType[i].integralDetailedRules) {
419 422
               this.allTaskType[i]["integralDetailedRules"] = JSON.parse(
@@ -578,6 +581,9 @@ export class TaskTypeManagementComponent implements OnInit {
578 581
   currentChoice;
579 582
   itemChoice(data, index) {
580 583
     console.log(data);
584
+    if (data === undefined) {
585
+      return;
586
+    }
581 587
     this.getType();
582 588
     this.departments = [];
583 589
     this.mapOfCheckedId = {};