Selaa lähdekoodia

业务页面控制-标本新增开关

seimin 5 kuukautta sitten
vanhempi
commit
ea1aee72d5

+ 24 - 1
src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.html

@@ -39,12 +39,35 @@
39 39
                   <nz-form-label class="label">收取时需扫描二维码</nz-form-label>
40 40
                   <nz-checkbox-group [(ngModel)]="arriveScanCode" (ngModelChange)="changeArriveScanCode($event)"></nz-checkbox-group>
41 41
                 </div>
42
-
43 42
                 <!-- 必须扫描动态二维码 -->
44 43
                 <div class="display_flex align-items_center mb8" *ngIf="arriveScanCode[0].checked">
45 44
                   <nz-form-label class="label">必须扫描动态二维码</nz-form-label>
46 45
                   <nz-checkbox-group [(ngModel)]="arriveScanDynamicCode"></nz-checkbox-group>
47 46
                 </div>
47
+
48
+                <!-- 退回标本是否填写交接人 -->
49
+                <div class="display_flex align-items_center mb8">
50
+                  <nz-form-label class="label">退回标本是否填写交接人</nz-form-label>
51
+                  <nz-checkbox-group [(ngModel)]="returnSpecimenWhetherHandover"></nz-checkbox-group>
52
+                </div>
53
+
54
+                <!-- 显示接单签到按钮 -->
55
+                <div class="display_flex align-items_center mb8">
56
+                  <nz-form-label class="label">显示接单签到按钮</nz-form-label>
57
+                  <nz-checkbox-group [(ngModel)]="bigScanShowSignBtn"></nz-checkbox-group>
58
+                </div>
59
+
60
+                <!-- 支持待到达非本人 -->
61
+                <div class="display_flex align-items_center mb8">
62
+                  <nz-form-label class="label">支持待到达非本人</nz-form-label>
63
+                  <nz-checkbox-group [(ngModel)]="bigScanArriveNotOwner"></nz-checkbox-group>
64
+                </div>
65
+
66
+                <!-- 显示建单并签到按钮 -->
67
+                <div class="display_flex align-items_center mb8">
68
+                  <nz-form-label class="label">显示建单并签到按钮</nz-form-label>
69
+                  <nz-checkbox-group [(ngModel)]="bigScanShowCreateBtn"></nz-checkbox-group>
70
+                </div>
48 71
               </div>
49 72
               <!-- 自动建单配置 -->
50 73
               <div *ngIf="tabModalName=='automaticOrderCreation'">

+ 28 - 0
src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.ts

@@ -31,6 +31,26 @@ export class ConfigurationSpecimenComponent implements OnInit {
31 31
     {label:'是否开启',value: 0}
32 32
   ];
33 33
 
34
+  // 退回标本是否填写交接人
35
+  returnSpecimenWhetherHandover:any[] = [
36
+    {label:'是否开启',value: 0}
37
+  ];
38
+
39
+  // 显示接单签到按钮
40
+  bigScanShowSignBtn:any[] = [
41
+    {label:'是否开启',value: 0}
42
+  ];
43
+
44
+  // 支持待到达非本人
45
+  bigScanArriveNotOwner:any[] = [
46
+    {label:'是否开启',value: 0}
47
+  ];
48
+
49
+  // 显示建单并签到按钮
50
+  bigScanShowCreateBtn:any[] = [
51
+    {label:'是否开启',value: 0}
52
+  ];
53
+
34 54
   // 配置
35 55
   configs:any = {};
36 56
   // 任务类型
@@ -121,6 +141,10 @@ export class ConfigurationSpecimenComponent implements OnInit {
121 141
       deptNotAlert: this.deptNotAlert[0].checked ? 1 : 0,
122 142
       arriveScanCode: this.arriveScanCode[0].checked ? 1 : 0,
123 143
       arriveScanDynamicCode: this.arriveScanDynamicCode[0].checked ? 1 : 0,
144
+      returnSpecimenWhetherHandover: this.returnSpecimenWhetherHandover[0].checked ? 1 : 0,
145
+      bigScanShowSignBtn: this.bigScanShowSignBtn[0].checked ? 1 : 0,
146
+      bigScanArriveNotOwner: this.bigScanArriveNotOwner[0].checked ? 1 : 0,
147
+      bigScanShowCreateBtn: this.bigScanShowCreateBtn[0].checked ? 1 : 0,
124 148
       deptNotAlertIds: this.deptNotAlertIds.length ? this.deptNotAlertIds.toString() : undefined,
125 149
     };
126 150
     this.btnLoading = true;
@@ -184,6 +208,10 @@ export class ConfigurationSpecimenComponent implements OnInit {
184 208
           this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
185 209
           this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;
186 210
           this.arriveScanDynamicCode[0].checked = this.configs.arriveScanDynamicCode == 1;
211
+          this.returnSpecimenWhetherHandover[0].checked = this.configs.returnSpecimenWhetherHandover == 1;
212
+          this.bigScanShowSignBtn[0].checked = this.configs.bigScanShowSignBtn == 1;
213
+          this.bigScanArriveNotOwner[0].checked = this.configs.bigScanArriveNotOwner == 1;
214
+          this.bigScanShowCreateBtn[0].checked = this.configs.bigScanShowCreateBtn == 1;
187 215
           this.deptNotAlertIds = this.configs.deptNotAlertIds ? this.configs.deptNotAlertIds.split(',').map(v => +v) : [];
188 216
           this.deptList = this.configs.deptNotAlertList || [];
189 217
         }

+ 0 - 20
src/app/views/hospital-config/hospital-config.component.html

@@ -354,26 +354,6 @@
354 354
                 </nz-radio-group>
355 355
               </nz-form-control>
356 356
             </ng-container>
357
-            <ng-container *ngSwitchCase="'returnSpecimenWhetherHandover'">
358
-              <nz-form-label
359
-                [nzSpan]="24"
360
-                [nzFor]="config.key"
361
-                class="label"
362
-                [nzRequired]="config.required"
363
-                >{{config.desc}}</nz-form-label
364
-              >
365
-              <nz-form-control
366
-                [nzSpan]="24"
367
-                [nzErrorTip]="'请选择!'"
368
-              >
369
-                <nz-radio-group
370
-                  [formControlName]="config.key"
371
-                >
372
-                  <label nz-radio nzValue="1">是</label>
373
-                  <label nz-radio nzValue="0">否</label>
374
-                </nz-radio-group>
375
-              </nz-form-control>
376
-            </ng-container>
377 357
             <ng-container *ngSwitchCase="'allowNucleicAcidPrinting'">
378 358
               <nz-form-label
379 359
                 [nzSpan]="24"