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