F

src/pages/custom/Edit.jsx

@@ -1,5 +1,5 @@
-import React, { useRef } from 'react'
-import { Button, Card, Form, Input, Select, Row, Col } from 'antd'
+import React, { useRef } from "react";
+import { Button, Card, Form, Input, Select, Row, Col } from "antd";
 import {
   ProForm,
   ProFormDateTimeRangePicker,
@@ -7,56 +7,56 @@ import {
   ProFormSelect,
   ProFormText,
   ProFormRadio,
-} from '@ant-design/pro-components'
-import useBool from '@/utils/hooks/useBool'
-import { useSearchParams, useNavigate } from 'react-router-dom'
-import Page from '@/components/Page'
-import { formItemLayout, tailFormItemLayout } from '@/utils/form'
-import { postTaCustom, putTaCustom, getTaCustomId } from '@/services/taCustom'
-const { Option } = Select
+} from "@ant-design/pro-components";
+import useBool from "@/utils/hooks/useBool";
+import { useSearchParams, useNavigate } from "react-router-dom";
+import Page from "@/components/Page";
+import { formItemLayout, tailFormItemLayout } from "@/utils/form";
+import { postTaCustom, putTaCustom, getTaCustomId } from "@/services/taCustom";
+const { Option } = Select;
 
 export default (props) => {
-  const formRef = useRef()
-  const [submiting, startSubmit, cancelSubmit] = useBool()
+  const formRef = useRef();
+  const [submiting, startSubmit, cancelSubmit] = useBool();
 
-  const [searchParams] = useSearchParams()
-  const navigate = useNavigate()
+  const [searchParams] = useSearchParams();
+  const navigate = useNavigate();
 
-  const id = searchParams.get('id')
+  const id = searchParams.get("id");
 
   React.useEffect(() => {
     if (id) {
       getTaCustomId(id).then((res) => {
-        formRef.current?.setFieldsValue(res)
-      })
+        formRef.current?.setFieldsValue(res);
+      });
     }
-  })
+  });
 
   const onFinish = (values) => {
-    startSubmit()
+    startSubmit();
     if (id) {
       //修改
-      const customId = id
+      const customId = id;
       putTaCustom(id, { customId, ...values })
         .then((res) => {
-          cancelSubmit()
-          navigate(-1)
+          cancelSubmit();
+          navigate(-1);
         })
         .catch(() => {
-          cancelSubmit()
-        })
+          cancelSubmit();
+        });
     } else {
       //新增
       postTaCustom(values)
         .then((res) => {
-          cancelSubmit()
-          navigate(-1)
+          cancelSubmit();
+          navigate(-1);
         })
         .catch(() => {
-          cancelSubmit()
-        })
+          cancelSubmit();
+        });
     }
-  }
+  };
 
   return (
     <Page>
@@ -87,18 +87,23 @@ export default (props) => {
           <ProFormText name="account" label="客户账号" />
           <ProFormText name="contactsName" label="联系人姓名" />
           <ProFormText name="contactsTitle" label="联系人头衔" />
-          <ProFormText name="contactsPhone" label="联系人手机" />
+          <ProFormText
+            name="contactsPhone"
+            label="联系人手机"
+            maxlength={11}
+            type="number"
+          />
           <ProFormText name="contactsEmail" label="联系人邮箱" />
           <ProFormRadio.Group
             name="isOrg"
             label="是否企业"
             options={[
-              { label: '否', value: 0 },
-              { label: '是', value: 1 },
+              { label: "否", value: 0 },
+              { label: "是", value: 1 },
             ]}
           />
         </ProForm>
       </Card>
     </Page>
-  )
-}
+  );
+};

src/pages/custom/index.jsx

@@ -5,8 +5,11 @@ import { ProTable } from "@ant-design/pro-components";
 import { queryTable } from "@/utils/request";
 import { getTaCustom, deleteTaCustom } from "@/services/taCustom";
 import Page from "@/components/Page";
-
-const customList = queryTable(getTaCustom);
+import List from "@/components/Page/List";
+import {
+  postTaMemberCardIdActive,
+  putTaMemberCardIdWrite,
+} from "@/services/taMemberCard";
 
 export default (props) => {
   const actionRef = React.useRef();
@@ -20,11 +23,10 @@ export default (props) => {
     }
   };
 
