diff --git a/frontend/src/webparts/approvalAdmin/components/screens/RouteCopyModal.tsx b/frontend/src/webparts/approvalAdmin/components/screens/RouteCopyModal.tsx index d789f8e..cba3ee2 100644 --- a/frontend/src/webparts/approvalAdmin/components/screens/RouteCopyModal.tsx +++ b/frontend/src/webparts/approvalAdmin/components/screens/RouteCopyModal.tsx @@ -47,7 +47,8 @@ function toStepInput(step: TemplateRouteStep): CreateTemplateRouteStepInput { conditions: step.conditions, conditionsLogic: step.conditionsLogic, slaHours: step.slaHours, - askOverdueReason: step.askOverdueReason + askOverdueReason: step.askOverdueReason, + autoApprove: step.autoApprove }; } diff --git a/frontend/src/webparts/approvalAdmin/components/screens/RouteStepFormModal.tsx b/frontend/src/webparts/approvalAdmin/components/screens/RouteStepFormModal.tsx index 241df16..4918eb7 100644 --- a/frontend/src/webparts/approvalAdmin/components/screens/RouteStepFormModal.tsx +++ b/frontend/src/webparts/approvalAdmin/components/screens/RouteStepFormModal.tsx @@ -77,6 +77,7 @@ interface IFormState { /** Пусто — наследовать SLA от типа заявки; «0» — напоминать сразу. Это разные вещи. */ slaHours: string; askOverdueReason: TriState; + autoApprove: boolean; } const EMPTY_CONDITION: RouteStepCondition = { fieldName: '', operation: ComparisonOperator.GreaterThan, value: '' }; @@ -133,7 +134,8 @@ function toFormState(editing: TemplateRouteStep | undefined, nextOrderNo: number conditions: [EMPTY_CONDITION], conditionsLogic: ConditionsLogic.And, slaHours: '', - askOverdueReason: '' + askOverdueReason: '', + autoApprove: false }; } return { @@ -149,7 +151,8 @@ function toFormState(editing: TemplateRouteStep | undefined, nextOrderNo: number conditions: editing.conditions.length > 0 ? editing.conditions : [EMPTY_CONDITION], conditionsLogic: editing.conditionsLogic, slaHours: slaHoursToInput(editing.slaHours), - askOverdueReason: boolToTriState(editing.askOverdueReason) + askOverdueReason: boolToTriState(editing.askOverdueReason), + autoApprove: editing.autoApprove }; } @@ -365,6 +368,14 @@ export const RouteStepFormModal: React.FC = ({ submit.fail(texts.routeSteps.validationSlaHours); return; } + // Автосогласование отсчитывается от SLA — без него фоновая задача шаг просто + // пропустит (см. AutoApproveService.DeadlineOf), и настройка тихо не сработала + // бы. Пустое поле здесь не значит «нет SLA»: оно значит «взять у типа заявки», + // поэтому ошибка только когда SLA нет и там. + if (form.autoApprove && parseSlaHours(form.slaHours) === null && requestType?.slaHours === null) { + submit.fail(texts.routeSteps.validationAutoApproveWithoutSla); + return; + } const payload = { orderNo, @@ -379,7 +390,8 @@ export const RouteStepFormModal: React.FC = ({ : null, conditionsLogic: form.conditionsLogic, slaHours: parseSlaHours(form.slaHours), - askOverdueReason: triStateToBool(form.askOverdueReason) + askOverdueReason: triStateToBool(form.askOverdueReason), + autoApprove: form.autoApprove }; const request = editing @@ -505,6 +517,14 @@ export const RouteStepFormModal: React.FC = ({ /> + + setForm({ ...form, autoApprove: v })} + /> + + ): TemplateRouteStep { conditionsLogic: ConditionsLogic.And, slaHours: null, askOverdueReason: null, + autoApprove: false, ...overrides }; }