搜索中单位deptId换成orgId

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 = () => {
             <Form.Item name="accessType" label="准入方式">
               <AdmissionTypeSelect/>
             </Form.Item>
-            <Form.Item name="deptId" label="准入单位">
+            <Form.Item name="orgId" label="准入单位">
               <AccessDepartmentSelect placeholder={'请选择准入单位'} />
             </Form.Item>
             <Form.Item name="categoryId" label="准入品类">

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 = () => {
             <Form.Item name="accessType" label="准入方式">
               <AdmissionTypeSelect/>
             </Form.Item>
-            <Form.Item name="deptId" label="准入单位">
+            <Form.Item name="orgId" label="准入单位">
               <AccessDepartmentSelect placeholder={'请选择准入单位'} />
             </Form.Item>
             <Form.Item name="categoryId" label="准入品类">

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 = () => {
             <Form.Item name="accessType" label="准入方式">
               <AdmissionTypeSelect />
             </Form.Item>
-            <Form.Item name="deptId" label="准入单位">
+            <Form.Item name="orgId" label="准入单位">
               <AccessDepartmentSelect placeholder={'请选择准入单位'} />
             </Form.Item>
             <Form.Item name="categoryId" label="准入品类">

src/pages/supplier/category/CategoryLibraryManage/components/CategoryAddModal.tsx

@@ -245,7 +245,7 @@ const CategoryAddModal: React.FC<Props> = ({ visible, onCancel, onSuccess }) =>
             name="applyDeptId"
             rules={[{ required: true, message: '请选择品类库负责人' }]}
           >
-            <AccessDepartmentSelect />
+            <AccessDepartmentSelect  style={{ width: '100%' }} />
           </Form.Item>
           <Form.Item
             label="选择品类"

src/pages/supplier/supplierExit/supplierExitAudit/index.tsx

@@ -40,11 +40,11 @@ const supplierExitAudit: React.FC = () => {
     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 = () => {
             <Form.Item name="exitTheme" label="申请主题">
               <Input placeholder="请输入供应商名称关键字" style={{ width: 150 }} allowClear maxLength={50} />
             </Form.Item>
-            <Form.Item name="deptId" label="发起单位">
+            <Form.Item name="orgId" label="发起单位">
               <AccessDepartmentSelect placeholder={'请选择发起单位'} />
             </Form.Item>
             <Form.Item name="approveStatus" label="审批记录状态">

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;

src/pages/supplier/supplierExit/supplierExitManage/index.tsx

@@ -124,7 +124,7 @@ const supplierExitManage: React.FC = () => {
             <Form.Item name="exitTheme" label="申请主题">
               <Input placeholder="请输入供应商名称关键字" style={{ width: 150 }} allowClear maxLength={50} />
             </Form.Item>
-            <Form.Item name="deptId" label="发起单位">
+            <Form.Item name="orgId" label="发起单位">
               <AccessDepartmentSelect placeholder={'请选择发起单位'} />
             </Form.Item>
             <Form.Item name="approveStatus" label="审批记录状态">