Browse Source

在检查自动派单页面上的急查和普查后面增加不进行自动派单选择框

seimin 3 years ago
parent
commit
55cb3aa3d6

+ 10 - 4
src/app/views/inspect-auto/inspect-auto.component.html

@@ -29,8 +29,11 @@
29
         <overlay-scrollbars #osComponentRef2 [ngStyle]="{ height:'100%' }">
29
         <overlay-scrollbars #osComponentRef2 [ngStyle]="{ height:'100%' }">
30
           <div class="inspectAutoGroup">
30
           <div class="inspectAutoGroup">
31
             <div class="urgencyOrOrdinary mt8">
31
             <div class="urgencyOrOrdinary mt8">
32
-              <div><label nz-checkbox [(ngModel)]="urgencyInspect"
33
-                  (ngModelChange)="changeInspect($event,'urgencyInspect')">急查</label></div>
32
+              <div>
33
+                <label nz-checkbox [(ngModel)]="urgencyInspect"
34
+                  (ngModelChange)="changeInspect($event,'urgencyInspect')">急查</label>
35
+                <label nz-checkbox [(ngModel)]="urgencyInspectNo">不进行自动派单</label>
36
+              </div>
34
               <div *ngIf="urgencyInspect">
37
               <div *ngIf="urgencyInspect">
35
                 <div class="mt8">检查类型:</div>
38
                 <div class="mt8">检查类型:</div>
36
                 <nz-checkbox-wrapper (nzOnChange)="selectInspectType($event,'urgencyInspect')">
39
                 <nz-checkbox-wrapper (nzOnChange)="selectInspectType($event,'urgencyInspect')">
@@ -60,8 +63,11 @@
60
               </div>
63
               </div>
61
             </div>
64
             </div>
62
             <div class="urgencyOrOrdinary mt8">
65
             <div class="urgencyOrOrdinary mt8">
63
-              <div><label nz-checkbox [(ngModel)]="ordinaryInspect"
64
-                  (ngModelChange)="changeInspect($event,'ordinaryInspect')">普查</label></div>
66
+              <div>
67
+                <label nz-checkbox [(ngModel)]="ordinaryInspect"
68
+                  (ngModelChange)="changeInspect($event,'ordinaryInspect')">普查</label>
69
+                <label nz-checkbox [(ngModel)]="ordinaryInspectNo">不进行自动派单</label>
70
+              </div>
65
               <div *ngIf="ordinaryInspect">
71
               <div *ngIf="ordinaryInspect">
66
                 <div class="mt8">检查类型:</div>
72
                 <div class="mt8">检查类型:</div>
67
                 <nz-checkbox-wrapper (nzOnChange)="selectInspectType($event,'ordinaryInspect')">
73
                 <nz-checkbox-wrapper (nzOnChange)="selectInspectType($event,'ordinaryInspect')">

+ 17 - 7
src/app/views/inspect-auto/inspect-auto.component.ts

@@ -351,7 +351,9 @@ export class InspectAutoComponent implements OnInit {
351
   }
351
   }
352
   // 保存
352
   // 保存
353
   urgencyInspect = false; //是否选择急查
353
   urgencyInspect = false; //是否选择急查
354
+  urgencyInspectNo = false; //不进行自动派单-急查
354
   ordinaryInspect = false; //是否选择普查
355
   ordinaryInspect = false; //是否选择普查
356
+  ordinaryInspectNo = false; //不进行自动派单-急查
355
   save() {
357
   save() {
356
     // 规则验证 start
358
     // 规则验证 start
357
     //没有选择急查或普查
359
     //没有选择急查或普查
@@ -473,6 +475,7 @@ export class InspectAutoComponent implements OnInit {
473
                 typeId3: v, //病情级别id
475
                 typeId3: v, //病情级别id
474
                 hosId: this.hosId, //院区id
476
                 hosId: this.hosId, //院区id
475
                 deleted: false, //删除true,显示false
477
                 deleted: false, //删除true,显示false
478
+                auto: this.urgencyInspectNo, //不进行自动派单是true
476
               });
479
               });
477
             });
480
             });
478
           });
481
           });
@@ -502,6 +505,7 @@ export class InspectAutoComponent implements OnInit {
502
                 typeId3: v, //病情级别id
505
                 typeId3: v, //病情级别id
503
                 hosId: this.hosId, //院区id
506
                 hosId: this.hosId, //院区id
504
                 deleted: false, //删除true,显示false
507
                 deleted: false, //删除true,显示false
508
+                auto: this.ordinaryInspectNo, //不进行自动派单是true
505
               });
509
               });
506
             });
510
             });
507
           });
511
           });
@@ -512,14 +516,20 @@ export class InspectAutoComponent implements OnInit {
512
     this.saveLoading = true;
516
     this.saveLoading = true;
513
     this.mainService
517
     this.mainService
514
       .simplePost("addListData", "autoCreateOrderRule", postData)
518
       .simplePost("addListData", "autoCreateOrderRule", postData)
515
-      .subscribe((data) => {
516
-        this.saveLoading = false;
517
-        if (data.status == 200) {
518
-          this.showPromptModal("保存", true, "");
519
-        } else {
520
-          this.showPromptModal("保存", false, data.msg);
519
+      .subscribe(
520
+        (data) => {
521
+          this.saveLoading = false;
522
+          if (data.status == 200) {
523
+            this.showPromptModal("保存", true, "");
524
+          } else {
525
+            this.showPromptModal("保存", false, data.msg);
526
+          }
527
+        },
528
+        (err) => {
529
+          this.saveLoading = false;
530
+          this.showPromptModal("保存", false, "");
521
         }
531
         }
522
-      });
532
+      );
523
   }
533
   }
524
   // 展示信息提示框(con:提示信息,success:操作是否成功,promptInfo:操作结果提示信息)(con:提示信息,success:操作是否成功,promptInfo:操作结果提示信息)
534
   // 展示信息提示框(con:提示信息,success:操作是否成功,promptInfo:操作结果提示信息)(con:提示信息,success:操作是否成功,promptInfo:操作结果提示信息)
525
   showPromptModal(con, success, promptInfo?) {
535
   showPromptModal(con, success, promptInfo?) {