zhoulisen 5 年前
父节点
当前提交
b9a40e64d4

+ 1
- 1
src/components/SelectButton/channelSelect.jsx 查看文件

37
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
37
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
38
       }>
38
       }>
39
           {data.map(Item => (
39
           {data.map(Item => (
40
-            <Option key={Item.channelId} value={Item.channelId}> {console.log(Item)}{Item.channelName} </Option>
40
+            <Option key={Item.channelId} value={Item.channelId}> {Item.channelName} </Option>
41
           ))}
41
           ))}
42
       </Select>
42
       </Select>
43
   )
43
   )

+ 1
- 1
src/pages/activity/editActivity.jsx 查看文件

121
             message.info(checks)
121
             message.info(checks)
122
             return
122
             return
123
           }
123
           }
124
-          console.log(data.count,values.personNum)
124
+          console.log(data,values.personNum)
125
           if (data.count || 0 > values.personNum) {
125
           if (data.count || 0 > values.personNum) {
126
             message.info('活动人数必须大于已报名人数')
126
             message.info('活动人数必须大于已报名人数')
127
             return
127
             return

+ 11
- 7
src/pages/channel/channelList.jsx 查看文件

68
       render: (text, record) => <a style={ { color: '#66B3FF' } } onClick= {() => toBroker(record)} >{ record.brokerCount }</a>,
68
       render: (text, record) => <a style={ { color: '#66B3FF' } } onClick= {() => toBroker(record)} >{ record.brokerCount }</a>,
69
   },
69
   },
70
   {
70
   {
71
-    title: '推荐客户有效',
71
+    title: '推荐客户有效',
72
     dataIndex: 'recommendCount',
72
     dataIndex: 'recommendCount',
73
     key: 'recommendCount',
73
     key: 'recommendCount',
74
     align: 'center',
74
     align: 'center',
144
   }
144
   }
145
   // 查询
145
   // 查询
146
   function queryList() {
146
   function queryList() {
147
+   
147
     getList({ pageNum: 1, pageSize: 10, channelId: channelNmae })
148
     getList({ pageNum: 1, pageSize: 10, channelId: channelNmae })
148
   }
149
   }
149
   // 重置
150
   // 重置
150
   function reset() {
151
   function reset() {
152
+    setChannelNmae()
151
     getList({ pageNum: 1, pageSize: 10 })
153
     getList({ pageNum: 1, pageSize: 10 })
152
   }
154
   }
153
 
155
 
163
 
165
 
164
   // 分页
166
   // 分页
165
   function onChange(pageNumber) {
167
   function onChange(pageNumber) {
166
-    props.form.validateFields((err, values) => {
167
-      if (!err) {
168
-        getList({ pageNum: pageNumber, pageSize: 10, ...values })
169
-      }
170
-    });
168
+    getList({ pageNum: pageNumber, pageSize: 10, channelId: channelNmae })
169
+    // getList({ pageNum: pageNumber, pageSize: 10, ...values })
170
+    // props.form.validateFields((err, values) => {
171
+    //   if (!err) {
172
+    //     getList({ pageNum: pageNumber, pageSize: 10, ...values })
173
+    //   }
174
+    // });
171
   }
175
   }
172
 
176
 
173
   function onChannelChange(value) {
177
   function onChannelChange(value) {
193
         <AuthButton name="admin.channel.search" noRight={null}>
197
         <AuthButton name="admin.channel.search" noRight={null}>
194
           <Button type="primary" onClick={() => queryList()}>查询</Button>
198
           <Button type="primary" onClick={() => queryList()}>查询</Button>
195
           </AuthButton>
199
           </AuthButton>
196
-          {/* <Button onClick={() => reset() }>重置</Button> */}
200
+          <Button onClick={() => reset() } style={{marginLeft:'8px'}}>重置</Button>
197
         </div>
201
         </div>
198
       </div>
202
       </div>
199
       <AuthButton name="admin.channel.post" noRight={null}>
203
       <AuthButton name="admin.channel.post" noRight={null}>

+ 18
- 9
src/pages/channel/independentList/index.jsx 查看文件

89
         title: '用户名',
89
         title: '用户名',
90
         dataIndex: 'name',
90
         dataIndex: 'name',
91
         key: 'name',
91
         key: 'name',
92
+        render: (row) => <><span>{console.log(row,'row')}{ row.name || row.nickname }</span></>,
92
       },
93
       },
93
       {
94
       {
94
         title: '电话',
95
         title: '电话',
110
         title: '推荐时间',
111
         title: '推荐时间',
111
         dataIndex: 'createDate',
112
         dataIndex: 'createDate',
112
         key: 'createDate',
113
         key: 'createDate',
113
-        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
114
+        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss') }</span></>,
114
       },
115
       },
