Browse Source

标本业务流程控制增加开关

seimin 5 months ago
parent
commit
99e92bac3d

+ 6 - 0
src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.html

@@ -68,6 +68,12 @@
68
                   <nz-form-label class="label">显示建单并签到按钮</nz-form-label>
68
                   <nz-form-label class="label">显示建单并签到按钮</nz-form-label>
69
                   <nz-checkbox-group [(ngModel)]="bigScanShowCreateBtn"></nz-checkbox-group>
69
                   <nz-checkbox-group [(ngModel)]="bigScanShowCreateBtn"></nz-checkbox-group>
70
                 </div>
70
                 </div>
71
+
72
+                <!-- 默认扫描标本进入标本扫描页 -->
73
+                <div class="display_flex align-items_center mb8">
74
+                  <nz-form-label class="label">默认扫描标本进入标本扫描页</nz-form-label>
75
+                  <nz-checkbox-group [(ngModel)]="defaultScanSpe"></nz-checkbox-group>
76
+                </div>
71
               </div>
77
               </div>
72
               <!-- 自动建单配置 -->
78
               <!-- 自动建单配置 -->
73
               <div *ngIf="tabModalName=='automaticOrderCreation'">
79
               <div *ngIf="tabModalName=='automaticOrderCreation'">

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

@@ -51,6 +51,11 @@ export class ConfigurationSpecimenComponent implements OnInit {
51
     {label:'是否开启',value: 0}
51
     {label:'是否开启',value: 0}
52
   ];
52
   ];
53
 
53
 
54
+  // 默认扫描标本进入标本扫描页
55
+  defaultScanSpe:any[] = [
56
+    {label:'是否开启',value: 0}
57
+  ];
58
+
54
   // 配置
59
   // 配置
55
   configs:any = {};
60
   configs:any = {};
56
   // 任务类型
61
   // 任务类型
@@ -145,6 +150,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
145
       bigScanShowSignBtn: this.bigScanShowSignBtn[0].checked ? 1 : 0,
150
       bigScanShowSignBtn: this.bigScanShowSignBtn[0].checked ? 1 : 0,
146
       bigScanArriveNotOwner: this.bigScanArriveNotOwner[0].checked ? 1 : 0,
151
       bigScanArriveNotOwner: this.bigScanArriveNotOwner[0].checked ? 1 : 0,
147
       bigScanShowCreateBtn: this.bigScanShowCreateBtn[0].checked ? 1 : 0,
152
       bigScanShowCreateBtn: this.bigScanShowCreateBtn[0].checked ? 1 : 0,
153
+      defaultScanSpe: this.defaultScanSpe[0].checked ? 1 : 0,
148
       deptNotAlertIds: this.deptNotAlertIds.length ? this.deptNotAlertIds.toString() : undefined,
154
       deptNotAlertIds: this.deptNotAlertIds.length ? this.deptNotAlertIds.toString() : undefined,
149
     };
155
     };
150
     this.btnLoading = true;
156
     this.btnLoading = true;
@@ -212,6 +218,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
212
           this.bigScanShowSignBtn[0].checked = this.configs.bigScanShowSignBtn == 1;
218
           this.bigScanShowSignBtn[0].checked = this.configs.bigScanShowSignBtn == 1;
213
           this.bigScanArriveNotOwner[0].checked = this.configs.bigScanArriveNotOwner == 1;
219
           this.bigScanArriveNotOwner[0].checked = this.configs.bigScanArriveNotOwner == 1;
214
           this.bigScanShowCreateBtn[0].checked = this.configs.bigScanShowCreateBtn == 1;
220
           this.bigScanShowCreateBtn[0].checked = this.configs.bigScanShowCreateBtn == 1;
221
+          this.defaultScanSpe[0].checked = this.configs.defaultScanSpe == 1;
215
           this.deptNotAlertIds = this.configs.deptNotAlertIds ? this.configs.deptNotAlertIds.split(',').map(v => +v) : [];
222
           this.deptNotAlertIds = this.configs.deptNotAlertIds ? this.configs.deptNotAlertIds.split(',').map(v => +v) : [];
216
           this.deptList = this.configs.deptNotAlertList || [];
223
           this.deptList = this.configs.deptNotAlertList || [];
217
         }
224
         }