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

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -206,13 +206,13 @@ const Edit = props => {
     const submitPoster = () => {
       if (helpActivityId) {
         if (posterId) {
-          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'helPactivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'helpActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
         } else {
-          request({ ...apis.activity.addPoster, data: { targetId: helpActivityId, targetType: 'helPactivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+          request({ ...apis.activity.addPoster, data: { targetId: helpActivityId, targetType: 'helpActivity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
             setPosterId(data.posterId)
             message.info("保存成功")
           }).catch((err) => {
@@ -293,7 +293,7 @@ const Edit = props => {
 
     if (helpActivityId) {
       useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'helPactivity' }, }).then((data) => {
+        request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'helpActivity' }, }).then((data) => {
           console.log(data, "2222")
           if (data.length > 0) {
             setShareContentId(data[0].shareContentId)
@@ -309,13 +309,13 @@ const Edit = props => {
     const submitShare = () => {
       if (helpActivityId) {
         if (shareContentId) {
-          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'helPactivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
         } else {
-          request({ ...apis.activity.addShareContent, data: { targetId: helpActivityId, shareContentType: 'helPactivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+          request({ ...apis.activity.addShareContent, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
             setShareContentId(data.shareContentId)
             message.info("保存成功")
           }).catch((err) => {

src/pages/activity/helpActivity/helpRecord.jsx

@@ -20,20 +20,21 @@ class InviteTable extends React.Component {
     super(props);
     this.state = {
       dataSource: { records: [] },
-      visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+      visibleData: { visible: false, helpId: '', realtyConsultant: '' },
     }
   }
 
   // 挂载之后
   componentDidMount () {
-    const { customerId } = this.state.visibleData
-    this.getList({ helpRecordInitiateId: customerId, pageNumber: 1, pageSize: 5 })
+    const { helpId } = this.state.visibleData
+    this.getList({ helpRecordInitiateId: helpId, pageNumber: 1, pageSize: 5 })
   }
 
   componentDidUpdate (preProps, preState) {
-    const { customerId } = this.state.visibleData
-    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
-      this.getList({ helpRecordInitiateId: customerId, pageNumber: 1, pageSize: 5 })
+    const { helpId } = this.state.visibleData
+
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.getList({ helpRecordInitiateId: helpId, pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
     }
   }
@@ -41,12 +42,12 @@ class InviteTable extends React.Component {
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk () {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
   }
 
   // 弹框取消按钮
   handleCancel () {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
   }
 
   getList (params) {
@@ -65,6 +66,27 @@ class InviteTable extends React.Component {
     })
   }
 
+  // eslint-disable-next-line class-methods-use-this
+  exportHelp() {
+    console.log('this.state.25252464122', this.state.visibleData)
+    request({ ...apis.helpActivity.gethelpRecordExport, responseType: 'blob', params: { helpRecordInitiateId: this.state.visibleData.helpId } })
+      .then(data => {
+        if (!data) {
+          return
+        }
+        const url = window.URL.createObjectURL(new Blob([data]))
+        const link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = url
+        link.setAttribute('download', '助力者记录.xlsx')
+        document.body.append(link)
+        link.click()
+      }).catch(() => {
+
+      })
+  }
+
+
   // 分页
   onChange (pageNum) {
     this.getList({ pageNumber: pageNum, pageSize: 5 })
@@ -104,7 +126,9 @@ class InviteTable extends React.Component {
           onCancel={(e) => this.handleCancel(e)}
         >
 
-          
+      <Button type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+        导出
+      </Button>
           <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
         </Modal>
       </>
@@ -114,38 +138,38 @@ class InviteTable extends React.Component {
 
 
 /**
- * 助力者弹框
+ * 核销弹框
  */
 class Verifier extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
       verification: { verificationCode: '' },
-      visibleData: { visible: false, customerId: '', realtyConsultant: '', helpRecordInitiateId: '', verificationCode: '' },
+      visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' },
     }
   }
 
   // 挂载之后
   componentDidMount () {
-    const { customerId } = this.state.visibleData
+    const { helpId } = this.state.visibleData
   }
 
   componentDidUpdate (preProps, preState) {
-    const { customerId } = this.state.visibleData
-    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
-      this.setState({ visibleData: { visible: this.props.visibleData.visible, customerId: this.props.visibleData.customerId, verificationCode: '' } })
+    const { helpId } = this.state.visibleData
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.setState({ visibleData: { visible: this.props.visibleData.visible, helpId: this.props.visibleData.helpId, helpRecordInitiateId: '', verificationCode: '' } })
     }
   }
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk () {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
   }
 
   // 弹框取消按钮
   handleCancel () {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
   }
 
   // eslint-disable-next-line class-methods-use-this
@@ -168,39 +192,14 @@ class Verifier extends React.Component {
 
   // eslint-disable-next-line class-methods-use-this
   verify(e) {
-    this.setState({ visibleData: { visible: true, customerId: this.props.visibleData.customerId, verificationCode: e.target.value } })
+    this.setState({ visibleData: { visible: true, helpId: this.props.visibleData.helpId, verificationCode: e.target.value } })
   }
 
   // eslint-disable-next-line class-methods-use-this
   verification(e) {
-    this.getList({ helpRecordInitiateId: this.state.visibleData.customerId, verifyCode: this.state.visibleData.verificationCode })
+    this.getList({ helpRecordInitiateId: this.state.visibleData.helpId, verifyCode: this.state.visibleData.verificationCode })
   }
 
-  //  exportCustomer() {
-  //   const code = customerType === 'helpSucceed' ? 1 : 0
-  //   request({ ...apis.helpActivity.HelpInitiateRecordSucceed, responseType: 'blob', params: { ...fieldsValue, customerType, helpActivityId, code } })
-  //     .then(response => {
-  //       download(response)
-  //     }).catch(() => {
-
-  //     })
-  // }
-
-  //  download(data) {
-  //   if (!data) {
-  //     return
-  //   }
-  //   const url = window.URL.createObjectURL(new Blob([data]))
-  //   const link = document.createElement('a')
-  //   link.style.display = 'none'
-  //   link.href = url
-  //   link.setAttribute('download', '助力记录.xlsx')
-  //   document.body.append(link)
-  //   link.click()
-  // }
-
-
-
   render () {
     return (
       <>
@@ -214,7 +213,7 @@ class Verifier extends React.Component {
           onCancel={(e) => this.handleCancel(e)}
         >
           <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
-           <Button onClick={(e) => this.verification(e)}>立即核销</Button>
+           <Button onClick={(e) => this.verification(e)} style={{ marginLeft: '80px' }}>立即核销</Button>
           </div>
         </Modal>
       </>
@@ -229,9 +228,10 @@ class Verifier extends React.Component {
  * @returns
  */
 function body(props) {
-  const [gInviteData, setGInviteData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+  const [gInviteData, setGInviteData] = useState({ visible: false, helpId: '', realtyConsultant: '' })
 
-  const [gVerifierData, setVerifierData] = useState({ visible: false, customerId: '', realtyConsultant: '', helpRecordInitiateId: '' })
+  // 核销码弹框
+  const [gVerifierData, setVerifierData] = useState({ visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' })
 
   const { getFieldDecorator, getFieldsValue } = props.form
 
@@ -246,7 +246,7 @@ function body(props) {
 
   // 调整归属 ============  start
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+  const [gVisibleData, setGVisibleData] = useState({ visible: false, helpId: '', realtyConsultant: '' })
 
 
   // 变更状态 ============= end
@@ -276,7 +276,7 @@ function body(props) {
   }
 
   function displayNone() {
-    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setGVisibleData({ visible: false, helpId: '', realtyConsultant: '' })
   }
 
   // 提交事件
@@ -306,7 +306,8 @@ function body(props) {
 
   // 助力成功/进行中/助力失败
   function radioButtonHandleSizeChange(e) {
-    setGInviteData({ visible: false, customerId: '', realtyConsultant: '' })
+    setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
+    setVerifierData({ visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' })
     displayNone()
 
     const { value } = e.target
@@ -355,24 +356,17 @@ function body(props) {
 
 // 助力记录弹框
 function helpRecord(row) {
-// 关闭核销
-console.log('gInviteData', gInviteData)
+  setVerifierData({ visible: false, helpId: row.helpRecordInitiateId, elpRecordInitiateId: '', verificationCode: '' })
+  
+  setGInviteData({ visible: true, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
 
-
-  setGInviteData({ visible: true, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
-
-  setVerifierData({ visible: false, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
 }
  // 核销
  function helpInitiateRecordVerify(row) {
-
-  console.log('gVerifierData', gVerifierData)
 // 关闭助力记录弹框
-  setGInviteData({ visible: false, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
-
-  setVerifierData({ visible: true, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
-
+  setGInviteData({ visible: false, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
 
+  setVerifierData({ visible: true, helpId: row.helpRecordInitiateId, elpRecordInitiateId: '', verificationCode: '' })
  }
 
   const publicColumns = [
@@ -455,8 +449,6 @@ console.log('gInviteData', gInviteData)
     },
     {
       title: '操作',
-      dataIndex: 'customerId',
-      key: 'customerId',
       align: 'center',
       width: '25%',
       render: (x, row) => (
@@ -512,8 +504,8 @@ console.log('gInviteData', gInviteData)
         <Table dataSource={dataSource.list} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
         <Table dataSource={dataSource.list} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
       }
-       <InviteTable visibleData={gInviteData} />
-       <Verifier visibleData={gVerifierData} />
+        <Verifier visibleData={gVerifierData} />
+       <InviteTable visibleData={gInviteData} />  
     </>
   );
 }

src/pages/activity/helpActivity/list.jsx

@@ -59,7 +59,7 @@ const toEditGoods = (helpActivityId) => () => {
       dataIndex: 'startDate',
       key: 'startDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>
+      render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD HH:mm')} —— ${moment(row.endDate).format('YYYY-MM-DD HH:mm')}`}</span></>,
     },
     {
       title: '已参加人数',
@@ -79,8 +79,8 @@ const toEditGoods = (helpActivityId) => () => {
       key: 'isEnlist',
       align: 'center',
       render: (text, records) => {
-        if (records.activityStatus === 0) { return '未开始' }
-        if (records.activityStatus === 1) { return '进行中' }
+        if (records.activityStatus === 1) { return '未开始' }
+        if (records.activityStatus === 0) { return '进行中' }
         if (records.activityStatus === 2) { return '已结束' }
       },
     },
@@ -197,14 +197,17 @@ const toEditGoods = (helpActivityId) => () => {
 const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
+      const startDate = values.startTime === undefined ? null : moment(values.startTime).format('YYYY-MM-DD')
+      const endDate = values.endTime === undefined ? null : moment(values.endTime).format('YYYY-MM-DD')
+      // 删除时间会传默认值 Invalid date
+
       if (!err) {
         console.log('提交数据: ', values)
-        getList({ pageNum: 1, pageSize: 10, ...values })
+        getList({ pageNum: 1, pageSize: 10, ...values, endDate, startDate })
       }
     });
   }
-
-   //重置搜索
+   // 重置搜索
    function handleReset() {
     props.form.resetFields();
   }
@@ -233,16 +236,21 @@ const handleSubmit = (e, props) => {
             />,
           )}
         </Form.Item>
-        {/* <Form.Item>
-          {getFieldDecorator('time')(
-            <DatePicker />
+        <Form.Item>
+          {getFieldDecorator('startTime')(
+            <DatePicker placeholder="活动开始时间"/>,
           )}
-        </Form.Item> */}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('endTime')(
+            <DatePicker placeholder="活动结束时间"/>,
+          )}
+        </Form.Item>
         <Form.Item>
-          {getFieldDecorator('status')(
+          {getFieldDecorator('activityStatus')(
             <Select style={{ width: '180px' }} placeholder="活动状态">
-              <Option value="0">未开始</Option>
-              <Option value="1">进行中</Option>
+              <Option value="1">未开始</Option>
+              <Option value="0">进行中</Option>
               <Option value="2">已结束</Option>
             </Select>,
           )}

src/services/apis.js

@@ -755,6 +755,11 @@ export default {
     method: 'get',
     action: 'admin.taRole.get',
   },
+  gethelpRecordExport: {
+    url: `${prefix}/helpRecord/export`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
  },
  groupActivity: {
   list: {