diff --git a/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx b/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx index 8076410..5a06481 100644 --- a/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx +++ b/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx @@ -18,6 +18,7 @@ import tableProps from '@/utils/tableProps' interface Data { id: string; deptId: string; + orgId: string; accessTypeText: string; createTime: string; approveStatus: string; @@ -132,7 +133,7 @@ const SupplierCategoryEntry: React.FC = () => { - + diff --git a/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx b/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx index ed1ccf1..34f2743 100644 --- a/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx +++ b/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { Form, Select, Button, Table, Space } from 'antd'; +import { Form, Button, Table, Space } from 'antd'; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; import type { ColumnsType, TablePaginationConfig } from 'antd/es/table'; //查看弹窗 @@ -16,6 +16,7 @@ import tableProps from '@/utils/tableProps' interface Data { id: string; deptId: string; + orgId: string; accessTypeText: string; createTime: string; approveStatus: string; @@ -99,7 +100,7 @@ const SupplierCategoryEntryReview: React.FC = () => { - + diff --git a/src/pages/supplier/admission/admissionManagement/index.tsx b/src/pages/supplier/admission/admissionManagement/index.tsx index ba585c7..af2bbae 100644 --- a/src/pages/supplier/admission/admissionManagement/index.tsx +++ b/src/pages/supplier/admission/admissionManagement/index.tsx @@ -20,6 +20,7 @@ import tableProps from '@/utils/tableProps' interface Data { id: string; deptId: string; + orgId: string; accessTypeText: string; createTime: string; approveStatus: string; @@ -140,7 +141,7 @@ const AccessManagement: React.FC = () => { - + diff --git a/src/pages/supplier/category/CategoryLibraryManage/components/CategoryAddModal.tsx b/src/pages/supplier/category/CategoryLibraryManage/components/CategoryAddModal.tsx index e03ba46..c708cd8 100644 --- a/src/pages/supplier/category/CategoryLibraryManage/components/CategoryAddModal.tsx +++ b/src/pages/supplier/category/CategoryLibraryManage/components/CategoryAddModal.tsx @@ -245,7 +245,7 @@ const CategoryAddModal: React.FC = ({ visible, onCancel, onSuccess }) => name="applyDeptId" rules={[{ required: true, message: '请选择品类库负责人' }]} > - + { setLoading(true); // 可传查询条件 form.getFieldsValue() const values = form.getFieldsValue(); - const { exitTheme, time, deptId, approveStatus } = values; + const { exitTheme, time, orgId, approveStatus } = 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({ pageNo, pageSize, exitTheme, deptId, approveStatus, startTime, endTime }); + const { code, data } = await getPage({ pageNo, pageSize, exitTheme, orgId, approveStatus, startTime, endTime }); if (code === 200) { setData(data.records); setPagination(prev => ({ ...prev, current: pageNo, pageSize, total: data.total })); @@ -125,7 +125,7 @@ const supplierExitAudit: React.FC = () => { - + diff --git a/src/pages/supplier/supplierExit/supplierExitAudit/services.ts b/src/pages/supplier/supplierExit/supplierExitAudit/services.ts index 284f077..35993f6 100644 --- a/src/pages/supplier/supplierExit/supplierExitAudit/services.ts +++ b/src/pages/supplier/supplierExit/supplierExitAudit/services.ts @@ -7,6 +7,7 @@ interface getPageData { pageNo: number; pageSize: number; deptId?: string; + orgId?: string; accessType?: string; reviewStatus?: string; approveStatus?: string; diff --git a/src/pages/supplier/supplierExit/supplierExitManage/index.tsx b/src/pages/supplier/supplierExit/supplierExitManage/index.tsx index a4d07ef..742ab0c 100644 --- a/src/pages/supplier/supplierExit/supplierExitManage/index.tsx +++ b/src/pages/supplier/supplierExit/supplierExitManage/index.tsx @@ -124,7 +124,7 @@ const supplierExitManage: React.FC = () => { - +