浏览代码

血制品页面控制添加待送达合并工单

maotao 9 月之前
父节点
当前提交
f1d252cb64

+ 5 - 0
src/app/views/blood-products-config/blood-products-config.component.html

@@ -60,6 +60,11 @@
60
           <nz-checkbox-group [(ngModel)]="cancelBloods" (ngModelChange)="changeCancelBloods($event)"></nz-checkbox-group>
60
           <nz-checkbox-group [(ngModel)]="cancelBloods" (ngModelChange)="changeCancelBloods($event)"></nz-checkbox-group>
61
           <nz-checkbox-group [(ngModel)]="cancelBloodHandovers" *ngIf="cancelBloods[0].checked"></nz-checkbox-group>
61
           <nz-checkbox-group [(ngModel)]="cancelBloodHandovers" *ngIf="cancelBloods[0].checked"></nz-checkbox-group>
62
         </div>
62
         </div>
63
+				<!-- 待送达合并工单 -->
64
+				<div class="display_flex align-items_center mb8">
65
+				  <nz-form-label class="label">待送达合并工单</nz-form-label>
66
+				  <nz-checkbox-group class="w320px" [(ngModel)]="sendingMergeOrder"></nz-checkbox-group>
67
+				</div>
63
       </div>
68
       </div>
64
       <!-- 自动建单配置 -->
69
       <!-- 自动建单配置 -->
65
       <div *ngIf="tabModalName=='automaticOrderCreation'">
70
       <div *ngIf="tabModalName=='automaticOrderCreation'">

+ 12 - 0
src/app/views/blood-products-config/blood-products-config.component.ts

@@ -54,6 +54,10 @@ export class BloodProductsConfigComponent implements OnInit {
54
   delivery:any[] = [
54
   delivery:any[] = [
55
     {label:'是否开启',value: 0}
55
     {label:'是否开启',value: 0}
56
   ];
56
   ];
57
+	// 待送达合并工单
58
+	sendingMergeOrder:any[] = [
59
+	  {label:'是否开启',value: 0}
60
+	];
57
   // 选择起点科室
61
   // 选择起点科室
58
   limitDeptIds:any = [];
62
   limitDeptIds:any = [];
59
   // 配置
63
   // 配置
@@ -184,6 +188,11 @@ export class BloodProductsConfigComponent implements OnInit {
184
       cancelBlood: this.cancelBloods[0].checked ? 1 : 0,
188
       cancelBlood: this.cancelBloods[0].checked ? 1 : 0,
185
       cancelBloodHandover: this.cancelBloodHandovers[0].checked ? 1 : 0,
189
       cancelBloodHandover: this.cancelBloodHandovers[0].checked ? 1 : 0,
186
     };
190
     };
191
+		if(this.sendingMergeOrder[0].checked){
192
+			postData.sendingMergeOrder = 1
193
+		}else{
194
+			delete postData.sendingMergeOrder
195
+		}
187
     console.log(postData);
196
     console.log(postData);
188
     this.btnLoading = true;
197
     this.btnLoading = true;
189
     this.mainService
198
     this.mainService
@@ -287,6 +296,9 @@ export class BloodProductsConfigComponent implements OnInit {
287
           this.radioCheckModesValue = this.configs.checkType.id;
296
           this.radioCheckModesValue = this.configs.checkType.id;
288
           this.autoCreateOrders[0].checked = this.configs.autoCreate == 1;
297
           this.autoCreateOrders[0].checked = this.configs.autoCreate == 1;
289
           this.delivery[0].checked = this.configs.delivery == 1;
298
           this.delivery[0].checked = this.configs.delivery == 1;
299
+					if(this.configs.sendingMergeOrder){
300
+						this.sendingMergeOrder[0].checked = this.configs.sendingMergeOrder == 1
301
+					}
290
           this.autoSendUsers[0].checked = this.configs.autoSendUser == 1;
302
           this.autoSendUsers[0].checked = this.configs.autoSendUser == 1;
291
           this.autoDepts[0].checked = this.configs.autoDept == 1;
303
           this.autoDepts[0].checked = this.configs.autoDept == 1;
292
           this.autoDeptLimits[0].checked = this.configs.autoDeptLimit == 1;
304
           this.autoDeptLimits[0].checked = this.configs.autoDeptLimit == 1;