diff --git a/package.json b/package.json index ad2d6c0..d48d1ff 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-to-print": "^3.2.0", - "zy-react-library": "^1.1.34" + "zy-react-library": "^1.1.36" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js b/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js index 322b647..bc4cccf 100644 --- a/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js @@ -200,7 +200,7 @@ function Add(props) { }; // 保存隐患 - const handleHiddenSubmit = async (traceId, isDraft, index) => { + const handleHiddenSubmit = async (traceId, isDraft, index, corpId) => { await deleteFile({ single: false, files: hiddenList[index].deleteHiddenImageFiles, @@ -230,7 +230,7 @@ function Add(props) { }); if (hiddenList[index].hiddenPartType === "input") { - const { data } = await props["partAdd"]({hiddenregion: hiddenList[index].hiddenPart}); + const {data} = await props["partAdd"]({hiddenregion: hiddenList[index].hiddenPart}); hiddenList[index].hiddenPart = data } @@ -245,6 +245,8 @@ function Add(props) { hiddenId: id, state: isDraft === 0 ? 102 : 98, foreignKey: traceId, + corpId: corpId, + tenantId: corpId, hiddenJson: JSON.stringify({ confirm: 1, rectify: 1, @@ -258,7 +260,7 @@ function Add(props) { }; // 处理隐患数据 - const handleHiddenData = async (traceId, isDraft) => { + const handleHiddenData = async (traceId, isDraft, corpId) => { // 删除隐患 if (deleteHiddenIds.current.length > 0) { props["hiddenDelete"]({ids: deleteHiddenIds.current.join(",")}); @@ -281,7 +283,7 @@ function Add(props) { // 新增/更新隐患 for (let i = 0; i < hiddenList.length; i++) { - await handleHiddenSubmit(traceId, isDraft, i); + await handleHiddenSubmit(traceId, isDraft, i, corpId); } }; @@ -301,8 +303,8 @@ function Add(props) { // 提交主表单数据 const {traceId} = await submitInspectionData(values, situationList, inspectorList, signatureResult, isDraft); - // 处理隐患数据 - await handleHiddenData(traceId, isDraft); + // 处理隐患数据 {name: ["personUnderInspection", "corpId"], label: "被检查单位现场负责人企业id", onlyForLabel: true}, + await handleHiddenData(traceId, isDraft, values.personUnderInspection?.corpId); message.success("操作成功"); props.history.goBack(); @@ -377,6 +379,9 @@ function Add(props) { form.setFieldValue(["personUnderInspection", "userName"], ""); form.setFieldValue(["personUnderInspection", "corpId"], ""); form.setFieldValue(["personUnderInspection", "corpName"], ""); + + deleteHiddenIds.current.push(...hiddenList.map(item => item.id).filter(Boolean)) + setHiddenList([]) }} /> ), @@ -390,8 +395,8 @@ function Add(props) { params={{departmentId: personUnderInspectionDepartmentId}} onGetLabel={label => form.setFieldValue(["personUnderInspection", "userName"], label)} onGetOption={(option) => { - form.setFieldValue(["personUnderInspection", "corpId"], option.corpId); - form.setFieldValue(["personUnderInspection", "corpName"], option.corpName); + form.setFieldValue(["personUnderInspection", "corpId"], option.corpinfoId); + form.setFieldValue(["personUnderInspection", "corpName"], option.corpinfoName); }} /> ), @@ -517,6 +522,10 @@ function Add(props) {