From 93862a99036f82c266af1723f6cdbcc3e088ff49 Mon Sep 17 00:00:00 2001 From: tangjie <122778500@qq.com> Date: Wed, 15 Jul 2026 17:41:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QualApplication/FiledManage/List/index.js | 54 +------------- .../FilingApplication/List/index.js | 1 + .../FilingChange/List/index.js | 22 ++---- .../FilingForm/components/EquipmentStep.jsx | 16 ++-- .../QualApplication/FilingListTable.jsx | 73 ++++++++++++++++++- 5 files changed, 91 insertions(+), 75 deletions(-) diff --git a/src/pages/Container/QualApplication/FiledManage/List/index.js b/src/pages/Container/QualApplication/FiledManage/List/index.js index a8e26e5..0050301 100644 --- a/src/pages/Container/QualApplication/FiledManage/List/index.js +++ b/src/pages/Container/QualApplication/FiledManage/List/index.js @@ -11,8 +11,7 @@ import FilingListTable from "../../FilingListTable"; const { router } = tools; function FiledManageListPage(props) { - const { qualFiling } = props; - const {qualFilingLoading}= qualFiling; + const [searchForm] = Form.useForm(); const [loading, setLoading] = useState(false); const [dataSource, setDataSource] = useState([]); @@ -58,32 +57,10 @@ function FiledManageListPage(props) { props.history.push(`/container/qualApplication/filingForm?mode=${FILING_FORM_MODE.FILED}`); }; - const [reviewModalOpen, setReviewModalOpen] = useState(false); - const [reviewList, setReviewList] = useState([]); - const handleShowReview = async (record) => { - setReviewModalOpen(true); - setReviewList([]); - try { - const res = await props.qualFilingReviewGet({ filingId: record.filingId || record.id, current: 1, size: 999 }); - setReviewList(res?.data || []); - } catch { - setReviewList([]); - } - }; - const handleCloseReview = () => { - setReviewModalOpen(false); - setReviewList([]); - }; - const REVIEW_RESULT_MAP = { 1: "通过", 2: "待定", 3: "不通过" }; - const reviewColumns = [ - { title: "审核结果", dataIndex: "reviewResult", width: 100, render: (v) => REVIEW_RESULT_MAP[v] || v || "-" }, - { title: "审核结果说明", dataIndex: "reviewResultRemark", ellipsis: true }, - { title: "审核专家", dataIndex: "filingExpertName", width: 120 }, - { title: "综合审核意见", dataIndex: "reviewOpinion", ellipsis: true }, - ]; + return ( <> @@ -102,32 +79,9 @@ function FiledManageListPage(props) { onSearch={handleSearch} onPageChange={handlePageChange} onCreate={handleCreate} - extraActions={(record) => - Number(record.filingStatusCode) === 3 - ? - : null - } + {...props} /> - - {reviewList.length ? ( - - ) : !qualFilingLoading ? : null} - + ); } diff --git a/src/pages/Container/QualApplication/FilingApplication/List/index.js b/src/pages/Container/QualApplication/FilingApplication/List/index.js index 470ad87..8b307f2 100644 --- a/src/pages/Container/QualApplication/FilingApplication/List/index.js +++ b/src/pages/Container/QualApplication/FilingApplication/List/index.js @@ -99,6 +99,7 @@ function FilingApplicationListPage(props) { onPageChange={handlePageChange} onCreate={handleCreate} onDelete={handleDelete} + {...props} /> ); } diff --git a/src/pages/Container/QualApplication/FilingChange/List/index.js b/src/pages/Container/QualApplication/FilingChange/List/index.js index f169b4d..d603078 100644 --- a/src/pages/Container/QualApplication/FilingChange/List/index.js +++ b/src/pages/Container/QualApplication/FilingChange/List/index.js @@ -17,7 +17,7 @@ const { router } = tools; function FilingChangeListPage(props) { const [searchForm] = Form.useForm(); const [historyRecord, setHistoryRecord] = useState(null); - + const [loading, setLoading] = useState(false); const [dataSource, setDataSource] = useState([]); const [total, setTotal] = useState(0); @@ -48,7 +48,6 @@ function FilingChangeListPage(props) { }, []); const handleSearch = (values) => { - router.query = { ...values, current: 1, size: 10 }; getData(); }; @@ -62,23 +61,11 @@ function FilingChangeListPage(props) { getData(pagination); }; - const handleStartChange = async (record) => { - - try { - - props.history.push(`/container/qualApplication/filingForm?mode=change&id=${record.id}`); - - } finally { - - } - }; - return ( <> setHistoryRecord(record)} - + {...props} /> ( - {record.calibrationReportUrl ? ( + {record.calibrationReportUrl && ( - ) : ( - !disabled && ( + )} + {!disabled && ( onUploadCalibration?.(record, data)} - buttonProps={{ children: "上传报告" }} - /> - ) - )} + > + {record.calibrationReportUrl ? "重新上传" : "上传报告"} + + )} ), }, diff --git a/src/pages/Container/QualApplication/FilingListTable.jsx b/src/pages/Container/QualApplication/FilingListTable.jsx index 10a7d93..5168d30 100644 --- a/src/pages/Container/QualApplication/FilingListTable.jsx +++ b/src/pages/Container/QualApplication/FilingListTable.jsx @@ -1,7 +1,8 @@ -import { Button, Form, Tag, Table, Typography, Select } from "antd"; +import { Button, Form, Tag, Table, Typography, Select, Modal, Empty } from "antd"; import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; +import { useState } from "react"; import { CHONGQING_DISTRICTS, QUALIFICATION_INDUSTRY_OPTIONS_MAP, @@ -34,9 +35,13 @@ export default function FilingListTable({ onDelete, extraActions, history, + qualFiling, + qualFilingReviewGet, }) { const statusOptions = getFilingStatusOptions(mode); + const { qualFilingLoading } = qualFiling; + const canEditRow = (record) => { if (mode === FILING_FORM_MODE.CHANGE) { return [1, 3, 5].includes(record.filingStatusCode); @@ -44,6 +49,41 @@ export default function FilingListTable({ return [3, 5].includes(record.filingStatusCode); }; + const [reviewModalOpen, setReviewModalOpen] = useState(false); + const [reviewList, setReviewList] = useState([]); + const REVIEW_RESULT_MAP = { 1: "通过", 2: "待定", 3: "不通过" }; + const reviewColumns = [ + { + title: "审核结果", + dataIndex: "reviewResult", + width: 100, + render: (v) => REVIEW_RESULT_MAP[v] || v || "-", + }, + { title: "审核结果说明", dataIndex: "reviewResultRemark", ellipsis: true }, + { title: "审核专家", dataIndex: "filingExpertName", width: 120 }, + { title: "综合审核意见", dataIndex: "reviewOpinion", ellipsis: true }, + ]; + + const handleShowReview = async (record) => { + setReviewModalOpen(true); + setReviewList([]); + try { + const res = await qualFilingReviewGet({ + filingId: record.filingId || record.id, + current: 1, + size: 999, + }); + setReviewList(res?.data || []); + } catch { + setReviewList([]); + } + }; + + const handleCloseReview = () => { + setReviewModalOpen(false); + setReviewList([]); + }; + const columns = [ { title: "备案属地", @@ -122,6 +162,15 @@ export default function FilingListTable({ 查看 {extraActions?.(record)} + {Number(record.filingStatusCode) === 3 ? ( + + ) : null} {canEditRow(record) && (
+ ) : !qualFilingLoading ? ( + + ) : null} + ); }