diff --git a/web/src/api/dict-vsp.js b/web/src/api/dict-vsp.js index 773d3e3..7205255 100644 --- a/web/src/api/dict-vsp.js +++ b/web/src/api/dict-vsp.js @@ -14,6 +14,8 @@ export const DictVspApi = { return api.delete(`/dict/info/${dict_vsp_id}`).then((r) => r.data); }, export(payload) { - return api.post(`/dict/info/export`, payload); + return api.post(`/dict/info/export`, payload, { + responseType: 'blob', + }); }, }; diff --git a/web/src/api/users.js b/web/src/api/users.js index 22b7406..1048c60 100644 --- a/web/src/api/users.js +++ b/web/src/api/users.js @@ -2,7 +2,7 @@ import api from "./client"; export const UsersApi = { me() { - return api.get("/users/me").then((r) => r.data); + return api.get("/users/me", { params: { load_orgs: true } }).then((r) => r.data); }, getById(userId) { return api.get(`/users/${userId}`).then((r) => r.data); diff --git a/web/src/components/common/TaskCardComponent.jsx b/web/src/components/common/TaskCardComponent.jsx index 1dbc160..5d83e96 100644 --- a/web/src/components/common/TaskCardComponent.jsx +++ b/web/src/components/common/TaskCardComponent.jsx @@ -95,7 +95,7 @@ export const TaskCardComponent = ({ onExportClick, }) => { const navigate = useNavigate(); - const { id, title, name, start_date, end_date, tables_count, org_unit, form_type_code } = taskForm; + const { id, title, org_unit, form_type_code, year } = taskForm; const [isEditModalOpen, setEditModalOpen] = useState(false); const [editedTitle, setEditedTitle] = useState(''); @@ -181,8 +181,6 @@ export const TaskCardComponent = ({ await updateTask(nextTitle); }; - const formattedDateRange = `${formatDate(start_date)} — ${formatDate(end_date)}`; - return ( <> - }> - {formattedDateRange} - + }>{year} }> {org_unit.title} - }> + {/* }> Таблиц: {tables_count} - + */} {exportMode && ( diff --git a/web/src/pages/DictVspPage/DictVspPage.jsx b/web/src/pages/DictVspPage/DictVspPage.jsx index af89127..a96ef29 100644 --- a/web/src/pages/DictVspPage/DictVspPage.jsx +++ b/web/src/pages/DictVspPage/DictVspPage.jsx @@ -42,13 +42,10 @@ function DictVspPage() { if (!user) return; setIsLoading(true); try { + const isAdmin = user.role_id == ROLES_NAME_ID.admin; const [vspResponse, sspResponse] = await Promise.all([ DictVspApi.get(), - user.role_id === ROLES_NAME_ID.admin - ? SspApi.getAll() - : user.role_id === ROLES_NAME_ID.executor_dfip - ? SspApi.getManySsp(user.id) - : SspApi.getSsp(user.ssp[0].id), + isAdmin ? SspApi.getAll() : Promise.resolve(null), ]); if (!vspResponse.success) { @@ -57,17 +54,15 @@ function DictVspPage() { } setDictVspData(vspResponse.result || []); - if (!sspResponse.success) { - toast.error('Ошибка загрузки списка ССП'); - return; + if (isAdmin) { + if (!sspResponse.success) { + toast.error('Ошибка загрузки списка ССП'); + return; + } + setSsps(sspResponse.result); + } else { + setSsps(user.org_units ?? []); } - setSsps( - sspResponse.result?.ssp - ? sspResponse.result.ssp - : Array.isArray(sspResponse.result) - ? sspResponse.result - : [sspResponse.result], - ); } catch (error) { console.error('Error loading data:', error); toast.error('Ошибка загрузки данных'); @@ -147,8 +142,8 @@ function DictVspPage() { {/* */} - - + + {user.role_id !== ROLES_NAME_ID.executor_rf && ( { mb: '1.5rem', }} > - + diff --git a/web/src/pages/DictVspPage/components/TableDictVsp.jsx b/web/src/pages/DictVspPage/components/TableDictVsp.jsx index a85b0ba..d1c4397 100644 --- a/web/src/pages/DictVspPage/components/TableDictVsp.jsx +++ b/web/src/pages/DictVspPage/components/TableDictVsp.jsx @@ -110,17 +110,13 @@ const TableDictVsp = ({ enableSorting: false, }, { - accessorKey: 'ssp_id', + accessorKey: 'regional_branch', header: 'Региональный филиал/ССП', size: 120, minSize: 100, maxSize: 150, Cell: ({ cell }) => ( - - {cell.getValue() - ? ssps.find((s) => s.id == cell.getValue())?.title - : '-'} - + {cell.getValue() || '-'} ), enableColumnActions: false, enableSorting: false, @@ -308,12 +304,15 @@ const TableDictVsp = ({ }, }, - renderTopToolbarCustomActions: () => ( + renderTopToolbar: () => ( - +