Selaa lähdekoodia

Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

傅行帆 5 vuotta sitten
vanhempi
commit
2dbc37906f
1 muutettua tiedostoa jossa 31 lisäystä ja 13 poistoa
  1. 31
    13
      src/pages/record/drainage/DrainageVisitRecordList.jsx

+ 31
- 13
src/pages/record/drainage/DrainageVisitRecordList.jsx Näytä tiedosto

38
    */
38
    */
39
 
39
 
40
   const columns = [
40
   const columns = [
41
-    {
42
-      title: '活动编号',
43
-      dataIndex: 'targetId',
44
-      key: 'targetId',
45
-      align: 'center',
46
-    },
47
     {
41
     {
48
       title: '活动名称',
42
       title: '活动名称',
49
       dataIndex: 'activityName',
43
       dataIndex: 'activityName',
81
       key: 'shareTel',
75
       key: 'shareTel',
82
       align: 'center',
76
       align: 'center',
83
     },
77
     },
78
+    {
79
+      title: '分享者类型',
80
+      dataIndex: 'personType',
81
+      key: 'personType',
82
+      align: 'center',
83
+      render: (text, record) => <span>{record.consultantId === null || record.consultantId === '' ? '普通客户' : '置业顾问'}</span>,
84
+    },
84
   ];
85
   ];
85
   
86
   
86
 
87
 
111
 
112
 
112
     <>
113
     <>
113
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
114
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
114
-      <Form.Item>
115
-          {getFieldDecorator('drainageId')(
116
-            <Input
117
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
118
-              placeholder="H5活动编号"
119
-            />,
115
+        <Form.Item>
116
+          {getFieldDecorator('buildingId')(
117
+            <BuildSelect />,
118
+          )}
119
+        </Form.Item>
120
+        <Form.Item>
121
+          {getFieldDecorator('eventType')(
122
+            <Select placeholder="分享类型" style={{ width: 150 }}>
123
+            <Option value="activity">报名活动</Option>
124
+            <Option value="help">助力活动</Option>
125
+            <Option value="group">拼团活动</Option>
126
+            <Option value="h5">H5活动</Option>
127
+            <Option value="building">项目</Option>
128
+            <Option value="news">资讯</Option>
129
+          </Select>
120
           )}
130
           )}
121
         </Form.Item>
131
         </Form.Item>
122
         <Form.Item>
132
         <Form.Item>
123
           {getFieldDecorator('activityName')(
133
           {getFieldDecorator('activityName')(
124
             <Input
134
             <Input
125
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
135
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
126
-              placeholder="H5活动名称"
136
+              placeholder="分享标题"
127
             />,
137
             />,
128
           )}
138
           )}
129
         </Form.Item>
139
         </Form.Item>
135
             />,
145
             />,
136
           )}
146
           )}
137
         </Form.Item>
147
         </Form.Item>
148
+        <Form.Item>
149
+          {getFieldDecorator('personType')(
150
+             <Select placeholder="分享者类型" style={{ width: 150 }}>
151
+             <Option value="Realty Consultant">置业顾问</Option>
152
+             <Option value="customer">普通客户</Option>
153
+           </Select>
154
+          )}
155
+        </Form.Item>
138
         <Form.Item>
156
         <Form.Item>
139
           {getFieldDecorator('shareTel')(
157
           {getFieldDecorator('shareTel')(
140
             <Input
158
             <Input