diff --git a/app/panels/clnt_task_board/components/task_card.js b/app/panels/clnt_task_board/components/task_card.js index 5b0cbf8..388cba1 100644 --- a/app/panels/clnt_task_board/components/task_card.js +++ b/app/panels/clnt_task_board/components/task_card.js @@ -154,7 +154,7 @@ const TaskCard = ({ task, account, index, handleReload, eventPoints, pointSettin assignment {task.name} {account ? ( - + {account.authId ? account.authId : account.agnAbbr} diff --git a/app/panels/clnt_task_board/hooks.js b/app/panels/clnt_task_board/hooks.js index 93e2ba7..113e69a 100644 --- a/app/panels/clnt_task_board/hooks.js +++ b/app/panels/clnt_task_board/hooks.js @@ -293,7 +293,7 @@ const useTasks = () => { //Изменение статуса события (переносом) const handleStateChange = useCallback( - async (nEvent, sNextStat, note = null) => { + async (nEvent, sNextStat, note) => { try { //Выполняем инициализацию параметров const firstStep = await executeStored({ @@ -322,44 +322,50 @@ const useTasks = () => { { name: "in_CLIENT_PERSON", value: firstStep.SCLIENT_PERSON } ], callBack: async send => { + //Общие аргументы + const mainArgs = { + NIDENT: firstStep.NIDENT, + NSTEP: 3, + NEVENT: nEvent, + SEVENT_STAT: firstStep.SEVENT_STAT, + SSEND_CLIENT: send.outParameters.out_CLIENT_CODE, + SSEND_DIVISION: send.outParameters.out_DIVISION_CODE, + SSEND_POST: send.outParameters.out_POST_CODE, + SSEND_PERFORM: send.outParameters.out_POST_IN_DIV_CODE, + SSEND_PERSON: send.outParameters.out_PERSON_CODE, + SSEND_STAFFGRP: send.outParameters.out_STAFFGRP_CODE, + SSEND_USER_GROUP: send.outParameters.out_USER_GROUP_CODE, + SSEND_USER_NAME: send.outParameters.out_USER_NAME, + NSEND_PREDEFINED_EXEC: send.outParameters.out_PREDEFINED_EXEC, + NSEND_PREDEFINED_PROC: send.outParameters.out_PREDEFINED_PROC + }; //Выполняем переход к выбранной точке с исполнителем await executeStored({ stored: "PKG_P8PANELS_CLNTTSKBRD.CLNEVENTS_STATE_CHANGE", - args: { - NIDENT: firstStep.NIDENT, - NSTEP: 3, - NEVENT: nEvent, - SEVENT_STAT: firstStep.SEVENT_STAT, - SSEND_CLIENT: send.outParameters.out_CLIENT_CODE, - SSEND_DIVISION: send.outParameters.out_DIVISION_CODE, - SSEND_POST: send.outParameters.out_POST_CODE, - SSEND_PERFORM: send.outParameters.out_POST_IN_DIV_CODE, - SSEND_PERSON: send.outParameters.out_PERSON_CODE, - SSEND_STAFFGRP: send.outParameters.out_STAFFGRP_CODE, - SSEND_USER_GROUP: send.outParameters.out_USER_GROUP_CODE, - SSEND_USER_NAME: send.outParameters.out_USER_NAME, - NSEND_PREDEFINED_EXEC: send.outParameters.out_PREDEFINED_EXEC, - NSEND_PREDEFINED_PROC: send.outParameters.out_PREDEFINED_PROC, - SNOTE_HEADER: note.text ? note.header : null, - SNOTE: note.text ? note.text : null - } + args: note + ? { + ...mainArgs, + SNOTE_HEADER: note.header, + SNOTE: note.text + } + : mainArgs }); //Необходимо обновить данные setTasks(pv => ({ ...pv, reload: true })); } }); } else { + //Общие аргументы + const mainArgs = { NIDENT: firstStep.NIDENT, NSTEP: 3, NEVENT: nEvent, SEVENT_STAT: firstStep.SEVENT_STAT }; //Выполняем переход к выбранной точке с предопределенным исполнителем await executeStored({ stored: "PKG_P8PANELS_CLNTTSKBRD.CLNEVENTS_STATE_CHANGE", - args: { - NIDENT: firstStep.NIDENT, - NSTEP: 3, - NEVENT: nEvent, - SEVENT_STAT: firstStep.SEVENT_STAT, - SNOTE_HEADER: note.header ? note.header : null, - SNOTE: note.text ? note.text : null - } + args: note + ? { + ...mainArgs, + ...{ SNOTE_HEADER: note.header, SNOTE: note.text } + } + : mainArgs }); //Необходимо обновить данные setTasks(pv => ({ ...pv, reload: true })); @@ -416,7 +422,7 @@ const useTasks = () => { else { //Переинициализируем строки с учетом изменений (для визуального отображения) setTasks(pv => ({ ...pv, rows: [...rows] })); - handleStateChange(row.nrn, tasks.statuses.find(s => s.id == destination.droppableId).code); + handleStateChange(row.nrn, destCode); } } }, @@ -1065,7 +1071,7 @@ const useTaskCard = () => { stored: "PKG_P8PANELS_CLNTTSKBRD.CLNEVENTS_STATE_CHANGE", args: { ...mainArgs, - ...{ SNOTE_HEADER: n.header ? n.header : null, SNOTE: n.text ? n.text : null } + ...{ SNOTE_HEADER: n.header, SNOTE: n.text } } }); //Если требуется перезагрузить данные @@ -1099,7 +1105,7 @@ const useTaskCard = () => { stored: "PKG_P8PANELS_CLNTTSKBRD.CLNEVENTS_STATE_CHANGE", args: { ...mainArgs, - ...{ SNOTE_HEADER: n.header ? n.header : null, SNOTE: n.text ? n.text : null } + ...{ SNOTE_HEADER: n.header, SNOTE: n.text } } }); //Если требуется перезагрузить данные