115
       {
116
       {
116
         title: '状态',
117
         title: '状态',
117
         // eslint-disable-next-line consistent-return
118
         // eslint-disable-next-line consistent-return
118
         render: (text, records) => {
119
         render: (text, records) => {
119
           console.log("retrun", records)
120
           console.log("retrun", records)
120
-          if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
121
-          if (records.status === 2) { return '到访' }
122
-          if (records.status === 3) { return '认购' }
123
-          if (records.status === 4) { return '签约' }
124
-          if (records.verifyStatus === 1) { return '待审核' }
125
-          if (records.verifyStatus === 2) { return '审核同意' }
126
-          if (records.verifyStatus === 3) { return '签约' }
121
+          if (records.status === 1) { return '报备' }
122
+      if (records.status === 2) { return '推荐' }
123
+      if (records.status === 3) { return '认购' }
124
+      if (records.status === 4) { return '签约' }
125
+      if (records.verifyStatus === 1) { return '待审核' }
126
+      if (records.verifyStatus === 2) { return '审核同意' }
127
+      if (records.verifyStatus === 3) { return '签约' }
128
+          // if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
129
+          // if (records.status === 2) { return '到访' }
130
+          // if (records.status === 3) { return '认购' }
131
+          // if (records.status === 4) { return '签约' }
132
+          // if (records.verifyStatus === 1) { return '待审核' }
133
+          // if (records.verifyStatus === 2) { return '审核同意' }
134
+          // if (records.verifyStatus === 3) { return '签约' }
127
           // reportRecommendStatus
135
           // reportRecommendStatus
128
         },
136
         },
129
       },
137
       },
219
         dataIndex: 'nickname',
227
         dataIndex: 'nickname',
220
         key: 'nickname',
228
         key: 'nickname',
221
         align: 'center',
229
         align: 'center',
222
-        render: text => <a>{text}</a>,
230
+      render: (row) => <><span>{console.log(row,'row')}{ row.name || row.nickname }</span></>,
223
       },
231
       },
224
       {
232
       {
225
         title: '电话',
233
         title: '电话',
373
       title: '姓名',
381
       title: '姓名',
374
       dataIndex: 'nickname',
382
       dataIndex: 'nickname',
375
       key: 'nickname',
383
       key: 'nickname',
384
+      render: (_, record) => <><span>{ record.name || record.nickname }</span></>,
376
     },
385
     },
377
     {
386
     {
378
       title: '电话',
387
       title: '电话',

+ 16
- 9
src/pages/channel/recommendClients.jsx 查看文件

59
     dataIndex: 'name',
59
     dataIndex: 'name',
60
     key: 'name',
60
     key: 'name',
61
     align: 'center',
61
     align: 'center',
62
-    render: text => <a>{text}</a>,
62
+    render:  (text, record) => <div>{record.name}</div> ,
63
   },
63
   },
64
   {
64
   {
65
     title: '电话',
65
     title: '电话',
85
     dataIndex: 'createDate',
85
     dataIndex: 'createDate',
86
     key: 'createDate',
86
     key: 'createDate',
87
     align: 'center',
87
     align: 'center',
88
-    render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
88
+    render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss') }</span></>,
89
   },
89
   },
90
   {
90
   {
91
     title: '状态',
91
     title: '状态',
94
     align: 'center',
94
     align: 'center',
95
     // eslint-disable-next-line consistent-return
95
     // eslint-disable-next-line consistent-return
96
     render: (text, records) => {
96
     render: (text, records) => {
97
-      if (records.status === 1) { return '报备' }
98
-      if (records.status === 2) { return '推荐' }
99
-      if (records.status === 3) { return '认购' }
100
-      if (records.status === 4) { return '签约' }
101
-      if (records.verifyStatus === 1) { return '待审核' }
102
-      if (records.verifyStatus === 2) { return '审核同意' }
103
-      if (records.verifyStatus === 3) { return '签约' }
97
+             if (records.status === 1) { if(records.reportRecommendStatus === 0) {return '未审核'} if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
98
+          if (records.status === 2) { return '到访' }
99
+          if (records.status === 3) { return '认购' }
100
+          if (records.status === 4) { return '签约' }
101
+          if (records.verifyStatus === 1) { return '待审核' }
102
+          if (records.verifyStatus === 2) { return '审核同意' }
103
+          if (records.verifyStatus === 3) { return '签约' }
104
+      // if (records.status === 1) { return '报备' }
105
+      // if (records.status === 2) { return '推荐' }
106
+      // if (records.status === 3) { return '认购' }
107
+      // if (records.status === 4) { return '签约' }
108
+      // if (records.verifyStatus === 1) { return '待审核' }
109
+      // if (records.verifyStatus === 2) { return '审核同意' }
110
+      // if (records.verifyStatus === 3) { return '签约' }
104
     },
111
     },
105
   },
112
   },
106
 ];
