黑名单字典

src/pages/supplier/admission/admissionManagement/components/ReviewerSelector.tsx

@@ -74,7 +74,8 @@ const ReviewerSelector: React.FC<ReviewerSelectorProps> = ({
   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<ReviewerSelectorProps> = ({
  
   const columns: ColumnsType<Reviewer> = [
     { title: '姓名', dataIndex: 'name' },
-    { title: '工号', dataIndex: 'userId' },
+    { title: '工号', dataIndex: 'employeeNumber' },
     { title: '部门', dataIndex: 'orgName' },
     {
       title: '组长',

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 });
 
 /**
  * 品类选择查询树

src/pages/supplier/category/SupplierEntryManage/index.tsx

@@ -150,6 +150,11 @@ const SupplierEntryManage: React.FC = () => {
               添加供应商
             </a>
           )}
+          {record.approveStatus !== 1 && (
+            <span style={{color: '#a7a7a7'}}>
+              添加供应商
+            </span>
+          )}
         </>
       ),
     },

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<CreateBlacklistModalProps> = ({
   useEffect(() => {
     if (visible) {
       // 
-      getAllList('blacklist_deadline').then((res) => {
+      getDictList('blacklist_deadline').then((res) => {
         const { code, data } = res;
         if(code == 200) {
           setTimelimitOption(data)