fixed:部分bug修复
parent
835fdd96af
commit
be27c2455a
|
|
@ -30,7 +30,7 @@
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
"zy-react-library": "^1.1.28"
|
"zy-react-library": "^1.1.32"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@antfu/eslint-config": "^5.4.1",
|
"@antfu/eslint-config": "^5.4.1",
|
||||||
|
|
|
||||||
|
|
@ -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",
|
||||||
|
|
|
||||||
|
|
@ -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}
|
||||||
|
|
@ -102,10 +101,10 @@ function List(props) {
|
||||||
dataIndex: "auditProcess",
|
dataIndex: "auditProcess",
|
||||||
render: (_, record) => (
|
render: (_, record) => (
|
||||||
<div>
|
<div>
|
||||||
{record.auditProcess === "100" && "集团单位"}
|
{/* {record.auditProcess === "100" && "集团单位"} */}
|
||||||
{record.status === 100 && "待审核"}
|
{/* {record.status === 100 && "待审核"} */}
|
||||||
{record.status === 200 && "审核中"}
|
{/* {record.status === 200 && "审核中"} */}
|
||||||
{record.status === 300 && "已驳回"}
|
{/* {record.status === 300 && "已驳回"} */}
|
||||||
{record.status === 400 && "已通过"}
|
{record.status === 400 && "已通过"}
|
||||||
</div>
|
</div>
|
||||||
),
|
),
|
||||||
|
|
@ -117,7 +116,7 @@ function List(props) {
|
||||||
width: 130,
|
width: 130,
|
||||||
render: (_, record) => (
|
render: (_, record) => (
|
||||||
<Space>
|
<Space>
|
||||||
{props.permission("zrzz-sdgs-zrzzjl-btn-ck") && (
|
{props.permission("zrzz-wzzx-zrzzjl-btn-ck") && (
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
|
|
@ -63,8 +63,8 @@ function List(props) {
|
||||||
// { title: "备注", dataIndex: "remarks" },
|
// { title: "备注", dataIndex: "remarks" },
|
||||||
{ title: "审核状态", dataIndex: "status", render: (_, record) => (
|
{ title: "审核状态", dataIndex: "status", render: (_, record) => (
|
||||||
<>
|
<>
|
||||||
{record.status === 200 && "审核中"}
|
{record.status === 200 && `${record.auditProcess === 100 ? "集团单位" : "审核部门"}审核中`}
|
||||||
{record.status === 300 && "已驳回"}
|
{record.status === 300 && `${record.auditProcess === 200 ? "集团单位" : "审核部门"}已驳回`}
|
||||||
{record.status === 400 && "已通过"}
|
{record.status === 400 && "已通过"}
|
||||||
</>
|
</>
|
||||||
) },
|
) },
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ function List(props) {
|
||||||
{
|
{
|
||||||
title: "所属集团单位",
|
title: "所属集团单位",
|
||||||
dataIndex: "groupUnitName",
|
dataIndex: "groupUnitName",
|
||||||
render: (_, record) => record.stakeholderLevel === "one-level" ? "--" : record.groupUnitName,
|
render: (_, record) => record.stakeholderLevel === "one-level" ? "-" : record.groupUnitName,
|
||||||
},
|
},
|
||||||
{ title: "资质名称", dataIndex: "qualificationsName" },
|
{ title: "资质名称", dataIndex: "qualificationsName" },
|
||||||
{ title: "资质类别", dataIndex: "qualificationsTypeName" },
|
{ title: "资质类别", dataIndex: "qualificationsTypeName" },
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@ function ViewInfo(props) {
|
||||||
styles={{ label: { width: 200 }, content: { width: 500 } }}
|
styles={{ label: { width: 200 }, content: { width: 500 } }}
|
||||||
items={[
|
items={[
|
||||||
{ label: "相关方名称", children: info.corpName },
|
{ label: "相关方名称", children: info.corpName },
|
||||||
{ label: "所属集团单位", children: info.groupUnitName },
|
{ label: "直属审核单位", children: info.groupUnitName },
|
||||||
{ label: "资质名称", children: info.qualificationsName },
|
{ label: "资质名称", children: info.qualificationsName },
|
||||||
{ label: "资质类别", children: info.qualificationsTypeName },
|
{ label: "资质类别", children: info.qualificationsTypeName },
|
||||||
{ label: "资质等级", children: info.stakeholderLevelName },
|
{ label: "资质等级", children: info.stakeholderLevelName },
|
||||||
|
|
@ -114,14 +114,14 @@ function ViewInfo(props) {
|
||||||
<div className="info">{item.auditUserName}</div>
|
<div className="info">{item.auditUserName}</div>
|
||||||
<div className="info">{item.auditCorpDeptName}</div>
|
<div className="info">{item.auditCorpDeptName}</div>
|
||||||
<div className="info">{item.auditCorpName}</div>
|
<div className="info">{item.auditCorpName}</div>
|
||||||
{
|
{/* { */}
|
||||||
item.auditRemarks && (
|
{/* item.auditRemarks && ( */}
|
||||||
<div className="info">
|
{/* <div className="info"> */}
|
||||||
驳回原因:
|
{/* 驳回原因: */}
|
||||||
{item.auditRemarks}
|
{/* {item.auditRemarks} */}
|
||||||
</div>
|
{/* </div> */}
|
||||||
)
|
{/* ) */}
|
||||||
}
|
{/* } */}
|
||||||
<div className="info">{item.auditTime}</div>
|
<div className="info">{item.auditTime}</div>
|
||||||
</div>
|
</div>
|
||||||
{index !== info.processFlow.length - 1 && <div className="line" />}
|
{index !== info.processFlow.length - 1 && <div className="line" />}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue