|
@@ -61,6 +61,26 @@ export class LimitInitiationTimeComponent implements OnInit {
|
61
|
61
|
this.getList(1);
|
62
|
62
|
}
|
63
|
63
|
|
|
64
|
+ // 写入
|
|
65
|
+ variableNamesCreate = ['[$待接单数量$]', '[$执行中数量$]'];
|
|
66
|
+ variableNamesYy = ['[$预约单数量$]'];
|
|
67
|
+ writeIn(content, event, type){
|
|
68
|
+ var element = event.target.parentElement.parentElement.parentElement.parentElement.getElementsByTagName('input')[0];
|
|
69
|
+ if (element.selectionStart || element.selectionStart == '0') {
|
|
70
|
+ var startPos = element.selectionStart;
|
|
71
|
+ var endPos = element.selectionEnd;
|
|
72
|
+ this.validateForm.controls[type].setValue(element.value.substring(0, startPos) + content + element.value.substring(endPos));
|
|
73
|
+ element.focus();
|
|
74
|
+ setTimeout(() => {
|
|
75
|
+ element.setSelectionRange(startPos + content.length, startPos + content.length);
|
|
76
|
+ },0)
|
|
77
|
+ } else {
|
|
78
|
+ var val = element.value + content;
|
|
79
|
+ this.validateForm.controls[type].setValue(val);
|
|
80
|
+ element.focus();
|
|
81
|
+ }
|
|
82
|
+ }
|
|
83
|
+
|
64
|
84
|
// 初始化增删改按钮
|
65
|
85
|
coopBtns: any = {};
|
66
|
86
|
|
|
@@ -83,7 +103,7 @@ export class LimitInitiationTimeComponent implements OnInit {
|
83
|
103
|
.subscribe((data) => {
|
84
|
104
|
this.loading1 = false;
|
85
|
105
|
if (data.status == 200) {
|
86
|
|
- this.listOfData = data.list;
|
|
106
|
+ this.listOfData = data.list.map(v => ({...v, taskNames: v.taskTypeDTO.map(v => v.taskName.toString())}));
|
87
|
107
|
this.listLength = data.totalNum;
|
88
|
108
|
}
|
89
|
109
|
});
|
|
@@ -241,6 +261,14 @@ export class LimitInitiationTimeComponent implements OnInit {
|
241
|
261
|
startTime: [null],
|
242
|
262
|
endTime: [null],
|
243
|
263
|
remark: ['', [Validators.required]],
|
|
264
|
+ // new
|
|
265
|
+ limitNum: [0, [Validators.required]],
|
|
266
|
+ limitTime: ['0.5', [Validators.required]],
|
|
267
|
+ fqLimitNum: [0, [Validators.required]],
|
|
268
|
+ yyLimitNum: [0, [Validators.required]],
|
|
269
|
+ createRemark: ['', [Validators.required]],
|
|
270
|
+ yyLimitRemark: ['', [Validators.required]],
|
|
271
|
+ limitDispatchDesk: [0, [Validators.required]],
|
244
|
272
|
});
|
245
|
273
|
}
|
246
|
274
|
|
|
@@ -250,6 +278,76 @@ export class LimitInitiationTimeComponent implements OnInit {
|
250
|
278
|
this.validateForm.controls.deptIds.setValue([]);
|
251
|
279
|
}
|
252
|
280
|
|
|
281
|
+ // 修改限制方式
|
|
282
|
+ changeLimitType(e){
|
|
283
|
+ console.log(e);
|
|
284
|
+ this.validateForm.controls.limitDispatchDesk.setValue(0);
|
|
285
|
+ if(e == 1){
|
|
286
|
+ // 仅提示允许建单
|
|
287
|
+ this.validateForm.get('limitDispatchDesk')!.clearValidators();
|
|
288
|
+ this.validateForm.get('limitDispatchDesk')!.markAsPristine();
|
|
289
|
+ }else if(e == 2){
|
|
290
|
+ // 提示不允许建单
|
|
291
|
+ this.validateForm.get('limitDispatchDesk')!.setValidators(Validators.required);
|
|
292
|
+ this.validateForm.get('limitDispatchDesk')!.markAsDirty();
|
|
293
|
+ }
|
|
294
|
+ this.validateForm.get('limitDispatchDesk')!.updateValueAndValidity();
|
|
295
|
+ }
|
|
296
|
+
|
|
297
|
+ // 修改是否限制发起数量
|
|
298
|
+ changeLimitNum(e){
|
|
299
|
+ console.log(e);
|
|
300
|
+ this.validateForm.controls.limitTime.setValue('0.5');
|
|
301
|
+ this.validateForm.controls.fqLimitNum.setValue(0);
|
|
302
|
+ this.validateForm.controls.yyLimitNum.setValue(0);
|
|
303
|
+ this.validateForm.controls.createRemark.setValue('');
|
|
304
|
+ this.validateForm.controls.yyLimitRemark.setValue('');
|
|
305
|
+ if(e == 1){
|
|
306
|
+ // 是
|
|
307
|
+ this.validateForm.get('limitTime')!.setValidators(Validators.required);
|
|
308
|
+ this.validateForm.get('limitTime')!.markAsDirty();
|
|
309
|
+
|
|
310
|
+ this.validateForm.get('fqLimitNum')!.setValidators(Validators.required);
|
|
311
|
+ this.validateForm.get('fqLimitNum')!.markAsDirty();
|
|
312
|
+
|
|
313
|
+ this.validateForm.get('yyLimitNum')!.setValidators(Validators.required);
|
|
314
|
+ this.validateForm.get('yyLimitNum')!.markAsDirty();
|
|
315
|
+
|
|
316
|
+ this.validateForm.get('createRemark')!.setValidators(Validators.required);
|
|
317
|
+ this.validateForm.get('createRemark')!.markAsDirty();
|
|
318
|
+
|
|
319
|
+ this.validateForm.get('yyLimitRemark')!.setValidators(Validators.required);
|
|
320
|
+ this.validateForm.get('yyLimitRemark')!.markAsDirty();
|
|
321
|
+
|
|
322
|
+ this.validateForm.get('remark')!.clearValidators();
|
|
323
|
+ this.validateForm.get('remark')!.markAsPristine();
|
|
324
|
+ }else if(e == 0){
|
|
325
|
+ // 否
|
|
326
|
+ this.validateForm.get('limitTime')!.clearValidators();
|
|
327
|
+ this.validateForm.get('limitTime')!.markAsPristine();
|
|
328
|
+
|
|
329
|
+ this.validateForm.get('fqLimitNum')!.clearValidators();
|
|
330
|
+ this.validateForm.get('fqLimitNum')!.markAsPristine();
|
|
331
|
+
|
|
332
|
+ this.validateForm.get('yyLimitNum')!.clearValidators();
|
|
333
|
+ this.validateForm.get('yyLimitNum')!.markAsPristine();
|
|
334
|
+
|
|
335
|
+ this.validateForm.get('createRemark')!.clearValidators();
|
|
336
|
+ this.validateForm.get('createRemark')!.markAsPristine();
|
|
337
|
+
|
|
338
|
+ this.validateForm.get('yyLimitRemark')!.clearValidators();
|
|
339
|
+ this.validateForm.get('yyLimitRemark')!.markAsPristine();
|
|
340
|
+
|
|
341
|
+ this.validateForm.get('remark')!.setValidators(Validators.required);
|
|
342
|
+ this.validateForm.get('remark')!.markAsDirty();
|
|
343
|
+ }
|
|
344
|
+ this.validateForm.get('limitDispatchDesk')!.updateValueAndValidity();
|
|
345
|
+ this.validateForm.get('fqLimitNum')!.updateValueAndValidity();
|
|
346
|
+ this.validateForm.get('yyLimitNum')!.updateValueAndValidity();
|
|
347
|
+ this.validateForm.get('createRemark')!.updateValueAndValidity();
|
|
348
|
+ this.validateForm.get('yyLimitRemark')!.updateValueAndValidity();
|
|
349
|
+ }
|
|
350
|
+
|
253
|
351
|
// 新增/编辑表单提交
|
254
|
352
|
submitForm(): void {
|
255
|
353
|
for (const i in this.validateForm.controls) {
|
|
@@ -279,7 +377,7 @@ export class LimitInitiationTimeComponent implements OnInit {
|
279
|
377
|
if (this.add) {
|
280
|
378
|
//增加
|
281
|
379
|
data = {
|
282
|
|
- taskType: this.validateForm.value.taskType,
|
|
380
|
+ taskType: this.validateForm.value.taskType.toString(),
|
283
|
381
|
limitAllDept: this.validateForm.value.limitAllDept,
|
284
|
382
|
buildingIds: this.validateForm.value.buildingIds.length ? this.validateForm.value.buildingIds.toString() : null,
|
285
|
383
|
deptIds: this.validateForm.value.deptIds.length ? this.validateForm.value.deptIds.toString() : null,
|
|
@@ -288,12 +386,19 @@ export class LimitInitiationTimeComponent implements OnInit {
|
288
|
386
|
endTime: format(endOfMinute(this.validateForm.value.endTime), "yyyy-MM-dd HH:mm:ss"),
|
289
|
387
|
remark: this.validateForm.value.remark.trim(),
|
290
|
388
|
hosId: this.currentHospital.id,
|
|
389
|
+ limitNum: this.validateForm.value.limitNum,
|
|
390
|
+ limitTime: this.validateForm.value.limitTime,
|
|
391
|
+ fqLimitNum: this.validateForm.value.fqLimitNum,
|
|
392
|
+ yyLimitNum: this.validateForm.value.yyLimitNum,
|
|
393
|
+ createRemark: this.validateForm.value.createRemark.trim(),
|
|
394
|
+ yyLimitRemark: this.validateForm.value.yyLimitRemark.trim(),
|
|
395
|
+ limitDispatchDesk: this.validateForm.value.limitDispatchDesk,
|
291
|
396
|
};
|
292
|
397
|
} else {
|
293
|
398
|
//编辑
|
294
|
399
|
data = {
|
295
|
400
|
...this.coopId,
|
296
|
|
- taskType: this.validateForm.value.taskType,
|
|
401
|
+ taskType: this.validateForm.value.taskType.toString(),
|
297
|
402
|
limitAllDept: this.validateForm.value.limitAllDept,
|
298
|
403
|
buildingIds: this.validateForm.value.buildingIds.length ? this.validateForm.value.buildingIds.toString() : null,
|
299
|
404
|
deptIds: this.validateForm.value.deptIds.length ? this.validateForm.value.deptIds.toString() : null,
|
|
@@ -302,6 +407,13 @@ export class LimitInitiationTimeComponent implements OnInit {
|
302
|
407
|
endTime: format(endOfMinute(this.validateForm.value.endTime), "yyyy-MM-dd HH:mm:ss"),
|
303
|
408
|
remark: this.validateForm.value.remark.trim(),
|
304
|
409
|
hosId: this.currentHospital.id,
|
|
410
|
+ limitNum: this.validateForm.value.limitNum,
|
|
411
|
+ limitTime: this.validateForm.value.limitTime,
|
|
412
|
+ fqLimitNum: this.validateForm.value.fqLimitNum,
|
|
413
|
+ yyLimitNum: this.validateForm.value.yyLimitNum,
|
|
414
|
+ createRemark: this.validateForm.value.createRemark.trim(),
|
|
415
|
+ yyLimitRemark: this.validateForm.value.yyLimitRemark.trim(),
|
|
416
|
+ limitDispatchDesk: this.validateForm.value.limitDispatchDesk,
|
305
|
417
|
};
|
306
|
418
|
}
|
307
|
419
|
this.limitInitiationTimeService
|
|
@@ -331,8 +443,8 @@ export class LimitInitiationTimeComponent implements OnInit {
|
331
|
443
|
this.modal = true;
|
332
|
444
|
this.coopId = data;
|
333
|
445
|
|
334
|
|
- this.taskTypeList = data.taskTypeDTO ? [data.taskTypeDTO] : [];
|
335
|
|
- this.validateForm.controls.taskType.setValue(data.taskType); //任务类型
|
|
446
|
+ this.taskTypeList = data.taskTypeDTO || [];
|
|
447
|
+ this.validateForm.controls.taskType.setValue(this.taskTypeList.map(v => v.id)); //任务类型
|
336
|
448
|
|
337
|
449
|
this.validateForm.controls.limitAllDept.setValue(data.limitAllDept); //是否限制所有科室
|
338
|
450
|
|
|
@@ -347,6 +459,14 @@ export class LimitInitiationTimeComponent implements OnInit {
|
347
|
459
|
this.validateForm.controls.endTime.setValue(new Date(data.endTime));
|
348
|
460
|
}
|
349
|
461
|
this.validateForm.controls.remark.setValue(data.remark); //提示备注
|
|
462
|
+
|
|
463
|
+ this.validateForm.controls.limitNum.setValue(data.limitNum);
|
|
464
|
+ this.validateForm.controls.limitTime.setValue(data.limitTime);
|
|
465
|
+ this.validateForm.controls.fqLimitNum.setValue(data.fqLimitNum);
|
|
466
|
+ this.validateForm.controls.yyLimitNum.setValue(data.yyLimitNum);
|
|
467
|
+ this.validateForm.controls.createRemark.setValue(data.createRemark);
|
|
468
|
+ this.validateForm.controls.yyLimitRemark.setValue(data.yyLimitRemark);
|
|
469
|
+ this.validateForm.controls.limitDispatchDesk.setValue(data.limitDispatchDesk);
|
350
|
470
|
}
|
351
|
471
|
|
352
|
472
|
// 展示信息提示框(con:提示信息,success:操作是否成功,promptInfo:操作结果提示信息)
|