From 47e0380be5f8a8a8c496dcd18a929908c7611d68 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: Wed, 16 Jul 2025 13:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=20?=
 =?UTF-8?q?=E5=87=86=E5=85=A5=E9=83=A8=E9=97=A8=E4=B8=8E=E8=AF=84=E5=AE=A1?=
 =?UTF-8?q?=E4=B8=93=E5=AE=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ApprovalStatusSelec/index.tsx  | 23 +++++++++++++++++++
 .../CommonSelect/AdmissionTypeSelect.tsx      | 21 +++++++++++++++++
 .../components/ViewModal.tsx                  |  5 ++--
 .../admission/SupplierCategoryEntry/index.tsx |  8 ++-----
 .../components/ViewModal.tsx                  |  3 ++-
 .../SupplierCategoryEntryReview/index.tsx     | 16 ++++---------
 .../components/ViewModal.tsx                  |  8 ++++---
 .../admission/SupplierEntryReview/index.tsx   |  8 ++-----
 .../components/ViewModal.tsx                  |  8 ++++---
 .../admission/admissionManagement/index.tsx   | 15 ++++--------
 .../components/ViewModal.tsx                  |  8 ++++---
 .../category/CategoryLibraryReview/index.tsx  |  8 ++-----
 .../category/SupplierEntryReview/index.tsx    |  8 ++-----
 13 files changed, 80 insertions(+), 59 deletions(-)
 create mode 100644 src/components/ApprovalStatusSelec/index.tsx
 create mode 100644 src/components/CommonSelect/AdmissionTypeSelect.tsx

diff --git a/src/components/ApprovalStatusSelec/index.tsx b/src/components/ApprovalStatusSelec/index.tsx
new file mode 100644
index 0000000..15218f2
--- /dev/null
+++ b/src/components/ApprovalStatusSelec/index.tsx
@@ -0,0 +1,23 @@
+import React, { useEffect, useState } from 'react';
+import { Select } from 'antd';
+
+interface options {
+    label: string;
+    value: string;
+}
+
+const AdmissionTypeSelect = () => {
+  const [options, setOptions] = useState<options[]>([]);
+  useEffect(() => {
+    setOptions([
+        { label: '未开始', value: '0' },
+        { label: '进行中', value: '1' },
+        { label: '结果汇总中', value: '2' },
+        { label: '已完成', value: '3' },
+    ])
+  }, []);
+
+  return <Select style={{ width: 150 }} placeholder="请选择审批状态" options={options} allowClear />;
+};
+
+export default AdmissionTypeSelect;
diff --git a/src/components/CommonSelect/AdmissionTypeSelect.tsx b/src/components/CommonSelect/AdmissionTypeSelect.tsx
new file mode 100644
index 0000000..2b7278d
--- /dev/null
+++ b/src/components/CommonSelect/AdmissionTypeSelect.tsx
@@ -0,0 +1,21 @@
+import React, { useEffect, useState } from 'react';
+import { Select } from 'antd';
+
+interface options {
+    label: string;
+    value: string;
+}
+
+const AdmissionTypeSelect = () => {
+  const [options, setOptions] = useState<options[]>([]);
+  useEffect(() => {
+    setOptions([
+        { label: '线上准入', value: 'online' },
+        { label: '线下准入', value: 'offline' },
+        { label: '零星采购/应急采购/个人供应商', value: 'scattered' },
+    ])
+  }, []);
+  return <Select style={{ width: 150 }} placeholder="请选择准入方式" options={options} allowClear />;
+};
+
+export default AdmissionTypeSelect;
diff --git a/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx b/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx
index 692b531..2e42ec2 100644
--- a/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx
+++ b/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx
@@ -20,6 +20,7 @@ interface coscoAccessSupplierLists {
 }
 interface coscoAccessWorks {
   deptId: string;
+  deptName: string;
   reviewStatusText: string;
   approveStatusText: string;
 }
