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

src/pages/record/drainage/DrainageVisitRecordList.jsx

@@ -38,12 +38,6 @@ const header = props => {
    */
 
   const columns = [
-    {
-      title: '活动编号',
-      dataIndex: 'targetId',
-      key: 'targetId',
-      align: 'center',
-    },
     {
       title: '活动名称',
       dataIndex: 'activityName',
@@ -81,6 +75,13 @@ const header = props => {
       key: 'shareTel',
       align: 'center',
     },
+    {
+      title: '分享者类型',
+      dataIndex: 'personType',
+      key: 'personType',
+      align: 'center',
+      render: (text, record) => <span>{record.consultantId === null || record.consultantId === '' ? '普通客户' : '置业顾问'}</span>,
+    },
   ];
   
 
@@ -111,19 +112,28 @@ const header = props => {
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-      <Form.Item>
-          {getFieldDecorator('drainageId')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="H5活动编号"
-            />,
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('eventType')(
+            <Select placeholder="分享类型" style={{ width: 150 }}>
+            <Option value="activity">报名活动</Option>
+            <Option value="help">助力活动</Option>
+            <Option value="group">拼团活动</Option>
+            <Option value="h5">H5活动</Option>
+            <Option value="building">项目</Option>
+            <Option value="news">资讯</Option>
+          </Select>
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('activityName')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="H5活动名称"
+              placeholder="分享标题"
             />,
           )}
         </Form.Item>
@@ -135,6 +145,14 @@ const header = props => {
             />,
           )}
         </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('personType')(
+             <Select placeholder="分享者类型" style={{ width: 150 }}>
+             <Option value="Realty Consultant">置业顾问</Option>
+             <Option value="customer">普通客户</Option>
+           </Select>
+          )}
+        </Form.Item>
         <Form.Item>
           {getFieldDecorator('shareTel')(
             <Input