скрипт
This commit is contained in:
@@ -36,8 +36,9 @@ import {
|
||||
} from '../../shared/attachments/attachments.service';
|
||||
import { effectiveUserEmail } from '../../shared/impersonation';
|
||||
import { IRequestFormProps } from '../../models/types';
|
||||
import { IFormData, EMPTY_DATA, SetField } from './model';
|
||||
import { saveTmcTransferRequest, tmcTransferApprovalService, DATA_LIST_TITLE, APPROVAL_LIST_TITLE } from './submit';
|
||||
import { approvalListTitle, dataListTitle } from '../../shared/listTitles';
|
||||
import { FORM_ID, IFormData, EMPTY_DATA, SetField } from './model';
|
||||
import { saveTmcTransferRequest, tmcTransferApprovalService } from './submit';
|
||||
import { loadTmcTransferRequest } from './load';
|
||||
import { HeaderSection } from './sections/HeaderSection';
|
||||
import { ItemsSection } from './sections/ItemsSection';
|
||||
@@ -79,7 +80,7 @@ const TmcTransferForm: React.FC<IRequestFormProps> = ({ requestType, context, on
|
||||
return;
|
||||
}
|
||||
let alive = true;
|
||||
Promise.all([loadTmcTransferRequest(editId), getAttachments(DATA_LIST_TITLE, editId)])
|
||||
Promise.all([loadTmcTransferRequest(editId), getAttachments(dataListTitle(FORM_ID), editId)])
|
||||
.then(([loaded, atts]) => {
|
||||
if (alive) {
|
||||
setData(loaded.data);
|
||||
@@ -173,7 +174,7 @@ const TmcTransferForm: React.FC<IRequestFormProps> = ({ requestType, context, on
|
||||
if (requestId === undefined) {
|
||||
return;
|
||||
}
|
||||
deleteAttachment(DATA_LIST_TITLE, requestId, fileName)
|
||||
deleteAttachment(dataListTitle(FORM_ID), requestId, fileName)
|
||||
.then(() => setExistingAttachments((prev) => prev.filter((a) => a.fileName !== fileName)))
|
||||
.catch(() => undefined);
|
||||
};
|
||||
@@ -200,9 +201,9 @@ const TmcTransferForm: React.FC<IRequestFormProps> = ({ requestType, context, on
|
||||
setRequestCode(code);
|
||||
}
|
||||
if (files.length > 0) {
|
||||
await uploadAttachments(DATA_LIST_TITLE, id, files);
|
||||
await uploadAttachments(dataListTitle(FORM_ID), id, files);
|
||||
setFiles([]);
|
||||
setExistingAttachments(await getAttachments(DATA_LIST_TITLE, id));
|
||||
setExistingAttachments(await getAttachments(dataListTitle(FORM_ID), id));
|
||||
}
|
||||
if (onSaved) {
|
||||
onSaved();
|
||||
@@ -210,8 +211,8 @@ const TmcTransferForm: React.FC<IRequestFormProps> = ({ requestType, context, on
|
||||
if (status === REQUEST_STATUS.onApproval) {
|
||||
await notifyActiveStep(context, approval, id, {
|
||||
requestTypeId: rtId,
|
||||
dataListName: DATA_LIST_TITLE,
|
||||
approvalListName: APPROVAL_LIST_TITLE
|
||||
dataListName: dataListTitle(FORM_ID),
|
||||
approvalListName: approvalListTitle(FORM_ID)
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -247,7 +248,7 @@ const TmcTransferForm: React.FC<IRequestFormProps> = ({ requestType, context, on
|
||||
<FormCard
|
||||
title={requestType.title}
|
||||
subtitle="Категория: Склад / Снабжение"
|
||||
belowSubtitle={<InitiatorLine listTitle={DATA_LIST_TITLE} itemId={requestId} />}
|
||||
belowSubtitle={<InitiatorLine listTitle={dataListTitle(FORM_ID)} itemId={requestId} />}
|
||||
headerRight={
|
||||
requestId || requestStatus ? (
|
||||
<>
|
||||
|
||||
@@ -27,9 +27,10 @@ import {
|
||||
APPROVAL_PHASE
|
||||
} from '../../shared/approval';
|
||||
import { getAttachments, IAttachmentInfo } from '../../shared/attachments/attachments.service';
|
||||
import { IFormData, EMPTY_DATA, SetField } from './model';
|
||||
import { approvalListTitle, dataListTitle } from '../../shared/listTitles';
|
||||
import { FORM_ID, IFormData, EMPTY_DATA, SetField } from './model';
|
||||
import { loadTmcTransferRequest } from './load';
|
||||
import { tmcTransferApprovalService, DATA_LIST_TITLE, APPROVAL_LIST_TITLE } from './submit';
|
||||
import { tmcTransferApprovalService } from './submit';
|
||||
import { HeaderSection } from './sections/HeaderSection';
|
||||
import { ItemsSection } from './sections/ItemsSection';
|
||||
|
||||
@@ -54,7 +55,7 @@ const TmcTransferView: React.FC<ITmcTransferViewProps> = ({ context, itemId, for
|
||||
const set: SetField = () => undefined;
|
||||
|
||||
const approverService = useMemo(
|
||||
() => new ApproverService(tmcTransferApprovalService(), DATA_LIST_TITLE),
|
||||
() => new ApproverService(tmcTransferApprovalService(), dataListTitle(FORM_ID)),
|
||||
[]
|
||||
);
|
||||
|
||||
@@ -84,7 +85,7 @@ const TmcTransferView: React.FC<ITmcTransferViewProps> = ({ context, itemId, for
|
||||
useEffect(() => {
|
||||
let alive = true;
|
||||
setLoading(true);
|
||||
Promise.all([loadTmcTransferRequest(itemId), getAttachments(DATA_LIST_TITLE, itemId)])
|
||||
Promise.all([loadTmcTransferRequest(itemId), getAttachments(dataListTitle(FORM_ID), itemId)])
|
||||
.then(([loaded, files]) => {
|
||||
if (alive) {
|
||||
setData(loaded.data);
|
||||
@@ -123,8 +124,8 @@ const TmcTransferView: React.FC<ITmcTransferViewProps> = ({ context, itemId, for
|
||||
if (!requestTypeId) return;
|
||||
notifyActiveStep(context, approval, itemId, {
|
||||
requestTypeId,
|
||||
dataListName: DATA_LIST_TITLE,
|
||||
approvalListName: APPROVAL_LIST_TITLE
|
||||
dataListName: dataListTitle(FORM_ID),
|
||||
approvalListName: approvalListTitle(FORM_ID)
|
||||
}).catch(() => undefined);
|
||||
};
|
||||
|
||||
@@ -147,7 +148,7 @@ const TmcTransferView: React.FC<ITmcTransferViewProps> = ({ context, itemId, for
|
||||
<FormCard
|
||||
title="Служебная записка на перемещение ТМЦ"
|
||||
subtitle={`№${code || itemId}`}
|
||||
belowSubtitle={<InitiatorLine listTitle={DATA_LIST_TITLE} itemId={itemId} />}
|
||||
belowSubtitle={<InitiatorLine listTitle={dataListTitle(FORM_ID)} itemId={itemId} />}
|
||||
headerRight={status ? <StatusBadge status={status} /> : undefined}
|
||||
>
|
||||
<FormModeProvider readOnly>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { getSP } from '../../shared/pnp/pnpjs';
|
||||
import { ILineItem } from '../../shared/ui';
|
||||
import { IFormData, EMPTY_DATA } from './model';
|
||||
import { DATA_LIST_TITLE } from './submit';
|
||||
import { dataListTitle } from '../../shared/listTitles';
|
||||
import { FORM_ID, IFormData, EMPTY_DATA } from './model';
|
||||
|
||||
export interface ILoadedRequest {
|
||||
data: IFormData;
|
||||
@@ -24,7 +24,7 @@ function parseItems(raw: unknown): ILineItem[] {
|
||||
/** Прочитать заявку «СЗ на перемещение ТМЦ» по id: модель формы + статус + код. */
|
||||
export async function loadTmcTransferRequest(itemId: number): Promise<ILoadedRequest> {
|
||||
const item = (await getSP()
|
||||
.web.lists.getByTitle(DATA_LIST_TITLE)
|
||||
.web.lists.getByTitle(dataListTitle(FORM_ID))
|
||||
.items.getById(itemId)
|
||||
.select(
|
||||
'Id',
|
||||
|
||||
@@ -1,5 +1,12 @@
|
||||
import { WebPartContext } from '@microsoft/sp-webpart-base';
|
||||
import { ILineItem } from '../../shared/ui';
|
||||
import { RequestTypeId } from '../../models/types';
|
||||
|
||||
/**
|
||||
* Тип заявки этой формы — ключ реестра форм (forms/registry.ts). Имена списков
|
||||
* SharePoint выводятся из него, см. shared/listTitles.ts.
|
||||
*/
|
||||
export const FORM_ID: RequestTypeId = 'wh-tmc-transfer';
|
||||
|
||||
/**
|
||||
* Данные формы «Служебная записка на перемещение ТМЦ».
|
||||
|
||||
@@ -2,14 +2,12 @@ import { getSP } from '../../shared/pnp/pnpjs';
|
||||
import { ApprovalListService, IApproverToWrite, writeRoute } from '../../shared/approval';
|
||||
import { buildRequestUniqueCode } from '../../shared/requestCode';
|
||||
import { ILineItem } from '../../shared/ui';
|
||||
import { IFormData } from './model';
|
||||
|
||||
export const DATA_LIST_TITLE = 'СЗ на перемещение ТМЦ — данные';
|
||||
export const APPROVAL_LIST_TITLE = 'СЗ на перемещение ТМЦ — согласование';
|
||||
import { approvalListTitle, dataListTitle } from '../../shared/listTitles';
|
||||
import { FORM_ID, IFormData } from './model';
|
||||
|
||||
/** Экземпляр сервиса списка согласования этой формы. */
|
||||
export function tmcTransferApprovalService(): ApprovalListService {
|
||||
return new ApprovalListService(APPROVAL_LIST_TITLE);
|
||||
return new ApprovalListService(approvalListTitle(FORM_ID));
|
||||
}
|
||||
|
||||
/** Осмысленный заголовок элемента (системная колонка Title). */
|
||||
@@ -55,7 +53,7 @@ export async function saveTmcTransferRequest(
|
||||
executors: IApproverToWrite[],
|
||||
status: string
|
||||
): Promise<ISaveResult> {
|
||||
const list = getSP().web.lists.getByTitle(DATA_LIST_TITLE);
|
||||
const list = getSP().web.lists.getByTitle(dataListTitle(FORM_ID));
|
||||
const item = buildItem(data, status);
|
||||
|
||||
let id: number;
|
||||
|
||||
Reference in New Issue
Block a user