113
 ];

+ 31
- 21
src/pages/recommend/recommendCustomer/audit.jsx 查看文件

56
   function getById(currentId) {
56
   function getById(currentId) {
57
     request({ ...apis.customer.recommendGetById, urlData: { id: currentId } }).then(res => {
57
     request({ ...apis.customer.recommendGetById, urlData: { id: currentId } }).then(res => {
58
       res.reportDate = moment(res.reportDate)
58
       res.reportDate = moment(res.reportDate)
59
-     props.form.setFieldsValue(res)
59
+      props.form.setFieldsValue(res)
60
     })
60
     })
61
   }
61
   }
62
 
62
 
63
   function submitDate(params) {
63
   function submitDate(params) {
64
     // props.form.setFieldsValue(res)
64
     // props.form.setFieldsValue(res)
65
-    request({ ...apis.customer.auto, urlData: { id: params.customerId || props.form.getFieldValue('customerId') }, params: { verifyStatus: params.verifyStatus, realtyConsultant: props.form.getFieldValue('realtyConsultant') } }).then(() => {
66
-      // eslint-disable-next-line no-unused-expressions
67
-      openNotificationWithIcon('success', '操作成功')
68
-      router.go(-1)
69
-    }).catch(err => {
70
-      // eslint-disable-next-line no-unused-expressions
71
-
72
-    })
65
+    console.log(params, 'params')
66
+    // request({ ...apis.customer.auto, urlData: { id: params.customerId || props.form.getFieldValue('customerId') }, params: { verifyStatus: params.verifyStatus, realtyConsultant: props.form.getFieldValue('realtyConsultant') } }).then(() => {
67
+    //   // eslint-disable-next-line no-unused-expressions
68
+    //   openNotificationWithIcon('success', '操作成功')
69
+    //   router.go(-1)
70
+    // }).catch(err => {
71
+    //   // eslint-disable-next-line no-unused-expressions
72
+
73
+    // })
73
   }
74
   }
74
 
75
 
75
   // 提交事件
76
   // 提交事件
77
     e.preventDefault();
78
     e.preventDefault();
78
     props.form.validateFields((err, values) => {
79
     props.form.validateFields((err, values) => {
79
       if (!err) {
80
       if (!err) {
81
+        // submitDate({ verifyStatus: '1' })
80
         submitDate({ ...values })
82
         submitDate({ ...values })
81
       }
83
       }
82
     });
84
     });
195
               <Option value={1}>已通过</Option>
197
               <Option value={1}>已通过</Option>
196
               <Option value={2}>已驳回</Option>
198
               <Option value={2}>已驳回</Option>
197
             </Select>,
199
             </Select>,
198
-          )}
200
+          )}onClick={() => submitDate({ verifyStatus: '1' })}
199
         </Form.Item> */}
201
         </Form.Item> */}
200
-        <Form.Item label="归属置业顾问">
201
-            <Row gutter={8}>
202
-              <Col span={12}>
203
-                {getFieldDecorator('consultantName')(<Input placeholder="请选择置业顾问" />)}
204
-              </Col>
205
-              <Col span={12}>
206
-                <Button onClick={() => showConsultant()}>选择</Button>
207
-              </Col>
208
-            </Row>
202
+        <Form.Item label="归属置业顾问"
203
+      >
204
+          <Row gutter={8}>
205
+            <Col span={12}>
206
+              {getFieldDecorator('consultantName', {
207
+                rules: [
208
+                  {
209
+                    required: true,
210
+                    message: '请选择置业顾问',
211
+                  },
212
+                ],
213
+              })(<Input placeholder="请选择置业顾问" />)}
214
+            </Col>
215
+            <Col span={12}>
216
+              <Button onClick={() => showConsultant()}>选择</Button>
217
+            </Col>
218
+          </Row>
209
         </Form.Item>
219
         </Form.Item>
210
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
220
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
211
-          <Button type="primary" className={Styles.SubmitButton} onClick={() => submitDate({ verifyStatus: '1' })}>
221
+          <Button type="primary" className={Styles.SubmitButton} htmlType="submit" >
212
             审核通过
222
             审核通过
213
           </Button>
223
           </Button>
214
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
224
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
219
       </Form>
229
       </Form>
220
 
230
 
221
       {/* 选择置业顾问 */}
231
       {/* 选择置业顾问 */}
222
-      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)}/>
232
+      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)} />
223
     </>
233
     </>
224
   );
234
   );
225
 }
235
 }