From c9154512159b11740467301d7aea7b3d2ec49771 Mon Sep 17 00:00:00 2001 From: "853931625@qq.com" Date: Wed, 27 May 2026 08:45:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompositeManage/HiddenList/index.js | 2 +- .../EvaluationManage/HiddenList/index.js | 2 +- .../Qualification/Apply/View/index.js | 3 ++ .../CompositeManage/HiddenList/index.js | 50 +++++++++---------- .../Qualification/Maintenance/Add/index.js | 48 ++++++++++++++++++ .../Qualification/ViewInfo/index.js | 5 +- 6 files changed, 80 insertions(+), 30 deletions(-) diff --git a/src/pages/Container/BranchCompany/EvaluationManage/CompositeManage/HiddenList/index.js b/src/pages/Container/BranchCompany/EvaluationManage/CompositeManage/HiddenList/index.js index 02cbc9f..75ace18 100644 --- a/src/pages/Container/BranchCompany/EvaluationManage/CompositeManage/HiddenList/index.js +++ b/src/pages/Container/BranchCompany/EvaluationManage/CompositeManage/HiddenList/index.js @@ -1,7 +1,7 @@ import ListPage from "~/pages/Container/Supervision/EvaluationManage/CompositeManage/HiddenList"; function HiddenList(props) { - return ; + return ; } export default HiddenList; diff --git a/src/pages/Container/BranchCompany/EvaluationManage/EvaluationManage/HiddenList/index.js b/src/pages/Container/BranchCompany/EvaluationManage/EvaluationManage/HiddenList/index.js index 02cbc9f..2063356 100644 --- a/src/pages/Container/BranchCompany/EvaluationManage/EvaluationManage/HiddenList/index.js +++ b/src/pages/Container/BranchCompany/EvaluationManage/EvaluationManage/HiddenList/index.js @@ -1,7 +1,7 @@ import ListPage from "~/pages/Container/Supervision/EvaluationManage/CompositeManage/HiddenList"; function HiddenList(props) { - return ; + return ; } export default HiddenList; diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/View/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/View/index.js index 44ad004..74a6aac 100644 --- a/src/pages/Container/BranchCompany/Qualification/Apply/View/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Apply/View/index.js @@ -70,6 +70,9 @@ function View(props) { ] : []), { label: "资质名称", children: info.qualificationsName }, + { label: "维修、保养", children: info.maintainName }, + { label: "检测", children: info.detectionName }, + { label: "其它高风险业务", children: info.otherHighRiskName }, { label: "备注", children: info.remarks }, ]} /> diff --git a/src/pages/Container/Supervision/EvaluationManage/CompositeManage/HiddenList/index.js b/src/pages/Container/Supervision/EvaluationManage/CompositeManage/HiddenList/index.js index da23d7b..6eaaa46 100644 --- a/src/pages/Container/Supervision/EvaluationManage/CompositeManage/HiddenList/index.js +++ b/src/pages/Container/Supervision/EvaluationManage/CompositeManage/HiddenList/index.js @@ -38,15 +38,11 @@ function List(props) { }, - { - name: "hiddenType", - label: "隐患类型", - render: , - }, + { name: "hiddenFindDept", label: "隐患发现部门", render: }, + { name: "hiddenLevel", label: "隐患级别", @@ -65,17 +61,17 @@ function List(props) { { name: "rectificationUserName", label: "整改人" }, { name: "rectificationDeptId", label: "整改部门", render: }, { name: "checkUserName", label: "验收人" }, + // { + // name: "isRelated", + // label: "是否相关方", + // render: FORM_ITEM_RENDER_ENUM.SELECT, + // items: IS_RELATED_ENUM, + // }, + { - name: "isRelated", - label: "是否相关方", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: IS_RELATED_ENUM, - }, - { - name: "isAi", - label: "是否使用AI", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: [{ bianma: "1", name: "是" }, { bianma: "0", name: "否" }], + name: "hiddenType", + label: "隐患类型", + render: , }, ]} form={form} @@ -117,15 +113,15 @@ function List(props) { render: (_, record) => record.rectificationTime ? dayjs(record.rectificationTime).format("YYYY-MM-DD HH:mm:ss") : "", }, { title: "验收人", dataIndex: "hiddenYUserName", width: 100 }, - { - title: "是否相关方", - dataIndex: "isRelated", - width: 150, - render: (_, record) => getLabelName({ - list: IS_RELATED_ENUM, - status: record.isRelated, - }), - }, + // { + // title: "是否相关方", + // dataIndex: "isRelated", + // width: 150, + // render: (_, record) => getLabelName({ + // list: IS_RELATED_ENUM, + // status: record.isRelated, + // }), + // }, { title: "隐患状态", dataIndex: "state", diff --git a/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js b/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js index 9a3db4c..53dee30 100644 --- a/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js +++ b/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js @@ -172,7 +172,55 @@ function Add(props) { /> ), }, + { name: "managerUserName", label: "审核人名称", onlyForLabel: true }, + { + name: "maintain", + label: "维修、保养", + render: ( + { + form.setFieldValue("maintainName", label); + }} + /> + ), + + }, + { name: "maintainName", label: "维修、保养名称", onlyForLabel: true, componentProps: { disabled: query.id } }, + { + name: "detection", + label: "检测", + render: ( + { + form.setFieldValue("detectionName", label); + }} + /> + ), + }, + { name: "detectionName", label: "检测名称", onlyForLabel: true, componentProps: { disabled: query.id } }, + { + name: "otherHighRisk", + label: "其它高风险业务", + render: ( + { + form.setFieldValue("otherHighRiskName", label); + }} + /> + ), + }, + { name: "otherHighRiskName", label: "其它高风险业务名称", onlyForLabel: true, componentProps: { disabled: query.id } }, + { name: "shareDeptId", label: "股份主管部门", diff --git a/src/pages/Container/Supervision/Qualification/ViewInfo/index.js b/src/pages/Container/Supervision/Qualification/ViewInfo/index.js index 9e25621..a13e64e 100644 --- a/src/pages/Container/Supervision/Qualification/ViewInfo/index.js +++ b/src/pages/Container/Supervision/Qualification/ViewInfo/index.js @@ -92,7 +92,10 @@ function ViewInfo(props) { { label: "资质类别", children: info.qualificationsTypeName }, { label: "资质等级", children: info.stakeholderLevelName }, { label: "材料数", children: info.materialNum }, - { label: "备注", children: info.remarks }, + { label: "维修、保养", children: info.maintainName }, + { label: "检测", children: info.detectionName }, + { label: "其它高风险业务", children: info.otherHighRiskName,span:2 }, + { label: "备注", children: info.remarks ,span:2 }, ]} />