单位与部门

src/pages/supplier/admission/SupplierCategoryEntry/index.tsx

@@ -102,8 +102,8 @@ const SupplierCategoryEntry: React.FC = () => {
       render: (_: any, __: any, idx: number) => (((pagination.current ?? 1) - 1) * (pagination.pageSize ?? 10)) + idx + 1,
     },
     { title: '准入工作', ellipsis: true, width: 120, dataIndex: 'accessWorkName' },
-    { title: '准入单位', ellipsis: true, width: 120, dataIndex: 'deptId' },
-    { title: '准入部门', ellipsis: true, width: 120, dataIndex: 'deptId' },
+    { title: '准入单位', ellipsis: true, width: 120, dataIndex: 'orgName' },
+    { title: '准入部门', ellipsis: true, width: 120, dataIndex: 'deptName' },
     { title: '准入方式', ellipsis: true, width: 120, dataIndex: 'accessTypeText' },
     { title: '申请时间', dataIndex: 'createTime', width: 180 },
     { title: '审批状态', ellipsis: true, width: 120, dataIndex: 'approveStatusText' },

src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx

@@ -73,8 +73,8 @@ const SupplierCategoryEntryReview: React.FC = () => {
       render: (_: any, __: any, idx: number) => (((pagination.current ?? 1) - 1) * (pagination.pageSize ?? 10)) + idx + 1,
     },
     { title: '准入工作', dataIndex: 'accessWorkName', ellipsis: true },
-    { title: '准入单位', dataIndex: 'deptId', ellipsis: true },
-    { title: '准入部门', dataIndex: 'deptId', ellipsis: true },
+    { title: '准入单位', dataIndex: 'orgName', ellipsis: true },
+    { title: '准入部门', dataIndex: 'deptName', ellipsis: true },
     { title: '准入方式', dataIndex: 'accessTypeText', width: 120 },
     { title: '申请时间', dataIndex: 'createTime', width: 180 },
     { title: '审批状态', dataIndex: 'approveStatusText', width: 120 },

src/pages/supplier/admission/SupplierEntryReview/index.tsx

@@ -31,12 +31,6 @@ interface ModalInfo {
   record: string | null;
 }
 
-
-const deptOptions = [
-  { label: '全部', value: '' },
-  { label: '采购部', value: 'DEPT001' },
-  { label: '业务部', value: 'DEPT002' },
-];
 interface Dict {
   dicName: string;
   code: string;
@@ -136,7 +130,7 @@ const SupplierEntryReview: React.FC = () => {
     },
     {
       title: '准入部门',
-      dataIndex: 'deptId',
+      dataIndex: 'deptName',
       align: 'center',
       width: 120,
     },

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

@@ -19,6 +19,7 @@ interface Reviewer {
     name: string;
     id: string;
     deptId: string;
+    orgName: string;
 }
 // 传入的人接口
 interface ReviewerSelectorData {

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

@@ -8,6 +8,7 @@ interface Reviewer {
   name: string;
   id: string;
   deptId: string;
+  orgName: string;
 }
 // 传入的人接口
 interface ReviewerSelectorData {

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

@@ -10,6 +10,7 @@ interface Reviewer {
   name: string;
   userId: string;
   deptId: string;
+  orgName: string;
   isLeader: number;
 }
 interface ReviewerSelectorData {
@@ -30,7 +31,8 @@ function orgIdAndDeptId(data:any) {
   const sss = data.map((item:any) => {
     return {
       ...item,
-      deptId: item.orgId
+      deptId: item.orgId,
+      orgName: item.orgName
     }
   })
 
@@ -93,7 +95,7 @@ const ReviewerSelector: React.FC<ReviewerSelectorProps> = ({
   const columns: ColumnsType<Reviewer> = [
     { title: '姓名', dataIndex: 'name' },
     { title: '工号', dataIndex: 'userId' },
-    { title: '部门', dataIndex: 'deptId' },
+    { title: '部门', dataIndex: 'orgName' },
     {
       title: '组长',
       render: (_: any, record: Reviewer) => (

src/pages/supplier/admission/admissionManagement/index.tsx

@@ -92,8 +92,8 @@ const AccessManagement: React.FC = () => {
       render: (_: any, __: any, idx: number) => (((pagination.current ?? 1) - 1) * (pagination.pageSize ?? 10)) + idx + 1,
     },
     { title: '准入工作', ellipsis: true, width: 120, dataIndex: 'accessWorkName' },
-    { title: '准入单位', ellipsis: true, width: 120, dataIndex: 'deptId' },
-    { title: '准入部门', ellipsis: true, width: 120, dataIndex: 'deptId' },
+    { title: '准入单位', ellipsis: true, width: 120, dataIndex: 'orgName' },
+    { title: '准入部门', ellipsis: true, width: 120, dataIndex: 'deptName' },
     { title: '准入方式', ellipsis: true, width: 120, dataIndex: 'accessTypeText' },
     { title: '申请时间', ellipsis: true, width: 180, dataIndex: 'createTime' },
     {

src/pages/supplier/admission/admissionReviewManagement/index.tsx

@@ -99,15 +99,15 @@ const CooperateEnterprise: React.FC = () => {
     },
     {
       title: '发起单位',
-      dataIndex: 'deptId',
-      key: 'deptId',
+      dataIndex: 'orgName',
+      key: 'orgName',
       ellipsis: true,
       width: 120,
     },
     {
       title: '准入部门',
-      dataIndex: 'deptId',
-      key: 'deptId',
+      dataIndex: 'deptName',
+      key: 'deptName',
       ellipsis: true,
       width: 120,
     },