fixed:部分bug修复

master
dearLin 2026-01-19 10:35:55 +08:00
parent d5caaa95ad
commit 835fdd96af
4 changed files with 93 additions and 92 deletions

View File

@ -30,7 +30,6 @@ function Add(props) {
const { data } = await props["qualificationApplyInfo"]({ id: query.id }); const { data } = await props["qualificationApplyInfo"]({ id: query.id });
// 重新提交时删除id // 重新提交时删除id
if (query.resubmit) { if (query.resubmit) {
data.resubmitId = query.id;
delete data.id; delete data.id;
} }
if (data.groupUnitUser) { if (data.groupUnitUser) {
@ -326,8 +325,10 @@ const StepTwoComponent = (props) => {
}); });
specialList[i].applyDetailId = id; specialList[i].applyDetailId = id;
} }
let resubmitId = "";
// 重新提交时删除id // 重新提交时删除id
if (query.resubmit) { if (query.resubmit) {
resubmitId = query.id;
delete query.id; delete query.id;
} }
const data = { ...props.formValues, qualificationsApplyDetailList: [...specialList] }; const data = { ...props.formValues, qualificationsApplyDetailList: [...specialList] };
@ -339,6 +340,7 @@ const StepTwoComponent = (props) => {
} }
const { success } = await props[!query.id ? "qualificationApplyAdd" : "qualificationApplyUpdate"]({ const { success } = await props[!query.id ? "qualificationApplyAdd" : "qualificationApplyUpdate"]({
...data, ...data,
resubmitId,
id: query.id, id: query.id,
}); });
if (success) { if (success) {

View File

@ -37,46 +37,46 @@ function List(props) {
{ title: "资质类别", dataIndex: "qualificationsTypeName" }, { title: "资质类别", dataIndex: "qualificationsTypeName" },
{ title: "资质等级", dataIndex: "stakeholderLevelName" }, { title: "资质等级", dataIndex: "stakeholderLevelName" },
{ title: "材料数", dataIndex: "materialNum" }, { title: "材料数", dataIndex: "materialNum" },
{ // {
title: "资质状态", // title: "资质状态",
dataIndex: "qualificationsStatus", // dataIndex: "qualificationsStatus",
render: (_, record) => ( // render: (_, record) => (
<div> // <div>
{record.qualificationsStatus === 0 && "正常"} // {record.qualificationsStatus === 0 && "正常"}
{record.qualificationsStatus === 1 && "待完善"} // {record.qualificationsStatus === 1 && "待完善"}
{record.qualificationsStatus === 2 && ( // {record.qualificationsStatus === 2 && (
<Tooltip // <Tooltip
overlayStyle={{ width: "auto", maxWidth: "700px", whiteSpace: "normal", wordBreak: "break-word" }} // overlayStyle={{ width: "auto", maxWidth: "700px", whiteSpace: "normal", wordBreak: "break-word" }}
title={ // title={
record.expireList // record.expireList
? ( // ? (
<div style={{ width: "100%" }}> // <div style={{ width: "100%" }}>
{record.expireList.map((item, index) => ( // {record.expireList.map((item, index) => (
<div key={index}> // <div key={index}>
{item.dataName} // {item.dataName}
{" "} // {" "}
已于 // 已于
{item.qualificationsTermEnd} // {item.qualificationsTermEnd}
{" "} // {" "}
过期 // 过期
</div> // </div>
))} // ))}
</div> // </div>
) // )
: "部分资料已过期" // : "部分资料已过期"
} // }
> // >
<span style={{ display: "inline-flex", alignItems: "center" }}> // <span style={{ display: "inline-flex", alignItems: "center" }}>
存在异常 // 存在异常
{" "} // {" "}
<WarningOutlined style={{ color: "#faad14", marginLeft: 4 }} /> // <WarningOutlined style={{ color: "#faad14", marginLeft: 4 }} />
</span> // </span>
</Tooltip> // </Tooltip>
)} // )}
{(record.qualificationsStatus === 3 || record.qualificationsStatus === 4) && "资质过期"} // {(record.qualificationsStatus === 3 || record.qualificationsStatus === 4) && "资质过期"}
</div> // </div>
), // ),
}, // },
{ {
title: "操作", title: "操作",
fixed: "right", fixed: "right",

View File

@ -6,7 +6,6 @@ import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
import { NS_QUALIFICATION_RECORDS } from "~/enumerate/namespace"; import { NS_QUALIFICATION_RECORDS } from "~/enumerate/namespace";
@ -35,16 +34,16 @@ function List(props) {
render: (<DictionarySelect dictValue="qualificationsType" />), render: (<DictionarySelect dictValue="qualificationsType" />),
}, },
{ name: "stakeholderLevel", label: "资质等级", render: (<DictionarySelect dictValue="stakeholderLevel" />) }, { name: "stakeholderLevel", label: "资质等级", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
{ // {
name: "auditStatus", // name: "auditStatus",
label: "审核状态", // label: "审核状态",
render: FORM_ITEM_RENDER_ENUM.SELECT, // render: FORM_ITEM_RENDER_ENUM.SELECT,
items: [ // items: [
{ bianma: "200-200", name: "主管部门审核中" }, // { bianma: "200-200", name: "主管部门审核中" },
{ bianma: "200-300", name: "主管部门已驳回" }, // { bianma: "200-300", name: "主管部门已驳回" },
{ bianma: "400", name: "已完成" }, // { bianma: "400", name: "已完成" },
], // ],
}, // },
]} ]}
form={form} form={form}
onFinish={getData} onFinish={getData}

View File

@ -42,46 +42,46 @@ function List(props) {
{ title: "资质类别", dataIndex: "qualificationsTypeName" }, { title: "资质类别", dataIndex: "qualificationsTypeName" },
{ title: "资质等级", dataIndex: "stakeholderLevelName" }, { title: "资质等级", dataIndex: "stakeholderLevelName" },
{ title: "材料数", dataIndex: "materialNum" }, { title: "材料数", dataIndex: "materialNum" },
{ // {
title: "资质状态", // title: "资质状态",
dataIndex: "qualificationsStatus", // dataIndex: "qualificationsStatus",
render: (_, record) => ( // render: (_, record) => (
<div> // <div>
{record.qualificationsStatus === 0 && "正常"} // {record.qualificationsStatus === 0 && "正常"}
{record.qualificationsStatus === 1 && "待完善"} // {record.qualificationsStatus === 1 && "待完善"}
{record.qualificationsStatus === 2 && ( // {record.qualificationsStatus === 2 && (
<Tooltip // <Tooltip
overlayStyle={{ width: "auto", maxWidth: "700px", whiteSpace: "normal", wordBreak: "break-word" }} // overlayStyle={{ width: "auto", maxWidth: "700px", whiteSpace: "normal", wordBreak: "break-word" }}
title={ // title={
record.expireList // record.expireList
? ( // ? (
<div style={{ width: "100%" }}> // <div style={{ width: "100%" }}>
{record.expireList.map((item, index) => ( // {record.expireList.map((item, index) => (
<div key={index}> // <div key={index}>
{item.dataName} // {item.dataName}
{" "} // {" "}
已于 // 已于
{item.qualificationsTermEnd} // {item.qualificationsTermEnd}
{" "} // {" "}
过期 // 过期
</div> // </div>
))} // ))}
</div> // </div>
) // )
: "部分资料已过期" // : "部分资料已过期"
} // }
> // >
<span style={{ display: "inline-flex", alignItems: "center" }}> // <span style={{ display: "inline-flex", alignItems: "center" }}>
存在异常 // 存在异常
{" "} // {" "}
<WarningOutlined style={{ color: "#faad14", marginLeft: 4 }} /> // <WarningOutlined style={{ color: "#faad14", marginLeft: 4 }} />
</span> // </span>
</Tooltip> // </Tooltip>
)} // )}
{(record.qualificationsStatus === 3 || record.qualificationsStatus === 4) && "资质过期"} // {(record.qualificationsStatus === 3 || record.qualificationsStatus === 4) && "资质过期"}
</div> // </div>
), // ),
}, // },
{ {
title: "操作", title: "操作",
fixed: "right", fixed: "right",