diff --git a/src/pages/supplier/admission/admissionManagement/components/ReviewerSelector.tsx b/src/pages/supplier/admission/admissionManagement/components/ReviewerSelector.tsx index 091c131..303f7c7 100644 --- a/src/pages/supplier/admission/admissionManagement/components/ReviewerSelector.tsx +++ b/src/pages/supplier/admission/admissionManagement/components/ReviewerSelector.tsx @@ -74,7 +74,8 @@ const ReviewerSelector: React.FC = ({ useEffect(() => { if (!visible) return; setLoading(true); - getUserPage({ basePageRequest: { pageNo: page, pageSize } }) + const userId = sessionStorage.getItem('userId') as string + getUserPage({ basePageRequest: { pageNo: page, pageSize }, userId }) .then((res) => { const { code, data } = res; if(code == 200) { @@ -94,7 +95,7 @@ const ReviewerSelector: React.FC = ({ const columns: ColumnsType = [ { title: '姓名', dataIndex: 'name' }, - { title: '工号', dataIndex: 'userId' }, + { title: '工号', dataIndex: 'employeeNumber' }, { title: '部门', dataIndex: 'orgName' }, { title: '组长', diff --git a/src/pages/supplier/admission/admissionManagement/services.ts b/src/pages/supplier/admission/admissionManagement/services.ts index ab961f9..f067d20 100644 --- a/src/pages/supplier/admission/admissionManagement/services.ts +++ b/src/pages/supplier/admission/admissionManagement/services.ts @@ -68,8 +68,14 @@ interface CoscoAccessWork { } export const add = (data: addInterface) => request.post('/coscoAccessWork/add', { data }); + + + + + interface getUserPage { basePageRequest: basePageRequest; + userId: string; } interface basePageRequest { pageNo: number; @@ -77,7 +83,7 @@ interface basePageRequest { } -export const getUserPage = (data: getUserPage) => request.post('/user/getUserPage', { data }); +export const getUserPage = (data: getUserPage) => request.post('/v1/sysuser/getPageByUserCompany', { data }); /** * 品类选择查询树 diff --git a/src/pages/supplier/category/SupplierEntryManage/index.tsx b/src/pages/supplier/category/SupplierEntryManage/index.tsx index d175bfa..727545f 100644 --- a/src/pages/supplier/category/SupplierEntryManage/index.tsx +++ b/src/pages/supplier/category/SupplierEntryManage/index.tsx @@ -150,6 +150,11 @@ const SupplierEntryManage: React.FC = () => { 添加供应商 )} + {record.approveStatus !== 1 && ( + + 添加供应商 + + )} ), }, diff --git a/src/pages/supplier/supplierBlacklist/blacklistManage/components/CreateBlacklistModal.tsx b/src/pages/supplier/supplierBlacklist/blacklistManage/components/CreateBlacklistModal.tsx index 70b1e90..f924ce5 100644 --- a/src/pages/supplier/supplierBlacklist/blacklistManage/components/CreateBlacklistModal.tsx +++ b/src/pages/supplier/supplierBlacklist/blacklistManage/components/CreateBlacklistModal.tsx @@ -5,7 +5,8 @@ import type { ColumnsType } from 'antd/es/table'; import SupplierSelectModal from "./SupplierSelectModal"; import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; //接口 -import { blacklist, getAllList } from "../services"; +import { blacklist } from "../services"; +import { getDictList } from '@/servers/api/dicts'; const { Option } = Select; @@ -85,7 +86,7 @@ const CreateBlacklistModal: React.FC = ({ useEffect(() => { if (visible) { // - getAllList('blacklist_deadline').then((res) => { + getDictList('blacklist_deadline').then((res) => { const { code, data } = res; if(code == 200) { setTimelimitOption(data)