From 3aefacff9565a22655ae6647c34b169233cb09d1 Mon Sep 17 00:00:00 2001 From: tangjie <122778500@qq.com> Date: Tue, 7 Jul 2026 14:32:37 +0800 Subject: [PATCH] feat --- .../EnterpriseInfo/QualificationCert/index.js | 8 +- .../EnterpriseInfo/ResignationApply/index.js | 35 +------ .../components/OrgPersonnelSelectModal.jsx | 4 +- .../FilingForm/components/PersonnelStep.jsx | 3 +- .../QualApplication/FilingForm/index.js | 93 +++++++++---------- 5 files changed, 53 insertions(+), 90 deletions(-) diff --git a/src/pages/Container/EnterpriseInfo/QualificationCert/index.js b/src/pages/Container/EnterpriseInfo/QualificationCert/index.js index 6bffe2c..4d090dc 100644 --- a/src/pages/Container/EnterpriseInfo/QualificationCert/index.js +++ b/src/pages/Container/EnterpriseInfo/QualificationCert/index.js @@ -113,7 +113,7 @@ function QualificationCertPage(props) { cancelText: "否", onOk: async () => { const action = enabled ? props.orgQualificationCertDisable : props.orgQualificationCertEnable; - const res = await action({ id: record.id }); + const res = await action({ data: record.id }); if (res?.success !== false) { message.success("操作成功"); await getData(); @@ -234,15 +234,13 @@ function QualificationCertPage(props) { - + ), }, ]} dataSource={dataSource} - scroll={{ y: props.scrollY }} + scroll={{ y: props.scrollY , x: 1400}} loading={loading} pagination={{ total, diff --git a/src/pages/Container/EnterpriseInfo/ResignationApply/index.js b/src/pages/Container/EnterpriseInfo/ResignationApply/index.js index edfbbc5..ed7e681 100644 --- a/src/pages/Container/EnterpriseInfo/ResignationApply/index.js +++ b/src/pages/Container/EnterpriseInfo/ResignationApply/index.js @@ -10,10 +10,9 @@ import { Select, Table, Tag, - Upload, } from "antd"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; -import { UploadOutlined } from "@ant-design/icons"; +import AttachmentUpload from "~/components/AttachmentUpload"; import { useEffect, useState } from "react"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; @@ -212,7 +211,6 @@ function ResignationApplyPage(props) { function AddModal({ open, staffOptions, requestAdd, onCancel, onSuccess }) { const [form] = Form.useForm(); const [submitting, setSubmitting] = useState(false); - const [uploading, setUploading] = useState(false); const handleCancel = () => { form.resetFields(); @@ -228,6 +226,7 @@ function AddModal({ open, staffOptions, requestAdd, onCancel, onSuccess }) { values.expectedResignDate = values.expectedResignDate?.format?.("YYYY-MM-DD") || values.expectedResignDate; + values.reportFileUrl = values.reportFileUrl?.map?.((f) => f.url).filter(Boolean).join(",") || undefined; const res = await requestAdd(values); if (res?.success !== false) { message.success("提交成功"); @@ -290,35 +289,7 @@ function AddModal({ open, staffOptions, requestAdd, onCancel, onSuccess }) { - - { - if (info.file.status === "uploading") { - setUploading(true); - } else { - setUploading(false); - if (info.file.status === "done") { - const data = info.file.response?.data; - if (data) { - form.setFieldsValue({ reportFileUrl: data.url || data }); - } - } - } - }} - > - - - + ); diff --git a/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx b/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx index 9d82e49..c784488 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx @@ -93,8 +93,8 @@ function OrgPersonnelSelectModalInner(props) { onChange: (page, pageSize) => getData(page, pageSize), }} columns={[ - { title: "人员姓名", dataIndex: "staffName" }, - { title: "类型", dataIndex: "personType" }, + { title: "人员姓名", dataIndex: "userName" }, + { title: "类型", dataIndex: "personTypeName" }, { title: "职务", dataIndex: "positionName" }, { title: "职称", dataIndex: "titleName" }, { diff --git a/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx b/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx index 4e03f3a..2724f10 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx @@ -14,6 +14,7 @@ export default function PersonnelStep({ const [viewId, setViewId] = useState(""); const existingIds = personnelList.map((item) => String(item.sourcePersonnelId || "")); + console.log(personnelList); return ( <> @@ -35,7 +36,7 @@ export default function PersonnelStep({ dataSource={personnelList} columns={[ { title: "序号", width: 60, render: (_, __, index) => index + 1 }, - { title: "人员姓名", dataIndex: "personName" }, + { title: "人员姓名", dataIndex: "userName" }, { title: "类型", dataIndex: "personTypeName" }, { title: "职务", dataIndex: "positionName" }, { title: "职称", dataIndex: "titleName" }, diff --git a/src/pages/Container/QualApplication/FilingForm/index.js b/src/pages/Container/QualApplication/FilingForm/index.js index b6a1f7c..b151dc2 100644 --- a/src/pages/Container/QualApplication/FilingForm/index.js +++ b/src/pages/Container/QualApplication/FilingForm/index.js @@ -49,8 +49,6 @@ function FilingFormPage(props) { const detailRef = useRef(null); const readOnly = query.readOnly; - - const saveActionHint = mode === FILING_FORM_MODE.FILED ? "请点击提交后保存" @@ -74,7 +72,7 @@ function FilingFormPage(props) { loadPersonnelOptions(); if (query.id) { let aciotn = () => {}; - + if (mode === FILING_FORM_MODE.CHANGE) { aciotn = fetchQualChangeDetail; } else { @@ -138,7 +136,7 @@ function FilingFormPage(props) { setSubmitting(true); const currentDetail = collectCurrentDetail(); - const word= mode === "change" ? "Change" : ""; + const word = mode === "change" ? "Change" : ""; const body = { [`qualFiling${word}AddCmd`]: { ...currentDetail, @@ -146,7 +144,7 @@ function FilingFormPage(props) { applyTypeCode: mode === "application" ? 1 : 3, }, }; - + const params = body[`qualFiling${word}AddCmd`]; if (params.materials) { body[`qualFilingMaterial${word}AddCmds`] = params.materials; @@ -164,10 +162,10 @@ function FilingFormPage(props) { body[`qualFilingCommitment${word}AddCmd`] = params.commitment; delete params.commitment; } - - let action=props.submitQualFiling; + + let action = props.submitQualFiling; if (mode === FILING_FORM_MODE.CHANGE) { - action=props.submitQualFilingChange; + action = props.submitQualFilingChange; } const result = await action(body); @@ -175,7 +173,7 @@ function FilingFormPage(props) { setVerifyOpen(false); message.success(config.isSaveDraft ? "暂存成功" : "提交成功"); props.history.goBack(); - } + } setSubmitting(false); }; @@ -213,9 +211,7 @@ function FilingFormPage(props) { const rowMap = new Map((rows || []).map((row) => [String(row.id), row])); const newRows = idsToAdd.map((id) => { const row = rowMap.get(String(id)); - return row - ? mapStaffRowToFilingPersonnel(row) - : mapStaffRowToFilingPersonnel({ id }); + return row; }); setDetail((prev) => ({ ...prev, @@ -227,7 +223,7 @@ function FilingFormPage(props) { const handlePersonnelRemove = (record) => { Modal.confirm({ title: "提示", - content: `确认删除人员「${record.personName}」？`, + content: `确认删除人员「${record.userName}」？`, onOk: () => { setDetail((prev) => ({ ...prev, @@ -354,7 +350,6 @@ function FilingFormPage(props) { title={MODE_TITLE[mode] || "资质备案表单"} history={props.history} previous - > - - - {stepIndex > 0 && ( - - )} - {!isLastStep && ( - - )} - {!readOnly && isLastStep && ( - <> - {mode !== FILING_FORM_MODE.FILED && ( - - )} - + )} + {!isLastStep && ( + + )} + {!readOnly && isLastStep && ( + <> + {mode !== FILING_FORM_MODE.FILED && ( + - - )} - - + )} + + + )} +