fix(inspection): 修复检查功能中的多个问题并优化代码格式

- 修复API端点路径错误,将hiddenConfirmUser/list改为listAll
- 扩展隐藏列表接受状态范围,支持state 400的情况
- 修正部门选择组件参数格式,enterpriseType从数字改为数组形式
- 格式化代码样式,统一导入语句和对象属性的空格格式
- 修复隐患数据处理逻辑,确保正确的数据返回和赋值
- 更新导出功能API端点,使用正确的检查记录导出路径
- 修正计划管理状态判断逻辑,准确识别已完成状态
- 优化企业信息获取参数,保持enterpriseType参数一致性
master
fangjiakai 2026-01-26 11:14:59 +08:00
parent 21961d1cd8
commit 365a3adb30
6 changed files with 79 additions and 81 deletions

View File

@ -58,7 +58,7 @@ export const hiddenList = declareRequest(
); );
export const hiddenConfirmUserAllList = declareRequest( export const hiddenConfirmUserAllList = declareRequest(
"confirmUserLoading", "confirmUserLoading",
`Post > @/hidden/hiddenConfirmUser/list`, `Post > @/hidden/hiddenConfirmUser/listAll`,
); );
export const hiddenAssign = declareRequest( export const hiddenAssign = declareRequest(
"assignLoading", "assignLoading",

View File

@ -37,7 +37,7 @@ function HiddenList(props) {
> >
查看 查看
</Button> </Button>
{record.state === 301 && <Button {(record.state === 301 || record.state === 400) && <Button
type="link" type="link"
onClick={() => { onClick={() => {
props.history.push(`./acceptance?hiddenId=${record.hiddenId}&id=${record.id}`); props.history.push(`./acceptance?hiddenId=${record.hiddenId}&id=${record.id}`);

View File

@ -38,7 +38,7 @@ function List(props) {
{ name: "inspectionUserName", label: "检查人" }, { name: "inspectionUserName", label: "检查人" },
{ name: "type", label: "检查类型", render: <DictionarySelectTree dictValue="inspectionType" onlyLastLevel /> }, { name: "type", label: "检查类型", render: <DictionarySelectTree dictValue="inspectionType" onlyLastLevel /> },
{ name: "checkTime", label: "检查时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, { name: "checkTime", label: "检查时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
{ name: "inspectedDepartmentId", label: "被检查单位", render: <DepartmentSelectTree searchType={props.corpSearchType} params={{ enterpriseType: 2 }}/> }, { name: "inspectedDepartmentId", label: "被检查单位", render: <DepartmentSelectTree searchType={props.corpSearchType} params={{ enterpriseType: [2] }}/> },
{ name: "inspectedUserName", label: "被检查单位现场负责人" }, { name: "inspectedUserName", label: "被检查单位现场负责人" },
]} ]}
form={form} form={form}

View File

@ -91,8 +91,7 @@ function Add(props) {
pageSize: 999, pageSize: 999,
}); });
setHiddenList(hiddenList); setHiddenList(hiddenList);
} } else {
else {
form.setFieldsValue({ form.setFieldsValue({
inspectorList: [{ inspectorList: [{
departmentId: userInfo.departmentId, departmentId: userInfo.departmentId,
@ -231,7 +230,8 @@ function Add(props) {
}); });
if (hiddenList[index].hiddenPartType === "input") { if (hiddenList[index].hiddenPartType === "input") {
await props["partAdd"]({ hiddenregion: hiddenList[index].hiddenPart }); const { data } = await props["partAdd"]({hiddenregion: hiddenList[index].hiddenPart});
hiddenList[index].hiddenPart = data
} }
const hiddenImageFiles = await getFile({ const hiddenImageFiles = await getFile({
@ -370,7 +370,7 @@ function Add(props) {
render: ( render: (
<DepartmentSelectTree <DepartmentSelectTree
searchType={props.corpSearchType} searchType={props.corpSearchType}
params={{ enterpriseType: 2 }} params={{enterpriseType: [2]}}
onGetLabel={label => form.setFieldValue(["personUnderInspection", "departmentName"], label)} onGetLabel={label => form.setFieldValue(["personUnderInspection", "departmentName"], label)}
onChange={() => { onChange={() => {
form.setFieldValue(["personUnderInspection", "userId"], ""); form.setFieldValue(["personUnderInspection", "userId"], "");
@ -531,8 +531,7 @@ function Add(props) {
onClick={async () => { onClick={async () => {
if (record.hiddenId) { if (record.hiddenId) {
getCurrentHiddenInfo(record.id, record.hiddenId); getCurrentHiddenInfo(record.id, record.hiddenId);
} } else {
else {
setCurrentHiddenInfo({...record}); setCurrentHiddenInfo({...record});
} }
setHiddenDiscovererUserList(getHiddenDiscovererUserList()); setHiddenDiscovererUserList(getHiddenDiscovererUserList());
@ -604,8 +603,7 @@ function Add(props) {
onConfirm={(values) => { onConfirm={(values) => {
if (currentHiddenIndex.current === -1) { if (currentHiddenIndex.current === -1) {
setHiddenList([...hiddenList, values]); setHiddenList([...hiddenList, values]);
} } else {
else {
setHiddenList( setHiddenList(
hiddenList.map((item, index) => { hiddenList.map((item, index) => {
if (index === currentHiddenIndex.current) if (index === currentHiddenIndex.current)

View File

@ -153,7 +153,7 @@ function List(props) {
onClick={async () => { onClick={async () => {
const exportParams = getUrlCriteriaQuery("searchFormKeys", "searchFormValues"); const exportParams = getUrlCriteriaQuery("searchFormKeys", "searchFormValues");
await downloadBlob("/accident/accident/export", { params: { ...exportParams, eqType: props?.type } }); await downloadBlob("/inspection/safetyEnvironmentalInspection/exportList", { params: { ...exportParams} });
}} }}
> >
导出 导出

View File

@ -124,12 +124,12 @@ function List(props) {
title: "计划状态", title: "计划状态",
dataIndex: "status", dataIndex: "status",
render: (_, record) => { render: (_, record) => {
const { planExecuteTotal, userExecuteNum,userExecuteTotal, planStartTime, planEndTime } = record; const { planExecuteTotal, userExecuteNum, planStartTime, planEndTime } = record;
const currentTime = dayjs(); const currentTime = dayjs();
let statusText = ""; let statusText = "";
if (userExecuteTotal <= userExecuteNum && planExecuteTotal > 0) { if (planExecuteTotal === userExecuteNum && planExecuteTotal > 0) {
statusText = "已完成"; statusText = "已完成";
} }
else if (currentTime.isBefore(planStartTime, "day")) { else if (currentTime.isBefore(planStartTime, "day")) {
@ -231,7 +231,7 @@ const AddModalComponent = (props) => {
const { getUserInfo } = useGetUserInfo(); const { getUserInfo } = useGetUserInfo();
const getCorpInfoList = async () => { const getCorpInfoList = async () => {
const { data } = await props["corpInfoList"]({ pageSize: 9999, pageIndex: 1, enterpriseType: 2 }); const { data } = await props["corpInfoList"]({ pageSize: 9999, pageIndex: 1, enterpriseType: [2] });
setCorpInfoList(data); setCorpInfoList(data);
}; };