BUG修改

src/components/TreeCategorySelector/index.tsx

@@ -259,7 +259,6 @@ const TreeCategorySelector: React.FC<Props> = ({
       const next = valueArray.length ? valueArray[0] : null;
       if (selectedKey !== next) setSelectedKey(next);
     }
-    setSearch('');
     setDisplayTree(origin);
     setAutoExpandParent(true);
   }, [open, multiple, valueArray, origin]);
@@ -467,7 +466,7 @@ const TreeCategorySelector: React.FC<Props> = ({
         width={720}
         footer={multiple ? undefined : null}
       >
-        <Spin spinning={loading}>
+        
           <Search
             allowClear
             placeholder="请输入品类名称"
@@ -476,6 +475,7 @@ const TreeCategorySelector: React.FC<Props> = ({
             value={search}
             style={{ marginBottom: 8 }}
           />
+          <Spin spinning={loading}>
           <div
             style={{
               height,

src/pages/supplier/ViewReviewPage/components/ViewModal.tsx

@@ -34,6 +34,7 @@ interface coscoAccessSupplierLists {
 interface coscoAccessWorks {
   deptId: string;
   deptName: string;
+  orgName: string;
   startTime: string;
   endTime: string;
   reviewStatusText: string;
@@ -79,6 +80,7 @@ const ViewModal: React.FC<{
       <Spin spinning={loading}>
         {data && (
           <Descriptions bordered column={1} labelStyle={{ width: 160 }}>
+            <Descriptions.Item label="准入单位">{data.coscoAccessWork.orgName}</Descriptions.Item>
             <Descriptions.Item label="准入部门">{data.coscoAccessWork.deptName}</Descriptions.Item>
             <Descriptions.Item label="准入供应商">
               {data.coscoAccessSupplierList.map((item) => {

src/pages/supplier/informationManagement/SupplierChangeReviewManage/index.tsx

@@ -58,9 +58,9 @@ const SupplierChangeReviewManage: React.FC<Props> = ({ dispatch }) => {
     setLoading(true);
     try {
       const values = form.getFieldsValue();
-      const { changeTime } = values;
-      const startTime = changeTime ? moment(changeTime[0]).format('YYYY-MM-DD') : '';
-      const endTime = changeTime ? moment(changeTime[1]).format('YYYY-MM-DD') : '';
+      const { Time } = values;
+      const startTime = Time ? moment(Time[0]).format('YYYY-MM-DD') : '';
+      const endTime = Time ? moment(Time[1]).format('YYYY-MM-DD') : '';
 
       const { code, data, message } = await getPage({
         pageNo: pagination.current,
@@ -242,7 +242,7 @@ const SupplierChangeReviewManage: React.FC<Props> = ({ dispatch }) => {
                 ))}
               </Select>
             </Form.Item>
-            <Form.Item name="changeTime" label="提交变更时间">
+            <Form.Item name="Time" label="提交变更时间">
               <RangePicker style={{ width: 220 }} />
             </Form.Item>
 

src/pages/supplier/informationManagement/SupplierRegisterAgent/index.tsx

@@ -34,20 +34,20 @@ const SupplierRegisterAgent: React.FC = () => {
   const [currentRecord, setCurrentRecord] = useState('');
   // 新增与修改
   const [exitModalVisible, setExitModalVisible] = useState(false);
-  const [exitId, setExitId] = useState('');
+  // const [exitId, setExitId] = useState('');
   const supplierDetailModal = useSupplierDetailModal();
 
   // 查询数据
   const fetchData = async (page = 1, pageSize = 10) => {
     setLoading(true);
     // 获取表单参数
-    const { keyword, dateRange } = form.getFieldsValue();
+    const { name, dateRange } = form.getFieldsValue();
     let params: any = {
       pageNo: page,
       pageSize,
+      name,
       supplierType: tabKey,
     };
-    if (keyword) params.keyword = keyword;
     if (dateRange && dateRange.length === 2) {
       params.startDate = dateRange[0].format('YYYY-MM-DD');
       params.endDate = dateRange[1].format('YYYY-MM-DD');
@@ -95,10 +95,6 @@ const SupplierRegisterAgent: React.FC = () => {
     form.resetFields();
     fetchData(1, pagination.pageSize);
   };
-  // 切页
-  const handleTableChange = (pag: any) => {
-    fetchData(pag.current, pag.pageSize);
-  };
 
   // 列 境内
   const columnsDvs: ColumnsType<Columns> = [
@@ -202,7 +198,7 @@ const SupplierRegisterAgent: React.FC = () => {
     {
       title: '创建单位',
       dataIndex: 'orgName',
-      align: 'center',  
+      align: 'center',
       width: 120,
       ellipsis: true,
     },
@@ -346,7 +342,9 @@ const SupplierRegisterAgent: React.FC = () => {
         rowKey="id"
         loading={loading}
         pagination={{ ...tableProps.pagination, total: pagination.total }}
-        onChange={(current, pageSize) => handleTableChange({ current, pageSize })}
+        onChange={(pagination) => {
+          fetchData(pagination.current, pagination.pageSize);
+        }}
         style={{ flex: 1, minHeight: 0 }}
         scroll={{ y: 'calc(100vh - 350px)' }}
       />
@@ -358,7 +356,7 @@ const SupplierRegisterAgent: React.FC = () => {
       />
       <SupplierExitModal
         visible={exitModalVisible}
-        exitId={exitId}
+        exitId={''}
         onOk={() => {
           fetchData(1, pagination.pageSize);
           setExitModalVisible(false)

src/pages/supplier/informationManagement/SupplierRegisterAgent/services.ts

@@ -5,11 +5,7 @@ import request from '@/utils/request';
  * 供应商变更审批管理分页列表
  */
 interface getPageAgent {
-  pageNo: number;
-  pageSize: number;
-  accessStatus?: string;
-  name?: string;
-  supplierType?: string;
+ pageNo: number; pageSize: number; name: string; supplierType: string; startDate:string; endDate:string;
 }
 export const getPageAgent = (data: getPageAgent) => request.post('/coscoSupplierBase/getPageAgent', { data });