From b44341552247ef386f3114cf2e8ae3e0f3478302 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 15:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=B1=BB=E5=BA=93=E4=B8=8E=E5=90=8E?=
=?UTF-8?q?=E5=8F=B0=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../category/CategoryLibraryManage/index.tsx | 19 +++++++++++++-
.../category/CategoryLibraryReview/index.tsx | 25 ++++++++++++++++---
.../category/SupplierEntryManage/index.tsx | 19 +++++++++++++-
.../category/SupplierEntryReview/index.tsx | 9 ++++---
.../blacklistAudit/index.tsx | 6 ++---
.../blacklistManage/index.tsx | 6 ++---
6 files changed, 68 insertions(+), 16 deletions(-)
diff --git a/src/pages/supplier/category/CategoryLibraryManage/index.tsx b/src/pages/supplier/category/CategoryLibraryManage/index.tsx
index bfdde1b..3dd0951 100644
--- a/src/pages/supplier/category/CategoryLibraryManage/index.tsx
+++ b/src/pages/supplier/category/CategoryLibraryManage/index.tsx
@@ -129,6 +129,20 @@ const CategoryLibraryManage: React.FC = () => {
},
{
title: '创建单位',
+ dataIndex: 'applyOrgName',
+ key: 'applyOrgName',
+ align: 'center',
+ ellipsis: true,
+ },
+ {
+ title: '所属单位',
+ dataIndex: 'orgName',
+ key: 'orgName',
+ align: 'center',
+ ellipsis: true,
+ },
+ {
+ title: '所属部门',
dataIndex: 'deptName',
key: 'deptName',
align: 'center',
@@ -198,9 +212,12 @@ const CategoryLibraryManage: React.FC = () => {
-
+
+
+
+
} onClick={handleSearch} >
diff --git a/src/pages/supplier/category/CategoryLibraryReview/index.tsx b/src/pages/supplier/category/CategoryLibraryReview/index.tsx
index 19731a7..ad3b3d2 100644
--- a/src/pages/supplier/category/CategoryLibraryReview/index.tsx
+++ b/src/pages/supplier/category/CategoryLibraryReview/index.tsx
@@ -56,10 +56,10 @@ const CategoryLibraryManage: React.FC = () => {
setLoading(true);
try {
const values = form.getFieldsValue();
- const { name, deptNames, timeRange, approveStatus } = values;
+ const { timeRange } = values;
const startTime = timeRange ? moment(timeRange[0]).format('YYYY-MM-DD') : '';
const endTime = timeRange ? moment(timeRange[1]).format('YYYY-MM-DD') : '';
- const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, name, startTime, endTime, deptNames, approveStatus });
+ const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, ...values, startTime, endTime, });
if (code === 200) {
setData(data.records);
setPagination({ ...pagination, current: pageNo, pageSize, total: data.total });
@@ -150,8 +150,22 @@ const CategoryLibraryManage: React.FC = () => {
ellipsis: true,
render: (code: string) => areaMap[code] || code
},
- {
+ {
title: '创建单位',
+ dataIndex: 'applyOrgName',
+ key: 'applyOrgName',
+ align: 'center',
+ ellipsis: true,
+ },
+ {
+ title: '所属单位',
+ dataIndex: 'orgName',
+ key: 'orgName',
+ align: 'center',
+ ellipsis: true,
+ },
+ {
+ title: '所属部门',
dataIndex: 'deptName',
key: 'deptName',
align: 'center',
@@ -229,9 +243,12 @@ const CategoryLibraryManage: React.FC = () => {
-
+
+
+
+
{
},
{
title: '创建单位',
+ dataIndex: 'applyOrgName',
+ key: 'applyOrgName',
+ align: 'center',
+ ellipsis: true,
+ },
+ {
+ title: '所属单位',
+ dataIndex: 'orgName',
+ key: 'orgName',
+ align: 'center',
+ ellipsis: true,
+ },
+ {
+ title: '所属部门',
dataIndex: 'deptName',
key: 'deptName',
align: 'center',
@@ -185,9 +199,12 @@ const SupplierEntryManage: React.FC = () => {
-
+
+
+
+
} onClick={handleSearch} >
diff --git a/src/pages/supplier/category/SupplierEntryReview/index.tsx b/src/pages/supplier/category/SupplierEntryReview/index.tsx
index 1acc5bb..c67a014 100644
--- a/src/pages/supplier/category/SupplierEntryReview/index.tsx
+++ b/src/pages/supplier/category/SupplierEntryReview/index.tsx
@@ -54,10 +54,10 @@ const CategoryLibraryManage: React.FC = () => {
setLoading(true);
try {
const values = form.getFieldsValue();
- const { name, deptNames, timeRange, approveStatus } = values;
+ const { timeRange } = values;
const startTime = timeRange ? moment(timeRange[0]).format('YYYY-MM-DD') : '';
const endTime = timeRange ? moment(timeRange[1]).format('YYYY-MM-DD') : '';
- const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, name, startTime, endTime, deptNames, approveStatus });
+ const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, ...values, startTime, endTime });
if (code === 200) {
setData(data.records);
setPagination({ ...pagination, current: pageNo, pageSize, total: data.total });
@@ -225,9 +225,10 @@ const CategoryLibraryManage: React.FC = () => {
-
+ {/*
-
+ */}
+
{
setLoading(true);
// 可传查询条件
const values = form.getFieldsValue();
- const { exitTheme, time, deptId, approveStatus } = values;
+ const { time } = values;
const startTime = time ? moment(time[0]).format('YYYY-MM-DD') : '';
const endTime = time ? moment(time[1]).format('YYYY-MM-DD') : '';
- const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, exitTheme, deptId, approveStatus, startTime, endTime });
+ const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, ...values, startTime, endTime });
if (code === 200) {
setData(data.records);
@@ -147,7 +147,7 @@ const blacklistManage: React.FC = () => {
-
+
diff --git a/src/pages/supplier/supplierBlacklist/blacklistManage/index.tsx b/src/pages/supplier/supplierBlacklist/blacklistManage/index.tsx
index 8bd7a1d..3c74bfa 100644
--- a/src/pages/supplier/supplierBlacklist/blacklistManage/index.tsx
+++ b/src/pages/supplier/supplierBlacklist/blacklistManage/index.tsx
@@ -48,10 +48,10 @@ const blacklistManage: React.FC = () => {
setLoading(true);
// 可传查询条件
const values = form.getFieldsValue();
- const { exitTheme, time, deptId, approveStatus } = values;
+ const { time } = values;
const startTime = time ? moment(time[0]).format('YYYY-MM-DD') : '';
const endTime = time ? moment(time[1]).format('YYYY-MM-DD') : '';
- const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, exitTheme, deptId, approveStatus, startTime, endTime });
+ const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, ...values, startTime, endTime });
if (code === 200) {
setData(data.records);
@@ -136,7 +136,7 @@ const blacklistManage: React.FC = () => {
-
+