@@ -46,8 +47,8 @@ const ViewModal: React.FC<{
   return (
     <Modal title="查看详情" visible={visible} footer={null} onCancel={onCancel}>
       {data && (
-        <Descriptions bordered column={1}>
-          <Descriptions.Item label="准入部门">{data.coscoAccessWork.deptId}</Descriptions.Item>
+        <Descriptions bordered column={1}  labelStyle={{ width: 160 }}>
+          <Descriptions.Item label="准入部门">{data.coscoAccessWork.deptName}</Descriptions.Item>
           <Descriptions.Item label="准入供应商">
             {data.coscoAccessSupplierList.map((item) => {
               return (
diff --git a/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx b/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx
index 4cd9e85..d2eb02c 100644
--- a/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx
+++ b/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx
@@ -7,12 +7,12 @@ import ViewModal from './components/ViewModal';
 //发起准入 弹窗
 import CreateModal from './components/CreateModal';
 import CategorySelector from '@/components/CategorySelector';
+import AdmissionTypeSelect from '@/components/CommonSelect/AdmissionTypeSelect';
 //接口
 import { getPage, startApprove } from './services'
 import { getDictList } from '@/servers/api/dicts'
 //统一列表分页
 import tableProps from '@/utils/tableProps'
-const { Option } = Select;
 
 interface Data {
   id: string;
@@ -129,11 +129,7 @@ const SupplierCategoryEntry: React.FC = () => {
         <div className="filter-action-row">
           <Form layout="inline" form={form} className="filter-form" onFinish={getList}>
             <Form.Item name="accessType" label="准入方式">
-              <Select style={{ width: 150 }} placeholder="请选择准入方式" allowClear >
-                <Option value="online">线上准入</Option>
-                <Option value="offline">线下准入</Option>
-                <Option value="scattered">零星采购/应急采购/个人供应商</Option>
-              </Select>
+              <AdmissionTypeSelect/>
             </Form.Item>
             <Form.Item name="deptId" label="准入单位">
               <Select style={{ width: 150 }} placeholder="请选择" allowClear>
diff --git a/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx b/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx
index 692b531..d3cb585 100644
--- a/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx
+++ b/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx
@@ -20,6 +20,7 @@ interface coscoAccessSupplierLists {
 }
 interface coscoAccessWorks {
   deptId: string;
+  deptName: string;
   reviewStatusText: string;
   approveStatusText: string;
 }
@@ -47,7 +48,7 @@ const ViewModal: React.FC<{
     <Modal title="查看详情" visible={visible} footer={null} onCancel={onCancel}>
       {data && (
         <Descriptions bordered column={1}>
-          <Descriptions.Item label="准入部门">{data.coscoAccessWork.deptId}</Descriptions.Item>
+          <Descriptions.Item label="准入部门">{data.coscoAccessWork.deptName}</Descriptions.Item>
           <Descriptions.Item label="准入供应商">
             {data.coscoAccessSupplierList.map((item) => {
               return (
diff --git a/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx b/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx
index e0d6812..ee5c93a 100644
--- a/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx
+++ b/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx
@@ -5,11 +5,12 @@ import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
 //查看弹窗
 import ViewModal from './components/ViewModal';
 import CategorySelector from '@/components/CategorySelector';
+import AdmissionTypeSelect from '@/components/CommonSelect/AdmissionTypeSelect';
+import ApprovalStatusSelec from '@/components/ApprovalStatusSelec/index';
 //接口
 import { getPage } from './services'
 //统一列表分页
 import tableProps from '@/utils/tableProps'
-const { Option } = Select;
 
 interface Data {
   id: string;
@@ -95,11 +96,7 @@ const SupplierCategoryEntryReview: React.FC = () => {
         <div className="filter-action-row">
           <Form layout="inline" form={form} className="filter-form" onFinish={getList}>
             <Form.Item name="accessType" label="准入方式">
-              <Select style={{ width: 150 }} placeholder="请选择准入方式" allowClear >
-                <Option value="online">线上准入</Option>
-                <Option value="offline">线下准入</Option>
-                <Option value="scattered">零星采购/应急采购/个人供应商</Option>
-              </Select>
+              <AdmissionTypeSelect/>
             </Form.Item>
             <Form.Item name="deptId" label="准入单位">
               <Select style={{ width: 150 }} placeholder="请选择" allowClear>
@@ -109,12 +106,7 @@ const SupplierCategoryEntryReview: React.FC = () => {
               <CategorySelector multiple={false} style={{ width: 150 }} />
             </Form.Item>
             <Form.Item name="approveStatus" label="审批状态">
-              <Select style={{ width: 150 }} placeholder="请选择状态" allowClear>
-                <Option value="0">未开始</Option>
-                <Option value="1">进行中</Option>
-                <Option value="2">结果汇总中</Option>
-                <Option value="3">已完成</Option>
-              </Select>
+              <ApprovalStatusSelec />
             </Form.Item>
 
             <Form.Item>
diff --git a/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx b/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx
index 07b521f..308a716 100644
--- a/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx
+++ b/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx
@@ -18,6 +18,7 @@ interface coscoAccessWorkAttachments {
 }
 interface coscoAccessUserl {
   deptId: string;
+  deptName: string;
   userId: string;
 }
 interface coscoAccessCategoryLists {
@@ -30,6 +31,7 @@ interface coscoAccessSupplierLists {
 }
 interface coscoAccessWorks {
   deptId: string;
+  deptName: string;
   startTime: string;
   endTime: string;
   reviewStatusText: string;
@@ -60,8 +62,8 @@ const ViewModal: React.FC<{
   return (
     <Modal title="查看详情" visible={visible} footer={null} onCancel={onCancel}>
       {data && (
-        <Descriptions bordered column={1}>
-          <Descriptions.Item label="准入部门">{data.coscoAccessWork.deptId}</Descriptions.Item>
+        <Descriptions bordered column={1} labelStyle={{ width: 160 }}>
+          <Descriptions.Item label="准入部门">{data.coscoAccessWork.deptName}</Descriptions.Item>
           <Descriptions.Item label="准入供应商">
             {data.coscoAccessSupplierList.map((item) => {
               return (
@@ -99,7 +101,7 @@ const ViewModal: React.FC<{
               <Descriptions.Item label="评审专家">
                 {data.coscoAccessUserls.map((item) => {
                   return (
-                    <div style={{ margin: '5px' }}>{item.deptId} - {item.userId}</div>
+                    <div style={{ margin: '5px' }}>{item.deptName} - {item.userId}</div>
                   )
                 })}
               </Descriptions.Item>
diff --git a/src/pages/supplier/admission/SupplierEntryReview/index.tsx b/src/pages/supplier/admission/SupplierEntryReview/index.tsx
index 44f6299..a19401f 100644
--- a/src/pages/supplier/admission/SupplierEntryReview/index.tsx
+++ b/src/pages/supplier/admission/SupplierEntryReview/index.tsx
@@ -8,10 +8,10 @@ import { getDictList } from '@/servers/api/dicts'
 //组件
 import AccessDepartmentSelect from '@/components/AccessDepartmentSelect';
 import ViewModal from './components/ViewModal';
+import AdmissionTypeSelect from '@/components/CommonSelect/AdmissionTypeSelect';
 //统一列表分页
 import tableProps from '@/utils/tableProps'
 
-const { Option } = Select;
 interface SupplierEntryReviewRecord {
   id: string;
   accessWorkName: string;    // 准入工作
@@ -206,11 +206,7 @@ const SupplierEntryReview: React.FC = () => {
           onFinish={handleSearch}
         >
           <Form.Item name="accessType" label="准入方式">
-            <Select style={{ width: 150 }} placeholder="请选择准入方式" allowClear >
-              <Option value="online">线上准入</Option>
-              <Option value="offline">线下准入</Option>
-              <Option value="scattered">零星采购/应急采购/个人供应商</Option>
-            </Select>
+            <AdmissionTypeSelect/>
           </Form.Item>
           <Form.Item name="deptId" label="准入部门">
             <AccessDepartmentSelect />
diff --git a/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx b/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx
index 133408d..71ae702 100644
--- a/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx
+++ b/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx
@@ -17,6 +17,7 @@ interface coscoAccessWorkAttachments {
   fileUrl: string;
 }
 interface coscoAccessUserl {
+  deptName: string;
   deptId: string;
   userId: string;
 }
@@ -30,6 +31,7 @@ interface coscoAccessSupplierLists {
 }
 interface coscoAccessWorks {
   deptId: string;
+  deptName: string;
   startTime: string;
   endTime: string;
   reviewStatusText: string;
@@ -60,8 +62,8 @@ const ViewModal: React.FC<{
   return (
     <Modal title="查看详情" visible={visible} footer={null} onCancel={onCancel}>
       {data && (
-        <Descriptions bordered column={1}>
-          <Descriptions.Item label="准入部门">{data.coscoAccessWork.deptId}</Descriptions.Item>
+        <Descriptions bordered column={1}  labelStyle={{ width: 160 }}>
+          <Descriptions.Item label="准入部门">{data.coscoAccessWork.deptName}</Descriptions.Item>
           <Descriptions.Item label="准入供应商">
             {data.coscoAccessSupplierList.map((item) => {
               return (
@@ -99,7 +101,7 @@ const ViewModal: React.FC<{
               <Descriptions.Item label="评审专家">
                 {data.coscoAccessUserls.map((item) => {
                   return (
-                    <div style={{ margin: '5px' }}>{item.deptId} - {item.userId}</div>
+                    <div style={{ margin: '5px' }}>{item.deptName} - {item.userId}</div>
                   )
                 })}
               </Descriptions.Item>
diff --git a/src/pages/supplier/admission/admissionManagement/index.tsx b/src/pages/supplier/admission/admissionManagement/index.tsx
index c1c89d8..e5698ac 100644
--- a/src/pages/supplier/admission/admissionManagement/index.tsx
+++ b/src/pages/supplier/admission/admissionManagement/index.tsx
@@ -9,6 +9,8 @@ import ResultModal from './components/ResultModal';
 //发起准入 弹窗
 import CreateModal from './components/CreateModal';
 import CategorySelector from '@/components/CategorySelector';
+import AdmissionTypeSelect from '@/components/CommonSelect/AdmissionTypeSelect';
+import ApprovalStatusSelec from '@/components/ApprovalStatusSelec/index';
 //接口
 import { getPage, startApprove } from './services'
 //统一列表分页
@@ -137,11 +139,7 @@ const AccessManagement: React.FC = () => {
         <div className="filter-action-row">
           <Form layout="inline" form={form} className="filter-form" onFinish={getList}>
             <Form.Item name="accessType" label="准入方式">
-              <Select style={{ width: 150 }} placeholder="请选择准入方式" allowClear >
-                <Option value="online">线上准入</Option>
-                <Option value="offline">线下准入</Option>
-                <Option value="scattered">零星采购/应急采购/个人供应商</Option>
-              </Select>
+              <AdmissionTypeSelect />
             </Form.Item>
             <Form.Item name="deptId" label="准入单位">
               <Select style={{ width: 150 }} placeholder="请选择" allowClear>
@@ -151,12 +149,7 @@ const AccessManagement: React.FC = () => {
               <CategorySelector multiple={false} style={{ width: 150 }} />
             </Form.Item>
             <Form.Item name="approveStatus" label="审批状态">
-              <Select style={{ width: 150 }} placeholder="请选择审批状态" allowClear>
-                <Option value="0">未开始</Option>
-                <Option value="1">进行中</Option>
-                <Option value="2">结果汇总中</Option>
-                <Option value="3">已完成</Option>
-              </Select>
+              <ApprovalStatusSelec />
             </Form.Item>
 
             <Form.Item>
diff --git a/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx b/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx
index 133408d..c8750c4 100644
--- a/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx
+++ b/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx
@@ -18,6 +18,7 @@ interface coscoAccessWorkAttachments {
 }
 interface coscoAccessUserl {
   deptId: string;
+  deptName: string;
   userId: string;
 }
 interface coscoAccessCategoryLists {
@@ -30,6 +31,7 @@ interface coscoAccessSupplierLists {
 }
 interface coscoAccessWorks {
   deptId: string;
+  deptName: string;
   startTime: string;
   endTime: string;
   reviewStatusText: string;
@@ -60,8 +62,8 @@ const ViewModal: React.FC<{
   return (
     <Modal title="查看详情" visible={visible} footer={null} onCancel={onCancel}>
       {data && (
-        <Descriptions bordered column={1}>
-          <Descriptions.Item label="准入部门">{data.coscoAccessWork.deptId}</Descriptions.Item>
+        <Descriptions bordered column={1}  labelStyle={{ width: 160 }}>
+          <Descriptions.Item label="准入部门" >{data.coscoAccessWork.deptName}</Descriptions.Item>
           <Descriptions.Item label="准入供应商">
             {data.coscoAccessSupplierList.map((item) => {
               return (
@@ -99,7 +101,7 @@ const ViewModal: React.FC<{
               <Descriptions.Item label="评审专家">
                 {data.coscoAccessUserls.map((item) => {
                   return (
-                    <div style={{ margin: '5px' }}>{item.deptId} - {item.userId}</div>
+                    <div style={{ margin: '5px' }}>{item.deptName} - {item.userId}</div>
                   )
                 })}
               </Descriptions.Item>
diff --git a/src/pages/supplier/category/CategoryLibraryReview/index.tsx b/src/pages/supplier/category/CategoryLibraryReview/index.tsx
index 6273402..79cb5f6 100644
--- a/src/pages/supplier/category/CategoryLibraryReview/index.tsx
+++ b/src/pages/supplier/category/CategoryLibraryReview/index.tsx
@@ -7,6 +7,7 @@ import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
 // 弹窗组件
 import CategoryAddModal from './components/CategoryAddModal';
 import ViewModal from './components/ViewModal';
+import ApprovalStatusSelec from '@/components/ApprovalStatusSelec/index';
 //接口与字典
 import { getDictList } from '@/servers/api/dicts'
 import { getPage, approval } from './services';
@@ -212,12 +213,7 @@ const CategoryLibraryManage: React.FC = () => {
             </Form.Item>
 
             <Form.Item name="approveStatus" label="审批状态">
-              <Select style={{ width: 150 }} placeholder="请选择状态" allowClear>
-                <Option value="0">未开始</Option>
-                <Option value="1">进行中</Option>
-                <Option value="2">结果汇总中</Option>
-                <Option value="3">已完成</Option>
-              </Select>
+              <ApprovalStatusSelec />
             </Form.Item>
 
             <Form.Item>
diff --git a/src/pages/supplier/category/SupplierEntryReview/index.tsx b/src/pages/supplier/category/SupplierEntryReview/index.tsx
index f37aead..b9140d5 100644
--- a/src/pages/supplier/category/SupplierEntryReview/index.tsx
+++ b/src/pages/supplier/category/SupplierEntryReview/index.tsx
@@ -8,6 +8,7 @@ import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
 import CategoryAddModal from './components/CategoryAddModal';
 import ViewModal from './components/ViewModal';
 import moment from 'moment';
+import ApprovalStatusSelec from '@/components/ApprovalStatusSelec/index';
 //接口
 import { getPage, approval } from './services';
 //统一列表分页
@@ -199,12 +200,7 @@ const CategoryLibraryManage: React.FC = () => {
             </Form.Item>
 
             <Form.Item name="approveStatus" label="审批状态">
-              <Select style={{ width: 150 }} placeholder="请选择状态" allowClear>
-                <Option value="0">未开始</Option>
-                <Option value="1">进行中</Option>
-                <Option value="2">结果汇总中</Option>
-                <Option value="3">已完成</Option>
-              </Select>
+              <ApprovalStatusSelec />
             </Form.Item>
 
             <Form.Item>