diff --git a/src/api/qualificationStatistics/index.js b/src/api/qualificationStatistics/index.js index 89199b9..058aae6 100644 --- a/src/api/qualificationStatistics/index.js +++ b/src/api/qualificationStatistics/index.js @@ -98,3 +98,8 @@ export const trainingUserListPage = declareRequest( "qualificationStatisticsLoading", `Post > @/edu/trainingUser/listEduUserPage`, ); + +export const keyProjectAdd = declareRequest( + "qualificationStatisticsLoading", + "Post > @/keyProject/keyProject/save", +); diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js index 029e31e..8d70752 100644 --- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js @@ -50,6 +50,9 @@ function Add(props) { data.maintain = data.maintain && data.maintain.split(",") data.detection = data.detection && data.detection.split(",") data.otherHighRisk = data.otherHighRisk && data.otherHighRisk.split(",") + data.detectionName = data.detectionName && data.detectionName.split(",") + data.maintainName = data.maintainName && data.maintainName.split(",") + data.otherHighRiskName = data.otherHighRiskName && data.otherHighRiskName.split(",") // 重新提交时,删除id if (query.resubmit) { @@ -152,6 +155,7 @@ const StepOneComponent = (props) => { useEffect(() => { getCorpInfoList(1, 0); + form.setFieldsValue(props.formValues); }, []); @@ -304,7 +308,7 @@ const StepOneComponent = (props) => { { name: "maintain", - label: "维修、保养", + label: "维修、保养(多选)", hidden:qualificationsTypeId !=="sbl", required:false, render: ( @@ -321,7 +325,7 @@ const StepOneComponent = (props) => { { name: "maintainName", label: "维修、保养名称", onlyForLabel: true }, { name: "detection", - label: "检测", + label: "检测(多选)", hidden:qualificationsTypeId !=="sbl", required:false, render: ( @@ -337,7 +341,7 @@ const StepOneComponent = (props) => { { name: "detectionName", label: "检测名称", onlyForLabel: true }, { name: "otherHighRisk", - label: "其它高风险业务", + label: "其它高风险业务(多选)", required:false, hidden:qualificationsTypeId !=="sbl", render: ( @@ -447,9 +451,11 @@ const StepTwoComponent = forwardRef((props, ref) => { const validateFileList = (list) => { for (let i = 0; i < list.length; i++) { - if (!list[i].files || list[i].files.length === 0) { - message.error(`请上传${list[i].dataName}的资质`); - return false; + if(list[i].isRequired == null || list[i].isRequired === 1) { + if (!list[i].files || list[i].files.length === 0) { + message.error(`请上传${list[i].dataName}的资质`); + return false; + } } } return true; @@ -523,6 +529,10 @@ const StepTwoComponent = forwardRef((props, ref) => { dataIndex: "qualificationsTermStart", render: (_, record) => record.qualificationsTermStart ? `${record.qualificationsTermStart}至${record.qualificationsTermEnd}` : "-", }, + { title: "是否必填", dataIndex: "isRequired", render: (_, record) => { + if (record.isRequired == null) return "必填"; + return record.isRequired ? "必填" : "非必填"; + } }, { title: "操作", width: 150, diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/View/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/View/index.js index f341b7b..888ff2a 100644 --- a/src/pages/Container/BranchCompany/Qualification/Apply/View/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Apply/View/index.js @@ -104,6 +104,7 @@ function View(props) { render: (_, record) => (