zls

src/components/SelectButton/channelSelect.jsx

@@ -37,7 +37,7 @@ const ChannelSelect = props => {
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }>
           {data.map(Item => (
-            <Option key={Item.channelId} value={Item.channelId}> {console.log(Item)}{Item.channelName} </Option>
+            <Option key={Item.channelId} value={Item.channelId}> {Item.channelName} </Option>
           ))}
       </Select>
   )

src/pages/activity/editActivity.jsx

@@ -121,7 +121,7 @@ const BasicForm = props => {
             message.info(checks)
             return
           }
-          console.log(data.count,values.personNum)
+          console.log(data,values.personNum)
           if (data.count || 0 > values.personNum) {
             message.info('活动人数必须大于已报名人数')
             return

src/pages/channel/channelList.jsx

@@ -68,7 +68,7 @@ const columns = [
       render: (text, record) => <a style={ { color: '#66B3FF' } } onClick= {() => toBroker(record)} >{ record.brokerCount }</a>,
   },
   {
-    title: '推荐客户有效',
+    title: '推荐客户有效数',
     dataIndex: 'recommendCount',
     key: 'recommendCount',
     align: 'center',
@@ -144,10 +144,12 @@ const header = props => {
   }
   // 查询
   function queryList() {
+   
     getList({ pageNum: 1, pageSize: 10, channelId: channelNmae })
   }
   // 重置
   function reset() {
+    setChannelNmae()
     getList({ pageNum: 1, pageSize: 10 })
   }
 
@@ -163,11 +165,13 @@ const header = props => {
 
   // 分页
   function onChange(pageNumber) {
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        getList({ pageNum: pageNumber, pageSize: 10, ...values })
-      }
-    });
+    getList({ pageNum: pageNumber, pageSize: 10, channelId: channelNmae })
+    // getList({ pageNum: pageNumber, pageSize: 10, ...values })
+    // props.form.validateFields((err, values) => {
+    //   if (!err) {
+    //     getList({ pageNum: pageNumber, pageSize: 10, ...values })
+    //   }
+    // });
   }
 
   function onChannelChange(value) {
@@ -193,7 +197,7 @@ const header = props => {
         <AuthButton name="admin.channel.search" noRight={null}>
           <Button type="primary" onClick={() => queryList()}>查询</Button>
           </AuthButton>
-          {/* <Button onClick={() => reset() }>重置</Button> */}
+          <Button onClick={() => reset() } style={{marginLeft:'8px'}}>重置</Button>
         </div>
       </div>
       <AuthButton name="admin.channel.post" noRight={null}>

src/pages/channel/independentList/index.jsx

@@ -89,6 +89,7 @@ class ModalTable extends React.Component {
         title: '用户名',
         dataIndex: 'name',
         key: 'name',
+        render: (row) => <><span>{console.log(row,'row')}{ row.name || row.nickname }</span></>,
       },
       {
         title: '电话',
@@ -110,20 +111,27 @@ class ModalTable extends React.Component {
         title: '推荐时间',
         dataIndex: 'createDate',
         key: 'createDate',
-        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
+        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss') }</span></>,
       },
       {
         title: '状态',
         // eslint-disable-next-line consistent-return
         render: (text, records) => {
           console.log("retrun", records)
-          if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
-          if (records.status === 2) { return '到访' }
-          if (records.status === 3) { return '认购' }
-          if (records.status === 4) { return '签约' }
-          if (records.verifyStatus === 1) { return '待审核' }
-          if (records.verifyStatus === 2) { return '审核同意' }
-          if (records.verifyStatus === 3) { return '签约' }
+          if (records.status === 1) { return '报备' }
+      if (records.status === 2) { return '推荐' }
+      if (records.status === 3) { return '认购' }
+      if (records.status === 4) { return '签约' }
+      if (records.verifyStatus === 1) { return '待审核' }
+      if (records.verifyStatus === 2) { return '审核同意' }
+      if (records.verifyStatus === 3) { return '签约' }
+          // if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
+          // if (records.status === 2) { return '到访' }
+          // if (records.status === 3) { return '认购' }
+          // if (records.status === 4) { return '签约' }
+          // if (records.verifyStatus === 1) { return '待审核' }
+          // if (records.verifyStatus === 2) { return '审核同意' }
+          // if (records.verifyStatus === 3) { return '签约' }
           // reportRecommendStatus
         },
       },
@@ -219,7 +227,7 @@ class InviteTable extends React.Component {
         dataIndex: 'nickname',
         key: 'nickname',
         align: 'center',
-        render: text => <a>{text}</a>,
+      render: (row) => <><span>{console.log(row,'row')}{ row.name || row.nickname }</span></>,
       },
       {
         title: '电话',
@@ -373,6 +381,7 @@ function body (props) {
       title: '姓名',
       dataIndex: 'nickname',
       key: 'nickname',
+      render: (_, record) => <><span>{ record.name || record.nickname }</span></>,
     },
     {
       title: '电话',

src/pages/channel/recommendClients.jsx

@@ -59,7 +59,7 @@ const columns = [
     dataIndex: 'name',
     key: 'name',
     align: 'center',
-    render: text => <a>{text}</a>,
+    render:  (text, record) => <div>{record.name}</div> ,
   },
   {
     title: '电话',
@@ -85,7 +85,7 @@ const columns = [
     dataIndex: 'createDate',
     key: 'createDate',
     align: 'center',
-    render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
+    render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss') }</span></>,
   },
   {
     title: '状态',
@@ -94,13 +94,20 @@ const columns = [
     align: 'center',
     // eslint-disable-next-line consistent-return
     render: (text, records) => {
-      if (records.status === 1) { return '报备' }
-      if (records.status === 2) { return '推荐' }
-      if (records.status === 3) { return '认购' }
-      if (records.status === 4) { return '签约' }
-      if (records.verifyStatus === 1) { return '待审核' }
-      if (records.verifyStatus === 2) { return '审核同意' }
-      if (records.verifyStatus === 3) { return '签约' }
+             if (records.status === 1) { if(records.reportRecommendStatus === 0) {return '未审核'} if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
+          if (records.status === 2) { return '到访' }
+          if (records.status === 3) { return '认购' }
+          if (records.status === 4) { return '签约' }
+          if (records.verifyStatus === 1) { return '待审核' }
+          if (records.verifyStatus === 2) { return '审核同意' }
+          if (records.verifyStatus === 3) { return '签约' }
+      // if (records.status === 1) { return '报备' }
+      // if (records.status === 2) { return '推荐' }
+      // if (records.status === 3) { return '认购' }
+      // if (records.status === 4) { return '签约' }
+      // if (records.verifyStatus === 1) { return '待审核' }
+      // if (records.verifyStatus === 2) { return '审核同意' }
+      // if (records.verifyStatus === 3) { return '签约' }
     },
   },
 ];

src/pages/recommend/recommendCustomer/audit.jsx

@@ -56,20 +56,21 @@ function body(props) {
   function getById(currentId) {
     request({ ...apis.customer.recommendGetById, urlData: { id: currentId } }).then(res => {
       res.reportDate = moment(res.reportDate)
-     props.form.setFieldsValue(res)
+      props.form.setFieldsValue(res)
     })
   }
 
   function submitDate(params) {
     // props.form.setFieldsValue(res)
-    request({ ...apis.customer.auto, urlData: { id: params.customerId || props.form.getFieldValue('customerId') }, params: { verifyStatus: params.verifyStatus, realtyConsultant: props.form.getFieldValue('realtyConsultant') } }).then(() => {
-      // eslint-disable-next-line no-unused-expressions
-      openNotificationWithIcon('success', '操作成功')
-      router.go(-1)
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-
-    })
+    console.log(params, 'params')
+    // request({ ...apis.customer.auto, urlData: { id: params.customerId || props.form.getFieldValue('customerId') }, params: { verifyStatus: params.verifyStatus, realtyConsultant: props.form.getFieldValue('realtyConsultant') } }).then(() => {
+    //   // eslint-disable-next-line no-unused-expressions
+    //   openNotificationWithIcon('success', '操作成功')
+    //   router.go(-1)
+    // }).catch(err => {
+    //   // eslint-disable-next-line no-unused-expressions
+
+    // })
   }
 
   // 提交事件
@@ -77,6 +78,7 @@ function body(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
+        // submitDate({ verifyStatus: '1' })
         submitDate({ ...values })
       }
     });
@@ -195,20 +197,28 @@ function body(props) {
               <Option value={1}>已通过</Option>
               <Option value={2}>已驳回</Option>
             </Select>,
-          )}
+          )}onClick={() => submitDate({ verifyStatus: '1' })}
         </Form.Item> */}
-        <Form.Item label="归属置业顾问">
-            <Row gutter={8}>
-              <Col span={12}>
-                {getFieldDecorator('consultantName')(<Input placeholder="请选择置业顾问" />)}
-              </Col>
-              <Col span={12}>
-                <Button onClick={() => showConsultant()}>选择</Button>
-              </Col>
-            </Row>
+        <Form.Item label="归属置业顾问"
+      >
+          <Row gutter={8}>
+            <Col span={12}>
+              {getFieldDecorator('consultantName', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请选择置业顾问',
+                  },
+                ],
+              })(<Input placeholder="请选择置业顾问" />)}
+            </Col>
+            <Col span={12}>
+              <Button onClick={() => showConsultant()}>选择</Button>
+            </Col>
+          </Row>
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          <Button type="primary" className={Styles.SubmitButton} onClick={() => submitDate({ verifyStatus: '1' })}>
+          <Button type="primary" className={Styles.SubmitButton} htmlType="submit" >
             审核通过
           </Button>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -219,7 +229,7 @@ function body(props) {
       </Form>
 
       {/* 选择置业顾问 */}
-      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)}/>
+      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)} />
     </>
   );
 }