Merge branch 'dev' of http://59.110.10.99:53000/liuc/fe_supplier_frontend into dev

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

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Modal, Form, Select, Button, Tree, message, Input } from 'antd';
 //组件
 import SupplierSelector from './SupplierSelector';
+import AccessDepartmentSelect from '@/components/AccessDepartmentSelect';
 // 请求
 import { categoryTree, add } from '../services';
 const { Option } = Select;
@@ -143,10 +144,7 @@ const CreateModal: React.FC<{ visible: boolean; onCancel: () => void; }> = ({ vi
                     name="deptId"
                     rules={[{ required: true, message: '请选择准入部门' }]}
                 >
-                    <Select placeholder="请选择部门">
-                        <Option value="DEPT001">部门A</Option>
-                        <Option value="DEPT001">部门B</Option>
-                    </Select>
+                    <AccessDepartmentSelect />
                 </Form.Item>
 
 

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

@@ -6,6 +6,7 @@ import type { ColumnsType } from 'antd/es/table';
 import { getApprovePage } from './services';
 import { getDictList } from '@/servers/api/dicts'
 //组件
+import AccessDepartmentSelect from '@/components/AccessDepartmentSelect';
 import ViewModal from './components/ViewModal';
 //统一列表分页
 import tableProps from '@/utils/tableProps'
@@ -218,7 +219,7 @@ const SupplierEntryReview: React.FC = () => {
             </Select>
           </Form.Item>
           <Form.Item name="deptId" label="准入部门">
-            <Select options={deptOptions} allowClear style={{ width: 120 }} placeholder="请选择准入部门" />
+            <AccessDepartmentSelect />
           </Form.Item>
 
           <Form.Item name="approveStatus" label="审批状态">

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

@@ -9,6 +9,8 @@ import DivisionModal from './DivisionModal';
 // 请求
 import { categoryTree, add, uploadFile } from '../services';
 
+import AccessDepartmentSelect from '@/components/AccessDepartmentSelect';
+
 const { Option } = Select;
 const { RangePicker } = DatePicker;
 //selected 类型
@@ -276,10 +278,7 @@ const CreateModal: React.FC<{ visible: boolean; onCancel: () => void; }> = ({ vi
                     name="deptId"
                     rules={[{ required: true, message: '请选择准入部门' }]}
                 >
-                    <Select placeholder="请选择部门">
-                        <Option value="DEPT001">部门A</Option>
-                        <Option value="DEPT001">部门B</Option>
-                    </Select>
+                   <AccessDepartmentSelect />
                 </Form.Item>
 
                 <Form.Item

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

@@ -150,8 +150,8 @@ const AccessManagement: React.FC = () => {
             <Form.Item name="categoryId" label="准入品类">
               <CategorySelector multiple={false} style={{ width: 150 }} />
             </Form.Item>
-            <Form.Item name="approveStatus" label="评审状态">
-              <Select style={{ width: 150 }} placeholder="请选择评审状态" allowClear>
+            <Form.Item name="approveStatus" label="审批状态">
+              <Select style={{ width: 150 }} placeholder="请选择审批状态" allowClear>
                 <Option value="0">未开始</Option>
                 <Option value="1">进行中</Option>
                 <Option value="2">结果汇总中</Option>

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

@@ -3,7 +3,7 @@ import { Modal, Form, Input, DatePicker, Button, Tree, Select, message, Spin, Up
 import { UploadOutlined } from '@ant-design/icons';
 import { categoryTree, uploadFile, superiorLockList, getSupplierPage, library, libraryData } from '../services';
 import type { UploadFile } from 'antd/es/upload/interface';
-
+import AccessDepartmentSelect from '@/components/AccessDepartmentSelect';
 import { getregionInternational } from '@/servers/api/register';
 const { Option } = Select;
 
@@ -239,14 +239,7 @@ const CategoryAddModal: React.FC<Props> = ({ visible, onCancel, onSuccess }) =>
             name="applyDeptId"
             rules={[{ required: true, message: '请选择品类库负责人' }]}
           >
-            <Select
-              placeholder="请选择品类库负责人"
-              style={{ width: 260 }}
-              options={deptOptions.map(item => ({
-                label: item.deptId,
-                value: item.deptId,
-              }))}
-            />
+            <AccessDepartmentSelect />
           </Form.Item>
           <Form.Item
             label="选择品类"

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

@@ -203,7 +203,9 @@ const SupplierAddModal: React.FC<{
             showQuickJumper: true,
             onChange: (page, pageSize) => handleTableChange({ current: page, pageSize }),
           }}
-          bordered
+          style={{ flex: 1, minHeight: 0 }}
+          scroll={{ y: 'calc(100vh - 650px)' }}
+
         />
       </Spin>
     </Modal>

src/pages/supplier/category/SupplierEntryManage/components/SupplierAddModal.tsx

@@ -220,7 +220,8 @@ const SupplierAddModal: React.FC<{
             showQuickJumper: true,
             onChange: (page, pageSize) => handleTableChange({ current: page, pageSize }),
           }}
-          bordered
+          style={{ flex: 1, minHeight: 0 }}
+          scroll={{ y: 'calc(100vh - 650px)' }}
         />
       </Spin>
     </Modal>

src/pages/supplier/category/SupplierEntryReview/components/ViewModal.tsx

@@ -140,7 +140,8 @@ const ViewModal: React.FC<{
                 dataSource={categoryInfo.coscoCategoryLibrarySupplierVos}
                 rowKey="id"
                 pagination={false}
-                bordered
+                style={{ flex: 1, minHeight: 0 }}
+                scroll={{ y: 'calc(100vh - 650px)' }}
             />