bug fix

package.json

@@ -53,7 +53,6 @@
     "moment": "^2.24.0",
     "omit.js": "^1.0.2",
     "path-to-regexp": "^3.0.0",
-    "qrcode.react": "^0.9.3",
     "qs": "^6.7.0",
     "react": "^16.8.6",
     "react-amap": "^1.2.8",

src/components/Wangedit/Wangedit.jsx

@@ -73,6 +73,18 @@ class Wangedit extends React.Component {
       }
     }
   }
+
+  /**
+   *增加这个 shouldComponentUpdate 生命函数
+    处理自动聚焦到富文本上
+   *
+   * @param {*} nextProps
+   * @returns
+   * @memberof Wangedit
+   */
+  shouldComponentUpdate(nextProps) {
+    return nextProps.value !== this.editor.txt.html()
+  }
 }
 
 export default Wangedit

src/pages/activity/ActivityList.jsx

@@ -3,7 +3,6 @@ import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagina
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import router from 'umi/router';
 import moment from 'moment';
-// import QRCode from 'qrcodejs2'
 import styles from '../style/GoodsList.less';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
@@ -59,21 +58,6 @@ const header = props => {
   }
 
 
-  function download (data) {
-    if (!data) {
-      return
-    }
-
-    const url = URL.createObjectURL(data)
-    const link = document.createElement('a')
-    link.style.display = 'none'
-    link.href = url
-    link.setAttribute('download', '活动二维码.png')
-    document.body.append(link)
-    link.click()
-  }
-
-
   /**
    *
    *

src/pages/activity/drainage/Detail.jsx

@@ -13,7 +13,7 @@ import AuthButton from '../../../components/AuthButton';
 const data = []
 
 const header = (props) => {
-  const drainageId = props.location.query.drainageId
+  const { drainageId, name } = props.location.query
 
 
   const [datas, setDatas] = useState([])
@@ -36,15 +36,14 @@ const header = (props) => {
       console.log(data, '3333333333333')
       if (data.total != 0) {
         setTotal(data)
-        // console.log(data.total, '3333333333333')
-
         setDatas(tableData(data.records))
         // content = data.records[0]
         console.log('json: ', eval('(' + data.records[0].content + ')'))
         setContent(eval('(' + data.records[0].content + ')'))
-        setColumns(tableTitle(eval('(' + data.records[0].content + ')')))
+        setColumns(tableTitle(data.records))
       }
       else {
+        setDatas([])
         message.info('数据为空')
       }
 
@@ -56,11 +55,13 @@ const header = (props) => {
     })
   }
   function tableData (data) {
-    console.log('data', data)
+    console.log('tabledata', data)
     return data.map((row, inx) => {
       return eval('(' + row.content + ')').reduce((acc, col) => {
         const r = {
+
           key: inx + 1,
+          createDate:row.createDate,
           [`${col.key}`]: col.value,
           ...acc,
         }
@@ -71,14 +72,21 @@ const header = (props) => {
   }
 
   function tableTitle (data) {
-    return data.map((item) => {
+   tableTitle = eval('(' + data[0].content + ')')
+    const cols = [{
+      title: "提交时间",
+      dataIndex: "createDate",
+      key: "createDate",
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    }]
+    return cols.concat( tableTitle.map((item) => {
       const col = {
         title: item.label,
         dataIndex: item.key,
         key: item.key
       }
       return col
-    })
+    }))
   }
 
 
@@ -105,7 +113,7 @@ const header = (props) => {
 
   function excelPort () {
     // const fieldsValue = getFieldsValue()
-    console.log("111111")
+  
     request({ ...apis.activity.exporttaDrainageRecord, params: { drainageId: drainageId, startTime: fromTime(startDate), endTime: fromTime(endDate) } })
       .then(response => {
         download(response)
@@ -148,14 +156,18 @@ const header = (props) => {
       </Button>
 
       <div>
-        {/* H5项目名称 style={{ float: 'right', margin: '20px 0', zIndex: 1 }} */}
-        <AuthButton name="admin.taDrainageRecord.export.get" noRight={null}>
-          <Button type="primary" style={{ marginLeft: '30px', float: 'right', marginTop: '30px', marginBottom: '30px', zIndex: 1 }} onClick={excelPort}>导出数据</Button>
-        </AuthButton>
+        <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+         <div style={{ lineHeight: '92px', width: '600px', fontWeight: 'bold', fontSize: '18px' }}>
+            H5项目：{ name }
+         </div>
+          {/* H5项目名称 style={{ float: 'right', margin: '20px 0', zIndex: 1 }} */}
+          <AuthButton name="admin.taDrainageRecord.export.get" noRight={null}>
+            <Button type="primary" style={{ marginLeft: '30px', float: 'right', marginTop: '30px', marginBottom: '30px', zIndex: 1 }} onClick={excelPort}>导出数据</Button>
+          </AuthButton>
+        </div>
         <Table columns={columns} dataSource={datas} pagination={false} />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-          <Pagination showQuickJumper defaultCurrent={1} total={total.total} onChange={(e) => changePageNum(e)} current={total.current}
