Merge branch 'v2' of http://git.ycjcjy.com/yunzhi/crm_pc into v2

src/pages/member/components/ModalNewCard.jsx

@@ -0,0 +1,70 @@
+import { postTaMemberCardIdActive } from "@/services/taMemberCard";
+import { getTaPackage } from "@/services/taPackage";
+import { queryDict } from "@/utils/request";
+import {
+  ProForm,
+  ProFormSelect,
+  ProFormText,
+} from "@ant-design/pro-components";
+import { Form, Modal } from "antd";
+import { useForm } from "antd/lib/form/Form";
+import React from "react";
+export default (props) => {
+  const { isModalOpen, setIsModalOpen } = props;
+  const formRef = React.useRef();
+
+  const packageList = queryDict(getTaPackage, {
+    labelKey: "packageName",
+    valueKey: "packageId",
+  });
+  // const [form] = Form.useForm();
+
+  const handleOk = () => {
+    setIsModalOpen(false);
+  };
+
+  const handleCancel = () => {
+    setIsModalOpen(false);
+  };
+
+  // React.useEffect(() => {
+  //   formRef?.current?.resetFields();
+
+  //   if (Object.keys(recordMap).length > 0) {
+  //     formRef?.current?.setFieldsValue(recordMap);
+  //   }
+  // }, [recordMap]);
+
+  const onFinish = () => {
+    formRef?.current?.validateFieldsReturnFormatValue?.().then((x) => {
+      // const memberId = formRef?.current?.getFieldValue("memberId");
+      const data = {
+        ...x,
+        // memberId: memberId,
+      };
+      console.log(data);
+      postTaMemberCardIdActive(data).then((res) => {});
+    });
+  };
+  return (
+    <Modal
+      title="会员开卡"
+      open={isModalOpen}
+      onOk={handleOk}
+      onCancel={handleCancel}
+      footer={null}
+    >
+      <ProForm formRef={formRef} onFinish={onFinish}>
+        <ProFormText name="memberName" label="会员姓名" />
+        <ProFormText name="phone" label="手机号" />
+        <ProFormSelect
+          required
+          name="packageId"
+          label="选择套餐"
+          request={packageList}
+          rules={[{ required: true, message: "请选择套餐" }]}
+        />
+      </ProForm>
+    </Modal>
+  );
+};

src/pages/member/index.jsx

@@ -3,9 +3,12 @@ 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";
+import { Button, Modal, Popconfirm } from "antd";
+import ModalNewCard from "./components/ModalNewCard";
+import { putTaMemberCardIdWrite } from "@/services/taMemberCard";
 export default (props) => {
   const navigate = useNavigate();
+  const [isModalOpen, setIsModalOpen] = React.useState(false);
 
   const columns = [
     {
@@ -56,61 +59,60 @@ export default (props) => {
     {
       title: "状态",
       dataIndex: "status",
-
     },
   ];
-  const onActive = (record) => {
-    // postTaMemberCardIdActive().then((res) => {});
+  const onModalNewCard = (record) => {
+
+    setIsModalOpen(true);
   };
-  const onWrite = (record) => {
+  const onWrite = (id) => {
     // 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
-      //     key="1"
-      //     type="primary"
-      //     onClick={() => {
-      //       navigate("/member/edit");
-      //     }}
-      //   >
-      //     新增
-      //   </Button>,
-      // ]}
-      request={getTaMember}
-      columns={columns}
-    />
+    <>
+      <List
+        // actionRef={actionRef}
+        rowKey="memberId"
+        onEdit={(record) => navigate(`/member/edit?id=${record.memberId}`)}
+        columnOptionRender={(_, record) => [
+          <Popconfirm
+            key="A2"
+            title="您是否确认核销卡?"
+            onConfirm={() => onWrite(record.memberId)}
+            okText="确定"
+            cancelText="取消"
+            disabled={!record.taMemberCardList?.length}
+          >
+            <Button
+              style={{ padding: 0 }}
+              type="link"
+              disabled={!record.taMemberCardList?.length}
+            >
+              核销卡
+            </Button>
+          </Popconfirm>,
+        ]}
+        request={getTaMember}
+        columns={columns}
+        toolBarRender={(record) => {
+          return [
+            <Button
+              key="1"
+              type="primary"
+              onClick={() => {
+                onModalNewCard(record);
+              }}
+            >
+              开卡
+            </Button>,
+          ];
+        }}
+      />
+      <ModalNewCard
+        isModalOpen={isModalOpen}
+        setIsModalOpen={setIsModalOpen}
+      />
+    </>
   );
 };

src/services/taMemberCard.js

@@ -34,10 +34,10 @@ export const deleteTaMemberCardId = (id) =>
   /**
    * 开卡
    */
-  export const postTaMemberCardIdActive = (cardId) =>
-  request(`/taMemberCard/${cardId}/active`, { method: "post" });
+  export const postTaMemberCardIdActive = (data) =>
+  request(`/taMemberCard/active`, { method: "post",data });
 
   /**
    * 核销卡
-   */ export const putTaMemberCardIdWrite = (cardId) =>
-  request(`/taMemberCard/${cardId}/write`, { method: "post" });
+   */ export const putTaMemberCardIdWrite = (memberId) =>
+  request(`/taMemberCard/${memberId}/write`, { method: "post",data });