From 87baa97ae1c4c9934ce6e6f3132593aa1697fcb3 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: Fri, 4 Jul 2025 08:47:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admission/admissionManagement/index.tsx   |  6 ----
 .../supplier/backend/supplierNews/index.tsx   | 30 +++++++++++++++++--
 .../supplier/backend/supplierNews/services.ts |  6 +++-
 .../CategoryLibraryManage/services.ts         |  4 +--
 .../components/SupplierListModal.tsx          |  2 +-
 .../SupplierChangeManage/index.tsx            |  6 ++--
 .../SupplierRegisterAgent/index.tsx           | 10 +++----
 src/pages/supplier/supplierMessage/index.tsx  |  6 ++--
 8 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/src/pages/supplier/admission/admissionManagement/index.tsx b/src/pages/supplier/admission/admissionManagement/index.tsx
index e63282d..f1df0bb 100644
--- a/src/pages/supplier/admission/admissionManagement/index.tsx
+++ b/src/pages/supplier/admission/admissionManagement/index.tsx
@@ -3,10 +3,6 @@ import { Form, Select, Button, Table, Space, Modal, message } from 'antd';
 import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
 //查看弹窗
 import ViewModal from './components/ViewModal';
-//发起审批 弹窗
-import ApproveModal from './components/ApproveModal';
-//审批记录 弹窗
-import RecordModal from './components/RecordModal';
 //查看评审结果 弹窗
 import ResultModal from './components/ResultModal';
 //发起准入 弹窗
