diff --git a/src/api/equipInfo/index.js b/src/api/equipInfo/index.js index 4382475..2940dca 100644 --- a/src/api/equipInfo/index.js +++ b/src/api/equipInfo/index.js @@ -1,4 +1,7 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; +import { fromSingleResponse } from "../../utils/enterpriseInfo/adapter"; +import { apiGet, safeAction } from "../../utils/enterpriseInfo/http"; +import { asId } from "../../utils/enterpriseInfo/idUtil"; export const equipInfoList = declareRequest( "equipInfoLoading", @@ -8,8 +11,10 @@ export const equipInfoList = declareRequest( export const equipInfoGet = declareRequest( "equipInfoLoading", - "Get > /safetyEval/org-equipment/get", - "equipInfoDetail: {} | res.data || {}", + safeAction(async (params) => { + const res = await apiGet("/safetyEval/org-equipment/get", { id: asId(params?.id) }); + return fromSingleResponse(res); + }), ); export const equipInfoAdd = declareRequest( @@ -29,5 +34,5 @@ export const equipInfoRemove = declareRequest( export const equipInfoToggleStatus = declareRequest( "equipInfoLoading", - "Get > /safetyEval/org-equipment/modify", + "Post > @/safetyEval/org-equipment/modify", ); \ No newline at end of file diff --git a/src/api/orgDepartment/index.js b/src/api/orgDepartment/index.js index 72a09be..b8a8d35 100644 --- a/src/api/orgDepartment/index.js +++ b/src/api/orgDepartment/index.js @@ -6,8 +6,8 @@ import { fromSingleResponse, toDepartmentForm, toPageQuery, -} from "../enterpriseInfo/adapter"; -import { apiGet, apiPost, apiPostDelete, safeAction, safePageResult } from "../enterpriseInfo/http"; +} from "../../utils/enterpriseInfo/adapter"; +import { apiGet, apiPost, apiPostDelete, safeAction, safePageResult } from "../../utils/enterpriseInfo/http"; export const orgDepartmentGet = declareRequest("orgDepartmentLoading", safeAction(async (params) => { const res = await apiGet("/safetyEval/org-department/get", { id: params.id }); diff --git a/src/api/orgInfo/index.js b/src/api/orgInfo/index.js index 5ae39a1..b312257 100644 --- a/src/api/orgInfo/index.js +++ b/src/api/orgInfo/index.js @@ -36,4 +36,4 @@ export { registeredOrgList, registeredOrgGet, fetchRegisteredOrgDetail, -} from "../regulatorOrgInfo"; +} from "../../utils/regulatorOrgInfo"; diff --git a/src/api/orgPosition/index.js b/src/api/orgPosition/index.js index 10692b1..41571be 100644 --- a/src/api/orgPosition/index.js +++ b/src/api/orgPosition/index.js @@ -4,8 +4,8 @@ import { fromPositionForm, toPageQuery, toPositionForm, -} from "../enterpriseInfo/adapter"; -import { apiGet, apiPost, apiPostDelete, safeAction, safePageResult } from "../enterpriseInfo/http"; +} from "../../utils/enterpriseInfo/adapter"; +import { apiGet, apiPost, apiPostDelete, safeAction, safePageResult } from "../../utils/enterpriseInfo/http"; export const orgPositionList = declareRequest("orgPositionLoading", safePageResult(async (params) => { const query = toPageQuery(params, { diff --git a/src/api/qualFiling/index.js b/src/api/qualFiling/index.js index fc0111c..d9592a7 100644 --- a/src/api/qualFiling/index.js +++ b/src/api/qualFiling/index.js @@ -1,9 +1,9 @@ /** 资质备案:接口定义与前后端字段适配 */ import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; -import { fromPageResponse, fromSingleResponse, toPageQuery } from "../enterpriseInfo/adapter"; -import { apiGet, apiPost, apiPostDelete, safeAction, safePageResult } from "../enterpriseInfo/http"; -import { asId, normalizeQueryIds } from "../enterpriseInfo/idUtil"; +import { fromPageResponse, fromSingleResponse, toPageQuery } from "../../utils/enterpriseInfo/adapter"; +import { apiGet, apiPost, apiPostDelete, safeAction, safePageResult } from "../../utils/enterpriseInfo/http"; +import { asId, normalizeQueryIds } from "../../utils/enterpriseInfo/idUtil"; import { formatDate, toApiDate, toDayjs } from "../../utils/dateFormat"; import { parseUploadFileList, resolveUploadFileId } from "../../utils/mockUpload"; diff --git a/src/api/staffChangeLog/index.js b/src/api/staffChangeLog/index.js index 26b8b4c..dcb51fa 100644 --- a/src/api/staffChangeLog/index.js +++ b/src/api/staffChangeLog/index.js @@ -1,5 +1,5 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; -import { apiPostDelete, safeAction } from "../enterpriseInfo/http"; +import { apiPostDelete, safeAction } from "../../utils/enterpriseInfo/http"; export const staffChangeLogStaffList = declareRequest( "staffChangeLogLoading", diff --git a/src/api/staffInfo/index.js b/src/api/staffInfo/index.js index 49d53b5..bdb608a 100644 --- a/src/api/staffInfo/index.js +++ b/src/api/staffInfo/index.js @@ -1,6 +1,6 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; -import { apiPost, safeAction } from "../enterpriseInfo/http"; -import { asId } from "../enterpriseInfo/idUtil"; +import { apiPost, safeAction } from "../../utils/enterpriseInfo/http"; +import { asId } from "../../utils/enterpriseInfo/idUtil"; export const staffInfoList = declareRequest( "staffInfoLoading", diff --git a/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js b/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js index d423b3c..f164d65 100644 --- a/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js +++ b/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js @@ -8,7 +8,7 @@ import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; import { NS_ORG_DEPARTMENT, NS_ORG_POSITION, NS_STAFF_INFO } from "~/enumerate/namespace"; -import { asId, sameId } from "~/api/enterpriseInfo/idUtil"; +import { asId, sameId } from "~/utils/enterpriseInfo/idUtil"; import { safeListRequest, safeRequest } from "~/utils"; function findDeptNode(nodes = [], id) { diff --git a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js index b0a4394..7fe75bd 100644 --- a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js +++ b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js @@ -77,6 +77,7 @@ function EquipInfoPage(props) { onOk: async () => { const nextFlag = enabled ? 2 : 1; const res = await props.equipInfoToggleStatus({ + ...record, id, enableFlag: nextFlag, }); @@ -118,7 +119,7 @@ function EquipInfoPage(props) { allowClear /> , -