Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js

src/components/AttachmentUpload/index.js

@@ -21,7 +21,7 @@ export default function AttachmentUpload({ name, label, disabled = false, maxCou
             fileList: value
               ? value.split(",").map((item) => ({
                   url: item,
-                  uid: item,
+                 uid: item,
                   status: "done",
                   name: "附件",
                 }))

src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js

@@ -1,5 +1,16 @@
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
-import { Button, DatePicker, Form, Input, message, Modal, Row, Col, Select, Table } from "antd";
+import {
+  Button,
+  DatePicker,
+  Form,
+  Input,
+  message,
+  Modal,
+  Row,
+  Col,
+  Select,
+  Table,
+} from "antd";
 import { useEffect, useRef, useState } from "react";
 import dayjs from "dayjs";
 import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout";

src/pages/Container/Supervision/BasicInfo/OrgAccount/index.js

@@ -1,26 +1,21 @@
 import {
-  Button, Descriptions, Form, Input, InputNumber, message, Modal, Row, Col, Select, Space, Tag,
+  Button, DatePicker, Descriptions, Form, Input, InputNumber, message, Modal, Row, Col, Select, Space, Tag, Table,
 } from "antd";
+import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { useEffect, useState } from "react";
 import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout";
-import Search from "zy-react-library/components/Search";
+import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm";
-import Table from "zy-react-library/components/Table";
+import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper";
-import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
-import useTable from "zy-react-library/hooks/useTable";
 import { isOrgAccountEnabled } from "~/api/enterpriseInfo/adapter";
 import {
   CHONGQING_DISTRICTS,
   ENTERPRISE_SCALE_OPTIONS,
-  ENTERPRISE_STATUS_OPTIONS,
   ORG_ACCOUNT_STATE_OPTIONS,
+  ENTERPRISE_STATUS_OPTIONS
 } from "~/enumerate/enterpriseOptions";
 import { NS_ORG_INFO } from "~/enumerate/namespace";
 import { safeListRequest, safeRequest } from "~/utils";
-import { formSelectField } from "~/utils/enterpriseForm";
-
-const SEARCH_COL = { xs: 24, sm: 12, md: 8, lg: 6 };
-const SEARCH_DEFAULT_VALUES = { state: "" };
 
 function OrgAccountPage(props) {
   const [searchForm] = Form.useForm();
@@ -32,8 +27,21 @@ function OrgAccountPage(props) {
   const [rawDetail, setRawDetail] = useState(null);
   const [detailLoading, setDetailLoading] = useState(false);
   const [editLoading, setEditLoading] = useState(false);
+  const [dataSource, setDataSource] = useState([]);
+  const [total, setTotal] = useState(0);
+  const [loading, setLoading] = useState(false);
 
-  const { tableProps, getData } = useTable(safeListRequest(props.orgAccountList), { form: searchForm });
+  const getData = async () => {
+    setLoading(true);
+    try {
+      const params = searchForm.getFieldsValue();
+      const res = await safeListRequest(props.orgAccountList)(params);
+      setDataSource(res?.data || []);
+      setTotal(res?.total || 0);
+    } finally {
+      setLoading(false);
+    }
+  };
 
   useEffect(() => {
     getData();
@@ -162,6 +170,37 @@ function OrgAccountPage(props) {
     }
   };
 
+  const columns = [
+    { title: "机构名称", dataIndex: "orgName", ellipsis: true },
+    { title: "属地", dataIndex: "district", width: 100 },
+    {
+      title: "状态",
+      width: 80,
+      render: (_, record) => (
+        <Tag color={isOrgAccountEnabled(record) ? "success" : "error"}>
+          {isOrgAccountEnabled(record) ? "启用" : "禁用"}
+        </Tag>
+      ),
+    },
+    { title: "开户时间", dataIndex: "createTime", width: 110 },
+    {
+      title: "操作",
+      width: 320,
+      fixed: "right",
+      render: (_, record) => (
+        <TableAction>
+          <Button type="link" size="small" onClick={() => openView(record.id)}>查看</Button>
+          <Button type="link" size="small" onClick={() => openEdit(record.id)}>编辑</Button>
+          <Button type="link" size="small" onClick={() => onResetPassword(record)}>重置密码</Button>
+          <Button type="link" size="small" danger onClick={() => onDelete(record)}>删除</Button>
+          <Button type="link" size="small" onClick={() => onToggleStatus(record)}>
+            {isOrgAccountEnabled(record) ? "禁用" : "启用"}
+          </Button>
+        </TableAction>
+      ),
+    },
+  ];
+
   return (
     <PageLayout
       title={
@@ -173,60 +212,55 @@ function OrgAccountPage(props) {
         </div>
       }
     >
-      <Search
+      <SearchForm
+        style={{ marginBottom: 24 }}
         form={searchForm}
-        values={SEARCH_DEFAULT_VALUES}
+        loading={loading}
-        options={[
+        formLine={[
-          { name: "orgName", label: "机构名称", placeholder: "关键字搜索", colProps: SEARCH_COL },
+          <Form.Item key="orgName" name="orgName">
-          formSelectField("district", "属地", CHONGQING_DISTRICTS, {
+            <ControlWrapper.Input label="机构名称" placeholder="关键字搜索" allowClear />
-            colProps: SEARCH_COL,
+          </Form.Item>,
-            placeholder: "请选择属地",
+          <Form.Item key="district" name="district">
-          }),
+            <ControlWrapper.Select label="属地" placeholder="请选择属地" allowClear>
-          formSelectField("state", "状态", ORG_ACCOUNT_STATE_OPTIONS, {
+              {CHONGQING_DISTRICTS.map((opt) => (
-            colProps: SEARCH_COL,
+                <Select.Option key={opt.value} value={opt.value}>{opt.label}</Select.Option>
-            componentProps: { allowClear: false, showSearch: false },
+              ))}
-          }),
+            </ControlWrapper.Select>
-          {
+          </Form.Item>,
-            name: "openTimeRange",
+          <Form.Item key="state" name="state">
-            label: "开户时间",
+            <ControlWrapper.Select label="状态" placeholder="请选择状态">
-            render: FORM_ITEM_RENDER_ENUM.DATE_RANGE,
+              {ORG_ACCOUNT_STATE_OPTIONS.map((opt) => (
-            colProps: { ...SEARCH_COL, lg: 8 },
+                <Select.Option key={opt.value} value={opt.value}>{opt.label}</Select.Option>
-          },
+              ))}
+            </ControlWrapper.Select>
+          </Form.Item>,
+          <Form.Item key="openTimeRange" name="openTimeRange">
+            <ControlWrapper.DatePicker.RangePicker label="开户时间" />
+          </Form.Item>,
         ]}
-        onFinish={getData}
+        onReset={() => {
+          searchForm.resetFields();
+          getData();
+        }}
+        onFinish={() => getData()}
       />
       <Table
-        {...tableProps}
+        rowKey="id"
-        columns={[
+        columns={columns}
-          { title: "机构名称", dataIndex: "orgName", ellipsis: true },
+        dataSource={dataSource}
-          { title: "属地", dataIndex: "district", width: 100 },
+        scroll={{ y: props.scrollY }}
-          {
+        loading={loading}
-            title: "状态",
+        pagination={{
-            width: 80,
+          total,
-            render: (_, record) => (
+          showSizeChanger: true,
-              <Tag color={isOrgAccountEnabled(record) ? "success" : "error"}>
+          showQuickJumper: true,
-                {isOrgAccountEnabled(record) ? "启用" : "禁用"}
+          showTotal: (t) => `共 ${t} 条`,
-              </Tag>
+          current: 1,
-            ),
+          pageSize: 10,
+          onChange: (page, pageSize) => {
+            getData();
           },
-          { title: "开户时间", dataIndex: "createTime", width: 110 },
+        }}
-          {
-            title: "操作",
-            width: 320,
-            fixed: "right",
-            render: (_, record) => (
-              <Space size={0} wrap>
-                <Button type="link" size="small" onClick={() => openView(record.id)}>查看</Button>
-                <Button type="link" size="small" onClick={() => openEdit(record.id)}>编辑</Button>
-                <Button type="link" size="small" onClick={() => onResetPassword(record)}>重置密码</Button>
-                <Button type="link" size="small" danger onClick={() => onDelete(record)}>删除</Button>
-                <Button type="link" size="small" onClick={() => onToggleStatus(record)}>
-                  {isOrgAccountEnabled(record) ? "禁用" : "启用"}
-                </Button>
-              </Space>
-            ),
-          },
-        ]}
       />
 
       <Modal
@@ -347,4 +381,4 @@ function OrgAccountPage(props) {
   );
 }
 
-export default Connect([NS_ORG_INFO], true)(OrgAccountPage);
+export default Connect([NS_ORG_INFO], true)(OrgAccountPage);