From 0e90bdb8ea6ef5733989f6846a06b40ee9175ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=99=AF=E5=AD=A6?= <5412262+sun_jing_xue@user.noreply.gitee.com> Date: Mon, 11 Aug 2025 14:22:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=8A=B6=E6=80=81=E4=B8=8E?= =?UTF-8?q?=20=E4=BE=9B=E5=BA=94=E5=95=86=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommonSelect/AccessStatusSelect.tsx | 18 ++++++++++----- .../admission/admissionManagement/index.tsx | 22 ++++++++++++++++--- .../admissionReviewManagement/index.tsx | 20 +++++++++++++---- .../components/CategoryAddModal.tsx | 4 ++-- .../category/SupplierEntryManage/index.tsx | 4 ++-- 5 files changed, 51 insertions(+), 17 deletions(-) diff --git a/src/components/CommonSelect/AccessStatusSelect.tsx b/src/components/CommonSelect/AccessStatusSelect.tsx index 1ec9730..8975a0a 100644 --- a/src/components/CommonSelect/AccessStatusSelect.tsx +++ b/src/components/CommonSelect/AccessStatusSelect.tsx @@ -1,6 +1,7 @@ import React, { useEffect, useState } from 'react'; import { Select } from 'antd'; - +//字典 +import { getDictList } from '@/servers/api/dicts' interface Option { label: string; value: string; @@ -9,11 +10,16 @@ interface Option { const AdmissionTypeSelect: React.FC = (props) => { const [options, setOptions] = useState([]); useEffect(() => { - setOptions([ - { label: '未准入', value: '0' }, - { label: '已准入', value: '1' }, - { label: '退出', value: '2' }, - ]); + getDictList('approve_type').then((res) => { + if (res.code == 200) { + let option: Option[] = [] + res.data.forEach((item: { code: string, dicName: string }) => { + option.push({ label: item.dicName, value: item.code }) + }); + setOptions(option); + } + }) + }, []); return ( diff --git a/src/pages/supplier/admission/admissionManagement/index.tsx b/src/pages/supplier/admission/admissionManagement/index.tsx index 738205b..7a1ceae 100644 --- a/src/pages/supplier/admission/admissionManagement/index.tsx +++ b/src/pages/supplier/admission/admissionManagement/index.tsx @@ -16,7 +16,8 @@ import AccessDepartmentSelect from "@/components/AccessDepartmentSelect" import { getPage, startApprove, supplierChangeApprove } from './services' //统一列表分页 import tableProps from '@/utils/tableProps' - +//字典 +import { getDictList } from '@/servers/api/dicts' interface Data { id: string; deptId: string; @@ -29,6 +30,9 @@ interface Data { const AccessManagement: React.FC = () => { // const userId = sessionStorage.getItem('userId') || ''; + + const [approveTypeMap, setApproveTypeMap] = useState<{ [code: string]: string }>({}); + // 查询 const [form] = Form.useForm(); //列表渲染数据 @@ -56,6 +60,17 @@ const AccessManagement: React.FC = () => { useEffect(() => { const values = form.getFieldsValue(); getList(values, 1, 10); + + getDictList('approve_type').then((res) => { + if (res.code == 200) { + const map: { [code: string]: string } = {}; + res.data.forEach((item: { code: string, dicName: string }) => { + map[item.code] = item.dicName; + }); + setApproveTypeMap(map); + } + }) + }, []); //开启弹窗 const openModal = (type: string, record?: any) => { @@ -108,9 +123,10 @@ const AccessManagement: React.FC = () => { }, { title: '审批状态', - dataIndex: 'approveStatusText', - key: 'approveStatusText', + dataIndex: 'approveStatus', + key: 'approveStatus', width: 120, + render: (code: string) => approveTypeMap[code] || code }, { title: '操作', diff --git a/src/pages/supplier/admission/admissionReviewManagement/index.tsx b/src/pages/supplier/admission/admissionReviewManagement/index.tsx index 6433964..95298f6 100644 --- a/src/pages/supplier/admission/admissionReviewManagement/index.tsx +++ b/src/pages/supplier/admission/admissionReviewManagement/index.tsx @@ -11,7 +11,8 @@ import GroupLeaderModal from './components/GroupLeaderModal'; import ViewModal from './components/ViewModal'; //统一列表分页 import tableProps from '@/utils/tableProps' - +//字典 +import { getDictList } from '@/servers/api/dicts' interface Data { deptName: string; categoryName: string; @@ -35,7 +36,7 @@ const CooperateEnterprise: React.FC = () => { const [loading, setLoading] = useState(false); const [pagination, setPagination] = useState({ current: 1, pageSize: 10, total: 0 }); const [modalInfo, setModalInfo] = useState({ type: null, visible: false, record: null, view: false }); - + const [approveTypeMap, setApproveTypeMap] = useState<{ [code: string]: string }>({}); const openModal = (type: 'teamMembers' | 'groupLeader' | 'view', record: Data, view = false) => { setModalInfo({ type, visible: true, record, view }); }; @@ -79,7 +80,17 @@ const CooperateEnterprise: React.FC = () => { }; useEffect(() => { + getDictList('approve_type').then((res) => { + if (res.code == 200) { + const map: { [code: string]: string } = {}; + res.data.forEach((item: { code: string, dicName: string }) => { + map[item.code] = item.dicName; + }); + setApproveTypeMap(map); + } + }) getList({ pageNo: 1, pageSize: 10 }); + }, []); const columns: ColumnsType = [ @@ -156,9 +167,10 @@ const CooperateEnterprise: React.FC = () => { }, { title: '审批状态', - dataIndex: 'approveStatusText', - key: 'approveStatusText', + dataIndex: 'approveStatus', + key: 'approveStatus', width: 120, + render: (code: string) => approveTypeMap[code] || code }, { title: '操作', diff --git a/src/pages/supplier/category/CategoryLibraryManage/components/CategoryAddModal.tsx b/src/pages/supplier/category/CategoryLibraryManage/components/CategoryAddModal.tsx index 7ceb792..89c4705 100644 --- a/src/pages/supplier/category/CategoryLibraryManage/components/CategoryAddModal.tsx +++ b/src/pages/supplier/category/CategoryLibraryManage/components/CategoryAddModal.tsx @@ -152,9 +152,9 @@ const CategoryAddModal: React.FC = ({ visible, onCancel, onSuccess }) => - + diff --git a/src/pages/supplier/category/SupplierEntryManage/index.tsx b/src/pages/supplier/category/SupplierEntryManage/index.tsx index 306e34e..e647fc3 100644 --- a/src/pages/supplier/category/SupplierEntryManage/index.tsx +++ b/src/pages/supplier/category/SupplierEntryManage/index.tsx @@ -153,7 +153,7 @@ const SupplierEntryManage: React.FC = () => { align: 'center', render: (record: any) => ( <> - {record.approveStatus === 1 && ( + {record.approveStatus === 2 && ( { setCurrentStoreId(record.id); @@ -163,7 +163,7 @@ const SupplierEntryManage: React.FC = () => { 添加供应商 )} - {record.approveStatus !== 1 && ( + {record.approveStatus !== 2 && ( 添加供应商