张涛 1 year ago
parent
commit
98dc8eaaf3
2 changed files with 40 additions and 7 deletions
  1. 38
    4
      src/pages/member/components/ModalNewCard.jsx
  2. 2
    3
      src/pages/member/index.jsx

+ 38
- 4
src/pages/member/components/ModalNewCard.jsx View File

35
 
35
 
36
   const onFinish = () => {
36
   const onFinish = () => {
37
     formRef?.current?.validateFieldsReturnFormatValue?.().then((x) => {
37
     formRef?.current?.validateFieldsReturnFormatValue?.().then((x) => {
38
-     
39
       if (modalTitle == "核销卡") {
38
       if (modalTitle == "核销卡") {
40
         // 核销卡
39
         // 核销卡
41
         putTaMemberCardIdWrite(x.cardId)
40
         putTaMemberCardIdWrite(x.cardId)
47
       }
46
       }
48
     });
47
     });
49
   };
48
   };
49
+  const Pro = () => {
50
+    return (
51
+      <>
52
+        <ProFormText
53
+          required
54
+          name="phone"
55
+          label="手机号"
56
+          rules={[{ required: true, message: "请输入手机号" }]}
57
+        />
58
+        <ProFormSelect
59
+          name="sex"
60
+          label="性别"
61
+          options={[
62
+            {
63
+              value: 1,
64
+              label: "男",
65
+            },
66
+            {
67
+              value: 2,
68
+              label: "女",
69
+            },
70
+            {
71
+              value: 9,
72
+              label: "未知",
73
+            },
74
+          ]}
75
+        />
76
+      </>
77
+    );
78
+  };
50
   return (
79
   return (
51
     <Modal
80
     <Modal
52
       title={modalTitle}
81
       title={modalTitle}
62
               <>
91
               <>
63
                 {form.getFieldValue("memberId") ? (
92
                 {form.getFieldValue("memberId") ? (
64
                   <>
93
                   <>
65
-                    <ProFormText name="phone" label="手机号" />
94
+                    <Pro />
66
                     <SelectCardModal cardList={modalObj?.taMemberCardList} />
95
                     <SelectCardModal cardList={modalObj?.taMemberCardList} />
67
                   </>
96
                   </>
68
                 ) : (
97
                 ) : (
69
                   <>
98
                   <>
70
-                    <ProFormText name="memberName" label="会员姓名" />
71
-                    <ProFormText name="phone" label="手机号" />
99
+                    <ProFormText
100
+                      required
101
+                      name="memberName"
102
+                      label="会员姓名"
103
+                      rules={[{ required: true, message: "请输入名称" }]}
104
+                    />
105
+                    <Pro />
72
                     <SelectPackageModal />
106
                     <SelectPackageModal />
73
                   </>
107
                   </>
74
                 )}
108
                 )}

+ 2
- 3
src/pages/member/index.jsx View File

34
     {
34
     {
35
       title: "生日",
35
       title: "生日",
36
       dataIndex: "birthDay",
36
       dataIndex: "birthDay",
37
-      render: (_, r) => {
38
-        return r.birthDay ? moment(r.birthDay).format("YYYY-MM-DD") : "";
39
-      },
37
+      render: (_, r) =>
38
+        r.birthDay ? moment(r.birthDay).format("YYYY-MM-DD") : "",
40
       search: false,
39
       search: false,
41
     },
40
     },
42
     {
41
     {