From 835fdd96af80e1c54e2a47f57815cb942eb6c4f9 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Mon, 19 Jan 2026 10:35:55 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=E9=83=A8=E5=88=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Qualification/Apply/Add/index.js | 4 +- .../Qualification/Review/List/index.js | 80 +++++++++---------- .../Qualification/Records/List/index.js | 21 +++-- .../Qualification/Review/List/index.js | 80 +++++++++---------- 4 files changed, 93 insertions(+), 92 deletions(-) diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js index 76d30b1..609d3cc 100644 --- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js @@ -30,7 +30,6 @@ function Add(props) { const { data } = await props["qualificationApplyInfo"]({ id: query.id }); // 重新提交时,删除id if (query.resubmit) { - data.resubmitId = query.id; delete data.id; } if (data.groupUnitUser) { @@ -326,8 +325,10 @@ const StepTwoComponent = (props) => { }); specialList[i].applyDetailId = id; } + let resubmitId = ""; // 重新提交时,删除id if (query.resubmit) { + resubmitId = query.id; delete query.id; } const data = { ...props.formValues, qualificationsApplyDetailList: [...specialList] }; @@ -339,6 +340,7 @@ const StepTwoComponent = (props) => { } const { success } = await props[!query.id ? "qualificationApplyAdd" : "qualificationApplyUpdate"]({ ...data, + resubmitId, id: query.id, }); if (success) { diff --git a/src/pages/Container/BranchCompany/Qualification/Review/List/index.js b/src/pages/Container/BranchCompany/Qualification/Review/List/index.js index b2057e5..f5700fa 100644 --- a/src/pages/Container/BranchCompany/Qualification/Review/List/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Review/List/index.js @@ -37,46 +37,46 @@ function List(props) { { title: "资质类别", dataIndex: "qualificationsTypeName" }, { title: "资质等级", dataIndex: "stakeholderLevelName" }, { title: "材料数", dataIndex: "materialNum" }, - { - title: "资质状态", - dataIndex: "qualificationsStatus", - render: (_, record) => ( -
- {record.qualificationsStatus === 0 && "正常"} - {record.qualificationsStatus === 1 && "待完善"} - {record.qualificationsStatus === 2 && ( - - {record.expireList.map((item, index) => ( -
- {item.dataName} - {" "} - 已于 - {item.qualificationsTermEnd} - {" "} - 过期 -
- ))} -
- ) - : "部分资料已过期" - } - > - - 存在异常 - {" "} - - - - )} - {(record.qualificationsStatus === 3 || record.qualificationsStatus === 4) && "资质过期"} - - ), - }, + // { + // title: "资质状态", + // dataIndex: "qualificationsStatus", + // render: (_, record) => ( + //
+ // {record.qualificationsStatus === 0 && "正常"} + // {record.qualificationsStatus === 1 && "待完善"} + // {record.qualificationsStatus === 2 && ( + // + // {record.expireList.map((item, index) => ( + //
+ // {item.dataName} + // {" "} + // 已于 + // {item.qualificationsTermEnd} + // {" "} + // 过期 + //
+ // ))} + //
+ // ) + // : "部分资料已过期" + // } + // > + // + // 存在异常 + // {" "} + // + // + // + // )} + // {(record.qualificationsStatus === 3 || record.qualificationsStatus === 4) && "资质过期"} + // + // ), + // }, { title: "操作", fixed: "right", diff --git a/src/pages/Container/Supervision/Qualification/Records/List/index.js b/src/pages/Container/Supervision/Qualification/Records/List/index.js index 30050f2..0dcf541 100644 --- a/src/pages/Container/Supervision/Qualification/Records/List/index.js +++ b/src/pages/Container/Supervision/Qualification/Records/List/index.js @@ -6,7 +6,6 @@ import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DictionarySelect from "zy-react-library/components/Select/Dictionary"; 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 { NS_QUALIFICATION_RECORDS } from "~/enumerate/namespace"; @@ -35,16 +34,16 @@ function List(props) { render: (), }, { name: "stakeholderLevel", label: "资质等级", render: () }, - { - name: "auditStatus", - label: "审核状态", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: [ - { bianma: "200-200", name: "主管部门审核中" }, - { bianma: "200-300", name: "主管部门已驳回" }, - { bianma: "400", name: "已完成" }, - ], - }, + // { + // name: "auditStatus", + // label: "审核状态", + // render: FORM_ITEM_RENDER_ENUM.SELECT, + // items: [ + // { bianma: "200-200", name: "主管部门审核中" }, + // { bianma: "200-300", name: "主管部门已驳回" }, + // { bianma: "400", name: "已完成" }, + // ], + // }, ]} form={form} onFinish={getData} diff --git a/src/pages/Container/Supervision/Qualification/Review/List/index.js b/src/pages/Container/Supervision/Qualification/Review/List/index.js index b468679..23ada7f 100644 --- a/src/pages/Container/Supervision/Qualification/Review/List/index.js +++ b/src/pages/Container/Supervision/Qualification/Review/List/index.js @@ -42,46 +42,46 @@ function List(props) { { title: "资质类别", dataIndex: "qualificationsTypeName" }, { title: "资质等级", dataIndex: "stakeholderLevelName" }, { title: "材料数", dataIndex: "materialNum" }, - { - title: "资质状态", - dataIndex: "qualificationsStatus", - render: (_, record) => ( -
- {record.qualificationsStatus === 0 && "正常"} - {record.qualificationsStatus === 1 && "待完善"} - {record.qualificationsStatus === 2 && ( - - {record.expireList.map((item, index) => ( -
- {item.dataName} - {" "} - 已于 - {item.qualificationsTermEnd} - {" "} - 过期 -
- ))} -
- ) - : "部分资料已过期" - } - > - - 存在异常 - {" "} - - - - )} - {(record.qualificationsStatus === 3 || record.qualificationsStatus === 4) && "资质过期"} - - ), - }, + // { + // title: "资质状态", + // dataIndex: "qualificationsStatus", + // render: (_, record) => ( + //
+ // {record.qualificationsStatus === 0 && "正常"} + // {record.qualificationsStatus === 1 && "待完善"} + // {record.qualificationsStatus === 2 && ( + // + // {record.expireList.map((item, index) => ( + //
+ // {item.dataName} + // {" "} + // 已于 + // {item.qualificationsTermEnd} + // {" "} + // 过期 + //
+ // ))} + //
+ // ) + // : "部分资料已过期" + // } + // > + // + // 存在异常 + // {" "} + // + // + // + // )} + // {(record.qualificationsStatus === 3 || record.qualificationsStatus === 4) && "资质过期"} + // + // ), + // }, { title: "操作", fixed: "right",