-/>
+          <Pagination showQuickJumper defaultCurrent={1} total={total.total} onChange={(e) => changePageNum(e)} current={total.current}/>
         </div>
       </div>
 

src/pages/activity/drainage/DrainageList.jsx

@@ -9,12 +9,12 @@ import XForm, { FieldTypes } from '../../../components/XForm';
 import moment from 'moment';
 import AuthButton from '../../../components/AuthButton';
 
-const toEditList = (drainageId) => () => {
-  console.log(drainageId, '12344567')
+const toEditList = (row) => () => {
   router.push({
     pathname: '/activity/drainage/Detail',
     query: {
-      drainageId
+      drainageId: row.drainageId,
+      name: row.name,
     },
   });
 }
@@ -142,7 +142,7 @@ const header = (props) => {
       render: (text, datas) => (
         <>
           <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
-            <span style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(datas.drainageId)}>
+            <span style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(datas)}>
               查看详情
             </span>
           </AuthButton>

src/pages/activity/groupActivity/helpRecord.jsx

@@ -206,8 +206,8 @@ class Verifier extends React.Component {
           // onOk={() => this.handleOk()}
           onCancel={(e) => this.handleCancel(e)}
         >
-          <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
-           <Button name="admin.taShareRecord.verificate.put" noRight={null} style={{ marginLeft: '80px' }} onClick={() => this.verification()}>立即核销</Button>
+          <div><span>核销码:<input style={{marginLeft: '10px'}} onChange={this.verify.bind(this)}/></span>
+           <Button name="admin.taShareRecord.verificate.put" noRight={null} style={{ marginLeft: '80px', marginTop:'10px', backgroundColor:'red' }} onClick={() => this.verification()}><span style={{color:'white'}}>立即核销</span></Button>
           </div>
         </Modal>
       </>

src/pages/activity/helpActivity/helpRecord.jsx

@@ -217,8 +217,8 @@ class Verifier extends React.Component {
           // onOk={() => this.handleOk()}
           onCancel={e => this.handleCancel(e)}
         >
-          <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
-           <Button name="admin.helpInitiateRecordVerify.post" noRight={null} onClick={e => this.verification(e)} style={{ marginLeft: '80px' }}>立即核销</Button>
+          <div><span>核销码:<input style={{marginLeft: '10px'}} onChange={this.verify.bind(this)}/></span>
+           <Button name="admin.helpInitiateRecordVerify.post" noRight={null} onClick={e => this.verification(e)} style={{ marginLeft: '80px', marginTop:'10px', backgroundColor:'red' }}><span style={{color:'white'}}>立即核销</span></Button>
           </div>
         </Modal>
       </>

src/pages/building/list/add/components/buildingProjectType.jsx

@@ -61,7 +61,7 @@ class TypeForm extends React.Component {
           position: 'relative',
           border: '1px solid #eee',
           borderRadius: '4px',
-          marginTop:'16px'
+          marginTop: '16px',
         }}>
 
           <p style={{ padding: '20px', borderBottom: '1px solid #eee' }}>{this.props.type.buildingTypeName || ''}  <Button type="link" style={{ position: 'absolute', right: '16px' }} icon="close" onClick={() => this.close()} /></p>
@@ -140,6 +140,7 @@ class ProjectTypeBody extends React.Component {
     const updateProjectDate = this.updateProjectType(tempDate)
     console.log('updateProjectDate: ', updateProjectDate)
     this.setState({ data: updateProjectDate })
+    this.setState({ defaultCheckboxValue: updateProjectDate.map(item => item.buildingTypeId) })
   }
 
   onClose = e => {
@@ -239,7 +240,7 @@ class ProjectTypeBody extends React.Component {
           onOk={this.handleOk}
           onCancel={this.handleCancel}
         >
-          <Checkbox.Group options={this.state.projectType.map(item => ({ label: item.buildingTypeName, value: item.buildingTypeId }))} defaultValue={this.state.defaultCheckboxValue} onChange={e => this.onCheckboxChange(e)} />
+          <Checkbox.Group options={this.state.projectType.map(item => ({ label: item.buildingTypeName, value: item.buildingTypeId }))} onChange={e => this.onCheckboxChange(e)} value={this.state.defaultCheckboxValue}/>
         </Modal>
         <Row type="flex" justify="space-between">
           {

src/pages/customer/customerlist/components/attribution.jsx

@@ -31,8 +31,7 @@ class ModalAttribution extends React.Component {
   }
 
   componentDidUpdate(preProps, preState) {
-    console.log(this.props.visibleData.realtyConsultant)
-    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
       this.getList({ pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
     }
@@ -41,12 +40,12 @@ class ModalAttribution extends React.Component {
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk() {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.props.onCancel()
   }
 
   // 弹框取消按钮
   handleCancel() {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.props.onCancel()
   }
 
   getList(params) {
@@ -55,14 +54,7 @@ class ModalAttribution extends React.Component {
       this.setState({ dataSource: res })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
+      
     })
   }
 

src/pages/customer/customerlist/index.jsx

@@ -171,6 +171,12 @@ function body(props) {
     link.click()
   }
 
+  // 关闭调整归属的窗口
+  function closeAttribution() {
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    getList({ pageNum: 1, pageSize: 10, customerType, ...props.form.getFieldsValue() })
+  }
+
   const publicColumns = [
     {
       title: '头像',
@@ -374,7 +380,7 @@ function body(props) {
       }
       
       {/* 调整归属 */}
-      <Attribution visibleData={gVisibleData} />
+      <Attribution visibleData={gVisibleData} onCancel={() => closeAttribution()}/>
 
       {/* 积分记录 */}
       <IntegralRecord visibleData={recordVisibleData} />

src/pages/customer/independentList/index.jsx

@@ -155,13 +155,13 @@ class InviteTable extends React.Component {
 
   // 挂载之后
   componentDidMount () {
-    const { customerId } = this.state.visibleData
-    this.getList({ id: customerId, pageNumber: 1, pageSize: 5 })
+    
   }
 
   componentDidUpdate (preProps, preState) {
-    const { customerId } = this.state.visibleData
-    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
+    const { customerId } = this.props.visibleData
+    
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
       this.getList({ id: customerId, pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
     }
@@ -170,31 +170,27 @@ class InviteTable extends React.Component {
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk () {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.setState({ dataSource: { records: [] } })
+    this.props.onCancel()
   }
 
   // 弹框取消按钮
   handleCancel () {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.setState({ dataSource: { records: [] } })
+    this.props.onCancel()
   }
 
   getList (params) {
-    const { customerId } = this.props.visibleData
-    if (customerId === '' || customerId === undefined) {
+    const { id } = params
+    console.log(id)
+    if (id === '' || id === undefined) {
       return
     }
     request({ ...apis.customer.InviteClientsList, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
+    
     })
   }
 
@@ -236,7 +232,7 @@ class InviteTable extends React.Component {
     return (
       <>
         <Modal
-          title="推荐客户"
+          title="邀请经纪人"
           destroyOnClose="true"
           width={900}
           footer={null}
@@ -451,9 +447,11 @@ function body (props) {
         导出
       </Button>
       <Table rowKey="independentIndex" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
-      {/* 调整归属 */}
+      {/* 推荐客户 */}
       <ModalTable visibleData={gVisibleData} />
-      <InviteTable visibleData={gInviteData} />
+
+      {/* 邀请经纪人 */}
+      <InviteTable visibleData={gInviteData} onCancel={() => setGInviteData({ visible: false, customerId: '', realtyConsultant: '' })} />
     </>
   );
 }

src/pages/customer/recommendCustomer/audit.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Upload, message } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Upload, message, notification } from 'antd';
 import ImageUpload from '../../../components/XForm/ImageUpload';
 import moment from 'moment';
 import request from '../../../utils/request';
@@ -7,6 +7,8 @@ import apis from '../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
 
+import Attribution from './components/attribution'
+
 const { Option } = Select;
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const { Meta } = Card;
@@ -24,9 +26,20 @@ const tailFormItemLayout = {
   },
 };
 
+const openNotificationWithIcon = (type, message) => {
+  notification[type]({
+    message,
+    description:
+      '',
+  });
+}
+
 function body(props) {
   const { getFieldDecorator } = props.form
 
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [visibleData, setVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSource, setDataSource] = useState({ picture: '' })
 
@@ -49,27 +62,13 @@ function body(props) {
 
   function submitDate(params) {
     // props.form.setFieldsValue(res)
-    request({ ...apis.customer.auto, urlData: { id: params.customerId }, params: { verifyStatus: params.verifyStatus } }).then(() => {
+    request({ ...apis.customer.auto, urlData: { id: params.customerId || props.form.getFieldValue('customerId') }, params: { verifyStatus: params.verifyStatus } }).then(() => {
       // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message="操作成功"
-        type="success"
-        showIcon
-      />
+      openNotificationWithIcon('success', '操作成功')
       router.go(-1)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
+
     })
   }
 
@@ -89,6 +88,21 @@ function body(props) {
     console.log(e)
   }
 
+  // 显示选择置业顾问的窗口
+  function showConsultant() {
+    setVisibleData({ visible: true, customerId: props.form.getFieldValue('customerId'), realtyConsultant: props.form.getFieldValue('realtyConsultant') })
+  }
+
+  // 关闭选择置业顾问的窗口
+  function closeConsultant() {
+    setVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+  }
+
+  // 选择置业顾问弹窗
+  function consultantSuccess(e) {
+    props.form.setFieldsValue({ realtyConsultant: e.realtyConsultant, consultantName: e.name })
+  }
+
   return (
     <>
       <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ width: '800px', margin: 'auto' }}>
@@ -99,6 +113,13 @@ function body(props) {
             />,
           )}
         </Form.Item>
+        <Form.Item label="归属人" style={{ display: 'none' }}>
+          {getFieldDecorator('realtyConsultant')(
+            <Input
+              placeholder="归属人"
+            />,
+          )}
+        </Form.Item>
         <Form.Item label="意向项目：">
           {getFieldDecorator('intention')(
             <Input
@@ -159,7 +180,7 @@ function body(props) {
             <DatePicker showTime placeholder="报备日期" />,
           )}
         </Form.Item>
-        <Form.Item label="状态">
+        {/* <Form.Item label="状态">
           {getFieldDecorator('verifyStatus')(
             <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
               <Option value={0}>未通过</Option>
@@ -167,27 +188,30 @@ function body(props) {
               <Option value={2}>已驳回</Option>
             </Select>,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="归属置业顾问">
             <Row gutter={8}>
               <Col span={12}>
-                {getFieldDecorator('consultantName')(<Input placeholder="归属置业顾问" />)}
+                {getFieldDecorator('consultantName')(<Input placeholder="请选择置业顾问" />)}
               </Col>
               <Col span={12}>
-                <Button>选择</Button>
+                <Button onClick={() => showConsultant()}>选择</Button>
               </Col>
             </Row>
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
-            确定
+          <Button type="primary" className={Styles.SubmitButton} onClick={() => submitDate({ verifyStatus: '1' })}>
+            审核通过
           </Button>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => router.go(-1)}>
-            取消
+          <Button onClick={() => submitDate({ verifyStatus: '2' })}>
+            驳回
           </Button>
         </Form.Item>
       </Form>
+
+      {/* 选择置业顾问 */}
+      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)}/>
     </>
   );
 }

src/pages/customer/recommendCustomer/components/attribution.jsx

@@ -0,0 +1,141 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import Styles from '../style.less';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ * 调整归属
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalAttribution extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       dataSource: { records: [] },
+       visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.getList({ pageNumber: 1, pageSize: 5 })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.props.onCancel()
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  getList(params) {
+    // 网路请求
+    request({ ...apis.customer.consultant, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+   // 分页
+  onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5 })
+  }
+
+  // 提交
+  submitGm(record) {
+    // 网路请求
+    request({ ...apis.customer.recommendEdit, urlData: { id: this.state.visibleData.customerId }, data: { customerId: this.state.visibleData.customerId, realtyConsultant: record.personId } }).then(res => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('success', '操作成功')
+      this.handleCancel()
+      this.props.onSuccess({ realtyConsultant: record.personId, name: record.name })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      // this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  render() {
+    const columns = [
+      // {
+      //   title: '编号',
+      //   dataIndex: 'personId',
+      //   key: 'personId',
+      // },
+      {
+        title: '姓名',
+        dataIndex: 'name',
+        key: 'name',
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+      },
+      {
+        title: '部门',
+        dataIndex: 'department',
+        key: 'department',
+      },
+      {
+        title: '岗位',
+        dataIndex: 'post',
+        key: 'post',
+      },
+      {
+        title: '操作',
+        dataIndex: 'personId',
+        key: 'personId',
+        // eslint-disable-next-line no-nested-ternary
+        render: (_, record) => <>{ this.props.visibleData.realtyConsultant !== record.personId && <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>,
+      },
+    ]
+    return (
+      <>
+        <Modal
+            title="选择置业顾问"
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            // onOk={() => this.handleOk()}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            <Table rowKey="attribution" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/customer/recommendCustomer/index.jsx

@@ -160,7 +160,7 @@ function body(props) {
       title: '状态',
       dataIndex: 'verifyStatus',
       key: 'verifyStatus',
-      render: (_, record) => <><span>{ record.verifyStatus === 0 ? '未通过': record.verifyStatus === 1 ? '已通过' : record.verifyStatus === 2 ? '已驳回' : '' }</span></>,
+      render: (_, record) => <><span>{ record.verifyStatus === 0 ? '待审核': record.verifyStatus === 1 ? '已通过' : record.verifyStatus === 2 ? '已驳回' : '' }</span></>,
     },
     {
       title: '操作',
@@ -170,7 +170,7 @@ function body(props) {
         <>
           {
             <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>
-              {record.verifyStatus === null ? <span style={{ color: 'rgba(239,39,58,1)',cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
+              {record.verifyStatus === 0 ? <span style={{ color: 'rgba(239,39,58,1)',cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
             </AuthButton>
           }
         </>

src/pages/news/type/NewsType.jsx

@@ -114,6 +114,10 @@ function header(props) {
       ),
     },
   ];
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
 
   const { getFieldDecorator } = props.form
   return (
@@ -121,13 +125,18 @@ function header(props) {
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
-          {getFieldDecorator('status')(
-            <Select style={{ width: '180px' }} placeholder="请选择">
-              <Option value="1">已上架</Option>
-              <Option value="0">已下架</Option>
-            </Select>,
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
           )}
         </Form.Item>
+        <Form.Item>
+            <Button type="primary" htmlType="submit" >
+              查询
+            </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
       </Form>
       <AuthButton name="admin.taNewsType.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditNews()}>新增</Button>

src/services/apis.js

@@ -730,6 +730,11 @@ export default {
   },
  },
  helpActivity: {
+  effectiveList: {
+    url: `${prefix}/helpActivityEffective/list`,
+    method: 'GET',
+    action: 'admin.helpActivityEffective.list.get',
+  },
   list: {
     url: `${prefix}/helpActivity/list`,
     method: 'GET',