diff --git a/src/webparts/requestPortal/forms/Ticket1C/approval/provisioning.json b/src/webparts/requestPortal/forms/Ticket1C/approval/provisioning.json index 23d387d..3da3e45 100644 --- a/src/webparts/requestPortal/forms/Ticket1C/approval/provisioning.json +++ b/src/webparts/requestPortal/forms/Ticket1C/approval/provisioning.json @@ -2,7 +2,7 @@ "dataListTitle": "Заявка в отдел 1С — согласование", "columns": [ { "internalName": "TansuSiteApprover", "title": "Согласующий", "type": "User", "userSelectionMode": "PeopleOnly" }, - { "internalName": "RequestStatus", "title": "Статус", "type": "Choice", "choices": ["Черновик", "Ждёт очереди", "На согласовании", "На исполнении", "Согласовано", "Выполнено", "Отклонено", "Возвращена на доработку"] }, + { "internalName": "ApprovalStatus", "title": "Статус", "type": "Choice", "choices": ["Черновик", "Ждёт очереди", "На согласовании", "На исполнении", "Согласовано", "Выполнено", "Отклонено", "Возвращена на доработку"] }, { "internalName": "Ticket", "title": "Заявка", "type": "Lookup", "lookupList": "Заявка в отдел 1С — данные", "lookupShowField": "Title" }, { "internalName": "Date", "title": "Дата", "type": "DateTime" }, { "internalName": "Comment", "title": "Комментарий", "type": "Note" }, diff --git a/src/webparts/requestPortal/forms/Ticket1C/load.ts b/src/webparts/requestPortal/forms/Ticket1C/load.ts index a8a043c..a30a85b 100644 --- a/src/webparts/requestPortal/forms/Ticket1C/load.ts +++ b/src/webparts/requestPortal/forms/Ticket1C/load.ts @@ -20,7 +20,7 @@ export async function loadTicketRequest(itemId: number): Promise const item = (await getSP() .web.lists.getByTitle(LIST_TITLE) .items.getById(itemId) - .select(...SCALAR_FIELDS, 'Title', 'Status', 'RequestUniqueCode')()) as Record; + .select(...SCALAR_FIELDS, 'Title', 'RequestStatus', 'RequestUniqueCode')()) as Record; const data: IFormData = { ...EMPTY_DATA }; const writable = data as unknown as Record; @@ -31,5 +31,9 @@ export async function loadTicketRequest(itemId: number): Promise }); data.TaskName = (item.Title as string) || ''; - return { data, status: (item.Status as string) || '', code: (item.RequestUniqueCode as string) || '' }; + return { + data, + status: (item.RequestStatus as string) || '', + code: (item.RequestUniqueCode as string) || '', + }; } diff --git a/src/webparts/requestPortal/forms/Ticket1C/provisioning.json b/src/webparts/requestPortal/forms/Ticket1C/provisioning.json index 3e6e155..9224888 100644 --- a/src/webparts/requestPortal/forms/Ticket1C/provisioning.json +++ b/src/webparts/requestPortal/forms/Ticket1C/provisioning.json @@ -3,7 +3,7 @@ "titleColumnName": "Наименование задачи", "columns": [ { "internalName": "RequestUniqueCode", "title": "Уникальный код заявки", "type": "Text" }, - { "internalName": "Status", "title": "Статус", "type": "Choice", "choices": ["Черновик", "На согласовании", "Согласовано", "Отклонено", "Возвращена на доработку", "Выполнение", "Закрыта"] }, + { "internalName": "RequestStatus", "title": "Статус", "type": "Choice", "choices": ["Черновик", "На согласовании", "Согласовано", "Отклонено", "Возвращена на доработку", "Выполнение", "Закрыта"] }, { "internalName": "WorkType", "title": "Виды работ", "type": "Choice", "required": true, "choices": [ "Создание пользователя в 1С", diff --git a/src/webparts/requestPortal/forms/Ticket1C/submit.ts b/src/webparts/requestPortal/forms/Ticket1C/submit.ts index c061f9e..28fa406 100644 --- a/src/webparts/requestPortal/forms/Ticket1C/submit.ts +++ b/src/webparts/requestPortal/forms/Ticket1C/submit.ts @@ -18,7 +18,7 @@ export function ticket1cApprovalService(): ApprovalListService { /** Поля элемента списка данных из модели формы. TaskName пишется в системную колонку Title. */ function buildItem(data: IFormData, status: string): Record { - const item: Record = { Title: data.TaskName, Status: status }; + const item: Record = { Title: data.TaskName, RequestStatus: status }; (Object.keys(data) as (keyof IFormData)[]).forEach((key) => { if (key === 'TaskName') return;