-
   const columns = [
     {
-      title: '客户名',
-      dataIndex: 'customName',
+      title: "客户名",
+      dataIndex: "customName",
       ellipsis: true,
     },
     {
@@ -49,8 +51,8 @@ export default (props) => {
       ellipsis: true,
     },
     {
-      title: '联系人头衔',
-      dataIndex: 'contactsTitle',
+      title: "联系人头衔",
+      dataIndex: "contactsTitle",
       ellipsis: true,
       search: false,
     },
@@ -71,13 +73,13 @@ export default (props) => {
       ellipsis: true,
     },
     {
-      title: '是否企业',
-      dataIndex: 'isOrg',
+      title: "是否企业",
+      dataIndex: "isOrg",
       ellipsis: true,
-      valueType: 'select',
+      valueType: "select",
       valueEnum: {
-        0: '否',
-        1: '是',
+        0: "否",
+        1: "是",
       },
     },
     // {
@@ -91,55 +93,28 @@ export default (props) => {
     //   ellipsis: true,
     //   search: false,
     // },
-    {
-      title: "操作",
-      valueType: "option",
-      width: 200,
-      render: (_, record) => [
+  ];
+
+
+  return (
+    <List
+      actionRef={actionRef}
+      rowKey="customId"
+      onDelete={(record) => handleDelete(record?.customId)}
+      onEdit={(record) => navigate(`/custom/edit?id=${record?.customId}`)}
+      toolBarRender={() => [
         <Button
-          key={3}
-          style={{ padding: 0 }}
-          type="link"
+          key="1"
+          type="primary"
           onClick={() => {
-            navigate(`/custom/edit?id=${record.customId}`);
+            navigate("/custom/edit");
           }}
         >
-          编辑
+          新增
         </Button>,
-        <Popconfirm
-          key={4}
-          title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record.customId)}
-          okText="确定"
-          cancelText="取消"
-        >
-          <Button style={{ padding: 0 }} type="link">
-            删除
-          </Button>
-        </Popconfirm>,
-      ],
-    },
-  ];
-
-  return (
-    <Page>
-      <ProTable
-        actionRef={actionRef}
-        rowKey="customId"
-        toolBarRender={() => [
-          <Button
-            key="1"
-            type="primary"
-            onClick={() => {
-              navigate("/custom/edit");
-            }}
-          >
-            新增
-          </Button>,
-        ]}
-        request={customList}
-        columns={columns}
-      />
-    </Page>
+      ]}
+      request={getTaCustom}
+      columns={columns}
+    />
   );
 };

src/pages/member/index.jsx

@@ -3,6 +3,7 @@ import { getTaMember } from "@/services/taMember";
 import List from "@/components/Page/List";
 import moment from "moment";
 import { useNavigate } from "react-router-dom";
+import { Button, Popconfirm } from "antd";
 export default (props) => {
   const navigate = useNavigate();
 
@@ -58,11 +59,44 @@ export default (props) => {
 
     },
   ];
+  const onActive = (record) => {
+    // postTaMemberCardIdActive().then((res) => {});
+  };
+  const onWrite = (record) => {
+    // putTaMemberCardIdWrite().then((res) => {});
+  };
+
+  const ColumnOptionRender = (_, record) => [
+    <Popconfirm
+      key="A3"
+      title="您是否确认发卡?"
+      onConfirm={() => onActive(record.customId)}
+      okText="确定" 
+      cancelText="取消"
+    >
+      <Button style={{ padding: 0 }} type="link">
+        发卡
+      </Button>
+    </Popconfirm>,
+    <Popconfirm
+      key="A2"
+      title="您是否确认核销卡?"
+      onConfirm={() => onWrite(record.customId)}
+      okText="确定"
+      cancelText="取消"
+    >
+      <Button style={{ padding: 0 }} type="link">
+        核销卡
+      </Button>
+    </Popconfirm>,
+  ];
   return (
     <List
       // actionRef={actionRef}
       rowKey="memberId"
       onEdit={(record) => navigate(`/member/edit?id=${record.memberId}`)}
+      columnOptionRender={ColumnOptionRender}
+
       // onDelete={(record) => handleDelete(record.memberId)}
       // toolBarRender={() => [
       //   <Button