@@ -159,8 +155,6 @@ const AccessManagement: React.FC = () => {
       />
       {/* 弹窗区 */}
       <ViewModal visible={modalInfo.type === 'view' && modalInfo.visible} record={modalInfo.record} onCancel={closeModal} />
-      {/* <ApproveModal visible={modalInfo.type === 'approve' && modalInfo.visible} record={modalInfo.record} onCancel={closeModal} /> */}
-      {/* <RecordModal visible={modalInfo.type === 'record' && modalInfo.visible} record={modalInfo.record} onCancel={closeModal} /> */}
       <ResultModal visible={modalInfo.type === 'result' && modalInfo.visible} record={modalInfo.record} onCancel={closeModal} />
       <CreateModal visible={modalInfo.type === 'create' && modalInfo.visible} onCancel={closeModal} />
     </>
diff --git a/src/pages/supplier/backend/supplierNews/index.tsx b/src/pages/supplier/backend/supplierNews/index.tsx
index db4b422..53bbb24 100644
--- a/src/pages/supplier/backend/supplierNews/index.tsx
+++ b/src/pages/supplier/backend/supplierNews/index.tsx
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from "react";
 import { useIntl } from 'umi';
-import { Form, Button, Table, Select, Input } from 'antd';
+import { Form, Button, Table, Select, Input, Modal } from 'antd';
 import type { ColumnsType, TablePaginationConfig } from 'antd/es/table';
 import { SearchOutlined } from '@ant-design/icons';
-import { page } from './services';
+import { page, getExitMge } from './services';
 import { getDictList } from '@/servers/api/dicts'
 
 interface Data {
@@ -97,6 +97,30 @@ const supplierNews: React.FC = () => {
     //     setCategoryOptions(data)
     //   }
     // })
+    getExitMge().then((res) => {
+      const { code, data } = res;
+      if (code == 200) {
+        if (Array.isArray(data) && data.length > 0) {
+          Modal.info({
+            title: '消息通知',
+            width: 520,
+            content: (
+              <div>
+                <p>已被发起退出并通过：</p>
+                <ul>
+                  {data.map((item: any) => (
+                    <li key={item.id} style={{ margin: '6px 0' }}>
+                      退出内容：{item.content || '--'}
+                    </li>
+                  ))}
+                </ul>
+              </div>
+            ),
+            okText: '知道了'
+          });
+        }
+      }
+    })
     getList({ pageNo: 1, pageSize: 10, content: '', type: '' });
   }, []);
 
@@ -109,7 +133,7 @@ const supplierNews: React.FC = () => {
         style={{ marginBottom: 16 }}
       >
         <Form.Item name="content" label="消息内容">
-          <Input placeholder="请输入消息内容" allowClear maxLength={50}/>
+          <Input placeholder="请输入消息内容" allowClear maxLength={50} />
         </Form.Item>
         <Form.Item name="type" label="业务类型">
           <Select placeholder="请选择业务类型" allowClear>
diff --git a/src/pages/supplier/backend/supplierNews/services.ts b/src/pages/supplier/backend/supplierNews/services.ts
index 8a6f96a..62dd6aa 100644
--- a/src/pages/supplier/backend/supplierNews/services.ts
+++ b/src/pages/supplier/backend/supplierNews/services.ts
@@ -10,4 +10,8 @@ interface page {
   content?: string;
   type?: string;
 }
-export const page = (data: page) => request.post('/supplierMessage/page', { data });
\ No newline at end of file
+export const page = (data: page) => request.post('/supplierMessage/page', { data });
+/**
+ * 消息弹出
+ */
+export const getExitMge = () => request.get('/supplierMessage/getExitMge');
diff --git a/src/pages/supplier/category/CategoryLibraryManage/services.ts b/src/pages/supplier/category/CategoryLibraryManage/services.ts
index 7afd2c5..f9a43b3 100644
--- a/src/pages/supplier/category/CategoryLibraryManage/services.ts
+++ b/src/pages/supplier/category/CategoryLibraryManage/services.ts
@@ -40,8 +40,8 @@ export interface CoscoCategoryLibrarAttachments {
 
 export interface getPageData {
   basePageRequest: BasePageRequest;
-  name: string;
-  deptId: string;
+  name?: string;
+  deptId?: string;
   [property: string]: any;
 }
 
diff --git a/src/pages/supplier/category/SupplierEntryManage/components/SupplierListModal.tsx b/src/pages/supplier/category/SupplierEntryManage/components/SupplierListModal.tsx
index 4218660..eba1d4b 100644
--- a/src/pages/supplier/category/SupplierEntryManage/components/SupplierListModal.tsx
+++ b/src/pages/supplier/category/SupplierEntryManage/components/SupplierListModal.tsx
@@ -83,7 +83,7 @@ const SupplierListModal: React.FC<{
     { title: '供应商名称', dataIndex: 'name', align: 'center' },
     { title: '境内/境外', dataIndex: 'region', align: 'center' },
     { title: '统一社会信用代码', dataIndex: 'creditCode', align: 'center' },
-    { title: '供应商分类', dataIndex: 'type', align: 'center' },
+    { title: '供应商分类', dataIndex: 'enterpriseTypeCn', align: 'center' },
   ];
 
   return (
diff --git a/src/pages/supplier/informationManagement/SupplierChangeManage/index.tsx b/src/pages/supplier/informationManagement/SupplierChangeManage/index.tsx
index a4fd5ff..ae2431c 100644
--- a/src/pages/supplier/informationManagement/SupplierChangeManage/index.tsx
+++ b/src/pages/supplier/informationManagement/SupplierChangeManage/index.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { Table, Form, Input, Select, Button, DatePicker, Tag, Space, message } from 'antd';
 import { SearchOutlined, ReloadOutlined } from '@ant-design/icons';
 import DetailView from './components/DetailView'; 
-import { getSupplierChangeList, list } from './services';
+import { list } from './services';
 
 const { RangePicker } = DatePicker;
 
@@ -99,7 +99,7 @@ const SupplierChangeManage: React.FC = () => {
     },
     {
       title: '供应商分类',
-      dataIndex: 'supplierType',
+      dataIndex: 'enterpriseTypeCn',
       align: 'center',
     },
     {
@@ -116,13 +116,11 @@ const SupplierChangeManage: React.FC = () => {
       title: '流程状态',
       dataIndex: 'status',
       align: 'center',
-      render: (val: any) => <Tag color={statusColorMap[val] || 'default'}>{val}</Tag>,
     },
     {
       title: '审批结果',
       dataIndex: 'result',
       align: 'center',
-      render: (val: any) => val ? <Tag color={resultColorMap[val] || 'default'}>{val}</Tag> : null,
     },
     {
       title: '操作',
diff --git a/src/pages/supplier/informationManagement/SupplierRegisterAgent/index.tsx b/src/pages/supplier/informationManagement/SupplierRegisterAgent/index.tsx
index 5e8aeb6..e5f2fb0 100644
--- a/src/pages/supplier/informationManagement/SupplierRegisterAgent/index.tsx
+++ b/src/pages/supplier/informationManagement/SupplierRegisterAgent/index.tsx
@@ -92,11 +92,11 @@ const SupplierRegisterAgent: React.FC = () => {
       align: 'center',
       ellipsis: true,
     },
-    {
-      title: '供应商类型',
-      dataIndex: 'enterpriseType',
-      align: 'center',
-    },
+    // {
+    //   title: '供应商类型',
+    //   dataIndex: 'supplierType',
+    //   align: 'center',
+    // },
     {
       title: '创建单位',
       dataIndex: 'unit',
diff --git a/src/pages/supplier/supplierMessage/index.tsx b/src/pages/supplier/supplierMessage/index.tsx
index 7ffedd2..bad537d 100644
--- a/src/pages/supplier/supplierMessage/index.tsx
+++ b/src/pages/supplier/supplierMessage/index.tsx
@@ -64,7 +64,7 @@ const SupplierMessage: React.FC = () => {
       dataIndex: 'index',
       key: 'index',
       align: 'center',
-      width: 60,
+      width: 80,
       render: (_: any, __: any, idx: number) => ((pagination.current! - 1) * pagination.pageSize!) + idx + 1,
     },
     {
@@ -115,10 +115,10 @@ const SupplierMessage: React.FC = () => {
     <>
       <Form form={form} layout="inline" style={{ marginBottom: 12 }}>
         <Form.Item name="content" label="消息内容">
-          <Input placeholder="请输入消息内容" style={{ width: 220 }} maxLength={50} />
+          <Input placeholder="请输入消息内容" style={{ width: 220 }} maxLength={50} allowClear />
         </Form.Item>
         <Form.Item name="type" label="业务类型">
-          <Select style={{ width: 200 }} placeholder="请选择业务类型">
+          <Select style={{ width: 200 }} placeholder="请选择业务类型" allowClear>
             {messageTypeOptions.map(opt => (
               <Select.Option key={opt.value} value={opt.value}>{opt.label}</Select.Option>
             ))}