合并代码

src/pages/supplier/informationRetrieval/registrationQuery/index.tsx

@@ -10,7 +10,7 @@ import { useIntl } from 'umi';
 import SupplierViewModal from './components/SupplierViewModal';
 import SupplierDetailModal from './components/SupplierDetailModal';
 //本地服务/接口
-import { systemDict, list } from './services';
+import { getRegisterPage } from './services';
 
 // 列表数据接口
 interface Data {
@@ -63,15 +63,16 @@ const RegistrationQuery: React.FC = () => {
     getList();
   };
   //列表方法
-  const getList = async (page: number = 1, pageSize: number = 10) => {
+  const getList = async (pageNo: number = 1, pageSize: number = 10) => {
     setLoading(true);
     try {
-      const { code, data, msg, total } = await list({ page, pageSize });
+      const values = form.getFieldsValue();
+      const { code, data, message } = await getRegisterPage({ pageNo, pageSize, ...values });
       if (code === 200) {
-        setData(data);
-        setPagination({ current: page, pageSize, total });
+        setData(data.records);
+        setPagination({ current: pageNo, pageSize, total: data.total });
       } else {
-        message.error(msg)      
+        message.error(message)      
       }
     } finally {
       setLoading(false);
@@ -80,19 +81,16 @@ const RegistrationQuery: React.FC = () => {
   //初始化
   useEffect(() => {
     // 境内/境外 下拉
-    systemDict('regionDict').then((res) => {
-      const { code, data } = res;
-      if (code == 200) {
-        setRegionOptions(data)
-      }
-    });
-    // 状态 下拉
-    systemDict('status').then((res) => {
-      const { code, data } = res;
-      if (code == 200) {
-        setStatusOptions(data)
-      }
-    });
+    setRegionOptions([
+      { label: '境内企业', value: 'dvs' },
+      { label: '境外企业', value: 'ovs' },
+    ])
+    //状态 下拉
+    setStatusOptions([
+      { label: '未准入', value: '0' },
+      { label: '已准', value: '1' },
+      { label: '退出', value: '2' },
+    ])
     //列表
     getList();
   }, [])
@@ -104,7 +102,7 @@ const RegistrationQuery: React.FC = () => {
       key: 'index',
       width: 70,
       align: 'center',
-      render: (_: any, __: any, idx: number) => idx + 1,
+      render: (_: any, __: any, idx: number) => (((pagination.current ?? 1) - 1) * (pagination.pageSize ?? 10)) + idx + 1,
     },
     {
       title: '供应商名称',
@@ -119,27 +117,28 @@ const RegistrationQuery: React.FC = () => {
     },
     {
       title: '境内/境外',
-      dataIndex: 'region',
-      key: 'region',
+      dataIndex: 'supplierTypeCn',
+      key: 'supplierTypeCn',
       align: 'center',
     },
     {
       title: '供应商分类',
-      dataIndex: 'supplierType',
-      key: 'supplierType',
+      dataIndex: 'enterpriseTypeCn',
+      key: 'enterpriseTypeCn',
       align: 'center',
       
     },
     {
       title: '注册时间',
-      dataIndex: 'regTime',
-      key: 'regTime',
+      dataIndex: 'createTime',
+      key: 'createTime',
       align: 'center',
+      ellipsis: true,
     },
     {
       title: '状态',
-      dataIndex: 'status',
-      key: 'status',
+      dataIndex: 'accessStatusCn',
+      key: 'accessStatusCn',
       align: 'center',
       render: (val: string) =>
         <span style={{
@@ -174,17 +173,17 @@ const RegistrationQuery: React.FC = () => {
         style={{ marginBottom: 16 }}
       >
         <Form.Item name="name" label="供应商名称">
-          <Input placeholder="请输入供应商名称关键字" style={{ width: 220 }} />
+          <Input placeholder="请输入供应商名称关键字" style={{ width: 220 }} allowClear maxLength={20} />
         </Form.Item>
-        <Form.Item name="region" label="境内/境外">
-          <Select style={{ width: 160 }}>
+        <Form.Item name="supplierType" label="境内/境外">
+          <Select style={{ width: 160 }} placeholder="请选择境内/境外" allowClear>
             {regionOptions.map(opt => (
               <Select.Option key={opt.value} value={opt.value}>{opt.label}</Select.Option>
             ))}
           </Select>
         </Form.Item>
-        <Form.Item name="status" label="状态">
-          <Select style={{ width: 160 }}>
+        <Form.Item name="accessStatus" label="状态">
+          <Select style={{ width: 160 }} placeholder="请选择状态" allowClear>
             {statusOptions.map(opt => (
               <Select.Option key={opt.value} value={opt.value}>{opt.label}</Select.Option>
             ))}