diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js index 53f5fb7..b7baa40 100644 --- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js @@ -22,6 +22,7 @@ import { NS_QUALIFICATION_APPLY, NS_QUALIFICATION_MAINTENANCE } from "~/enumerat function Add(props) { const query = useGetUrlQuery(); const [form] = Form.useForm(); + const qualificationsTypeId = Form.useWatch("qualificationsTypeId", form); const [currentStep, setCurrentStep] = useState(1); const [formValues, setFormValues] = useState({}); const [specialList, setSpecialList] = useState([]); @@ -44,6 +45,9 @@ function Add(props) { setSpecialList(data.specialList); }; + useEffect(()=>{ + console.log(qualificationsTypeId); + },[qualificationsTypeId]) useEffect(() => { query.id && getData(); }, []); @@ -274,6 +278,53 @@ const StepOneComponent = (props) => { items: qualificationsListAll, itemsField: { labelKey: "qualificationsName", valueKey: "id" }, }, + { + name: "maintain", + label: "维修、保养", + hidden:qualificationsTypeId !=="sbl", + render: ( + { + form.setFieldValue("maintainName", label); + }} + /> + ), + + }, + { name: "maintainName", label: "维修、保养名称", onlyForLabel: true }, + { + name: "detection", + label: "检测", + hidden:qualificationsTypeId !=="sbl", + render: ( + { + form.setFieldValue("detectionName", label); + }} + /> + ), + }, + { name: "detectionName", label: "检测名称", onlyForLabel: true }, + { + name: "otherHighRisk", + label: "其它高风险业务", + hidden:qualificationsTypeId !=="sbl", + render: ( + { + form.setFieldValue("otherHighRiskName", label); + }} + /> + ), + }, + { name: "otherHighRiskName", label: "其它高风险业务名称", onlyForLabel: true }, { name: "remarks", label: "备注", required: false, span: 24, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, ]} /> diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js index 47816d0..d5eabf0 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js @@ -50,6 +50,7 @@ function Add(props) { const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["156"], eqForeignKey: data.agreementFileUuid }); data.projectFiles = files; } + setFormValues(data); form.setFieldsValue(data); let projectUserAddCmdList = []; @@ -70,6 +71,7 @@ function Add(props) { } setProjectFileAddCmdList(data.projectFileAddCmdList); setUsercontentAddCmdList(projectUserAddCmdList); + console.log(projectUserAddCmdList); setProjectLocalCompanyAddCmdList(data.projectLocalCompanyAddCmdList); setProjectApprovalUserAddCmdList(data.projectApprovalUserAddCmdList); setProjectApprovalFlowAddCmdList(data.projectApprovalFlowAddCmdList); @@ -131,6 +133,7 @@ function Add(props) { {currentStep === 2 && ( { isNeedDepartmentId={false} onGetLabel={(label) => { form.setFieldValue("userName", label); + console.log(label); }} onGetOption={(option) => { if (option) { @@ -695,7 +699,7 @@ const StepTwoComponent = forwardRef((props, ref) => { const projectApprovalUserAddCmdList = props.projectApprovalUserAddCmdList || []; // 项目审核人员 const projectApprovalFlowAddCmdList = props.projectApprovalFlowAddCmdList || []; // 项目审核流程 const corpinfoId = props.corpinfoId; // 公司id - + console.log(usercontentList); const [uploadFileModalOpen, setUploadFileModalOpen] = useState(false); // 上传文件弹窗显示 const [usercontentOpen, setUsercontentOpen] = useState(false); // 选择项目审核人员弹窗显示 const [uploadFileModalData, setUploadFileModalData] = useState({ // 上传文件弹窗数据 diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js index 68e2c35..ccd72bb 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js @@ -306,6 +306,8 @@ function Review(props) { { label: "企业状态", children: (info.corpInfo?.corpStateName) ? info.corpInfo?.corpStateName : "-" }, { label: "开户人", children: info.corpInfo?.accountContactName }, { label: "统一社会信号代码", children: info.corpInfo?.code }, + { label: "开户银行", children: info.corpInfo?.depositBank }, + { label: "开户银行账号", children: info.corpInfo?.depositBankAccount }, { label: "属地", children: (info.corpInfo?.provinceName) ? `${info.corpInfo?.provinceName}/${info.corpInfo?.cityName}/${info.corpInfo?.countryName}` : "-" }, { label: "所属行业", children: [info.corpInfo?.corpType2Name, info.corpInfo?.corpType3Name, info.corpInfo?.corpType4Name, info.corpInfo?.corpTypeName].filter(Boolean).join("/") }, { label: "单位经营地址", children: info.corpInfo?.addressBusiness }, diff --git a/src/pages/Container/Supervision/EvaluationManage/CompositeManage/HiddenList/index.js b/src/pages/Container/Supervision/EvaluationManage/CompositeManage/HiddenList/index.js index 6eaaa46..b9b2b95 100644 --- a/src/pages/Container/Supervision/EvaluationManage/CompositeManage/HiddenList/index.js +++ b/src/pages/Container/Supervision/EvaluationManage/CompositeManage/HiddenList/index.js @@ -38,11 +38,15 @@ function List(props) { }, - + { + name: "hiddenType", + label: "隐患类型", + render: , + }, { name: "hiddenLevel", label: "隐患级别", @@ -59,20 +63,15 @@ function List(props) { }, { name: "confirmUserName", label: "确认人" }, { name: "rectificationUserName", label: "整改人" }, - { name: "rectificationDeptId", label: "整改部门", render: }, + { name: "rectificationDeptId", label: "整改部门", render: }, { name: "checkUserName", label: "验收人" }, - // { - // name: "isRelated", - // label: "是否相关方", - // render: FORM_ITEM_RENDER_ENUM.SELECT, - // items: IS_RELATED_ENUM, - // }, - { - name: "hiddenType", - label: "隐患类型", - render: , + name: "isAi", + label: "是否使用AI", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: [{ bianma: "1", name: "是" }, { bianma: "0", name: "否" }], }, + ]} form={form} onFinish={getData} diff --git a/src/pages/Container/Supervision/EvaluationManage/CompositeManage/ScoreList/index.js b/src/pages/Container/Supervision/EvaluationManage/CompositeManage/ScoreList/index.js index 1094439..40ae40a 100644 --- a/src/pages/Container/Supervision/EvaluationManage/CompositeManage/ScoreList/index.js +++ b/src/pages/Container/Supervision/EvaluationManage/CompositeManage/ScoreList/index.js @@ -26,7 +26,7 @@ function ScoreList(props) { }); return ( - +