合并

src/pages/activity/drainage/Detail.jsx

   const [columns, setColumns] = useState([])
   const [startDate, setStartDate] = useState('')
   const [endDate, setEndDate] = useState('')
+  const [total,setTotal] = useState({})
   let daterange = []
   // let content = {}
   useEffect(() => {
   function gettaDrainageRecord (params) {
     request({ ...apis.activity.taDrainageRecord, params: { ...params } }).then((data) => {
       // setDatas(data)
-      console.log(data, '3333333333333')
+      setTotal(data)
+      console.log(data.total, '3333333333333')
       setDatas(tableData(data.records))
       // content = data.records[0]
       console.log('json: ', eval('(' + data.records[0].content + ')'))
     
   }
 
+  const changePageNum = pageNumber => {
+    gettaDrainageRecord({ pageNum: pageNumber, pageSize: 10 ,drainageId: drainageId, startTime: fromTime(startDate) ,endTime: fromTime(endDate)})
+}
   function excelPort(){
     // const fieldsValue = getFieldsValue()
     request({ ...apis.activity.exporttaDrainageRecord, params: { drainageId: drainageId ,startTime: fromTime(startDate) ,endTime: fromTime(endDate) }  })
       })
   }
 
+
+
   function download (data) {
     if (!data) {
       return
         {/* H5项目名称 */}
         {}  <Button type="primary" style={{ marginLeft: '30px', float: 'right', marginTop: '30px',marginBottom: '30px' }} onClick={excelPort}>导出数据</Button>
         <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)} />
+      </div>
       </div>
 
 

src/pages/activity/drainage/DrainageList.jsx

       visible: true,
     });
   };
-
+  const changePageNum = pageNumber => {
+    gettaDrainage({ pageNum: pageNumber, pageSize: 10 })
+}
 
   function handleOk () {
 
                 // prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                 placeholder="H5项目编号"
               />,
-
               // {getFieldDecorator('name', {
               // })(<Input/>)}
             )}
           <Forms />
         </Modal>
         <Table columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList"/>
-     
+        <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+       <Pagination showQuickJumper defaultCurrent={1} total={datas.total} onChange={(e) => changePageNum(e)} />
+      </div>
       </div>
     </>
   )

src/pages/activity/groupActivity/helpRecord.jsx

     super(props);
     this.state = {
       dataSource: { records: [] },
-      visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+      visibleData: { visible: false, groupActivityId: '', groupStatus: ''},
     }
   }
 
   // 挂载之后
   componentDidMount () {
-    const { customerId } = this.state.visibleData
-    this.getList({ helpRecordInitiateId: customerId, pageNumber: 1, pageSize: 5 })
+    const { groupActivityId } = this.state.visibleData
+    this.getList({ groupActivityId: groupActivityId, groupStatus:status,  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 { groupActivityId } = this.props.visibleData
+    console.log("groupActivityId",this.props.visibleData);
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.getList({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
     }
   }
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk () {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.setState({ visibleData: { visible: false, groupActivityId: '', realtyConsultant: '' } })
   }
 
   // 弹框取消按钮
   handleCancel () {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.setState({ visibleData: { visible: false, groupActivityId: '', realtyConsultant: '' } })
   }
 
   getList (params) {
-    request({ ...apis.groupActivity.shareSuccList, params: { ...params } }).then(res => {
+    console.log("params",params);
+    request({ ...apis.groupActivity.shareChildList, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
     this.getList({ pageNumber: pageNum, pageSize: 5 })
   }
 
+  exportChildRecord(params) {
+    request({ ...apis.groupActivity.exportShareChildRecord, responseType: 'blob', params: { ...params} })
+      .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(() => {
+
+      })
+  }
+
   render () {
     const columns = [
       {
         title: '用户姓名',
-        dataIndex: 'name',
-        key: 'name',
+        dataIndex: 'nickname',
+        key: 'nickname',
         align: 'center',
       },
       {
       },
       {
         title: '开团时间',
-        dataIndex: 'createDate',
-        key: 'createDate',
+        dataIndex: 'createTime',
+        key: 'createTime',
         align: 'center',
       },
     ]
           // onOk={() => this.handleOk()}
           onCancel={(e) => this.handleCancel(e)}
         >
+          <Button type="primary" onClick={() => this.exportChildRecord({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })} 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>
       </>
 }
 
 
-
-
-
-
-
 /**
- * 拼团者弹框
+ * 核销弹框
  */
 class Verifier extends React.Component {
   constructor(props) {
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk () {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    // this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
   // 弹框取消按钮
   handleCancel () {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    // this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.props.onCancel();
   }
 
   getList (params) {
  * @returns
  */
 function body(props) {
-  const [gInviteData, setGInviteData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+  const [gInviteData, setGInviteData] = useState({ visible: false, groupActivityId : '', recordId:'',  groupStatus: ''})
 
-  const [gVerifierData, setVerifierData] = useState({ visible: false, customerId: '', realtyConsultant: '', helpRecordInitiateId: '' })
+  const [gVerifierData, setVerifierData] = useState({ visible: false, groupActivityId: '', groupStatus: '' })
 
   const { getFieldDecorator, getFieldsValue } = props.form
 
 
   // 调整归属 ============  start
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+  const [gVisibleData, setGVisibleData] = useState({ visible: false})
 
 
   // 变更状态 ============= end
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const { groupActivityId } = props.location.query
   useEffect(() => {
-    getList({ pageNumber: 1, pageSize: 10, status: groupStatus, groupActivityId: groupActivityId })
+    getList({ pageNumber: 1, pageSize: 10, groupStatus: groupStatus, groupActivityId: groupActivityId })
   }, [])
 
   
   }
 
   function getList(params) {
+    console.log(params);
     // 网路请求
     request({ ...apis.groupActivity.shareSuccList, params: { ...params } }).then(res => {
-        console.log(res);
       setDataSource(res)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
 
   // 助力成功/进行中/助力失败
   function radioButtonHandleSizeChange(e) {
-    setGInviteData({ visible: true, customerId: '', realtyConsultant: '' })
+    setGInviteData({ visible: false})
     displayNone()
 
     const { value } = e.target
     setgroupStatus(value)
-    // setColumns(value === 'helpSucceed' ? privateColumns : publicColumns)
     if (value == 0) { 
         console.log("success", value)
-        getList({ pageNumber: 1, pageSize: 10, status: value, groupActivityId }) }
+        getList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId }) }
     if (value == 1 || value == 2) {
         console.log("faile", value)
-         getFailList({ pageNumber: 1, pageSize: 10, status: value, groupActivityId })
+         getFailList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId })
          }
   }
 
     });
   }
 
-  function exportCustomer () {
-    const fieldsValue = getFieldsValue()
-    request({ ...apis.customer.customerRecommendExport, responseType: 'blob', params: { ...fieldsValue, groupStatus } })
-      .then(response => {
-        download(response)
-      }).catch(error => {
-
-      })
-  }
-
   function download (data) {
     if (!data) {
       return
     const link = document.createElement('a')
     link.style.display = 'none'
     link.href = url
-    link.setAttribute('download', '客户列表.xlsx')
+    link.setAttribute('download', '拼团列表.xlsx')
     document.body.append(link)
     link.click()
   }
 
+  function exportRecord () {
+    request({ ...apis.groupActivity.exportShareRecord, responseType: 'blob', params: {groupActivityId: groupActivityId, groupStatus: groupStatus } })
+      .then(response => {
+        download(response)
+      }).catch(error => {
+
+      })
+  }
+
 // 助力记录弹框
 function helpRecord(row) {
 // 关闭核销
 // eslint-disable-next-line max-len
-setVerifierData({ visible: false, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+  setVerifierData({ visible: false, helpRecordInitiateId: row.helpRecordInitiateId})
   // eslint-disable-next-line max-len
-  setGInviteData({ visible: true, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+  console.log("tttttttttt",row);
+  setGInviteData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: row.status, recordId: row.recordId})
 }
  // 核销
  function helpInitiateRecordVerify(row) {
 // 关闭助力记录弹框
 // eslint-disable-next-line max-len
-  setVerifierData({ visible: true, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+  setVerifierData({ visible: true, helpRecordInitiateId: row.helpRecordInitiateId})
   // eslint-disable-next-line max-len
-  setGInviteData({ visible: false, customerId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+  setGInviteData({ visible: false, helpRecordInitiateId: row.helpRecordInitiateId})
  }
 
   const publicColumns = [
         <>
           {row.verificationStatus === 0 &&
           <AuthButton name="admin.SignList.get" noRight={null}>
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={() => helpInitiateRecordVerify(row)}>核销</span>
+           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={(e) => helpInitiateRecordVerify(row)}>核销</span>
           </AuthButton>
         }
         </>
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
-          {getFieldDecorator('tel')(
+          {getFieldDecorator('phone')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="电话"
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+      <Button type="primary" onClick={() => exportRecord()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
         导出
       </Button>
 
         <Table dataSource={dataSource.records} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
         <Table dataSource={dataSource.records} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
       }
-       {/* <InviteTable visibleData={gInviteData} />
-       <Verifier visibleData={gVerifierData} /> */}
+       <InviteTable visibleData={gInviteData} />
+       {/* 核销 */}
+       <Verifier visibleData={gVerifierData} />
     </>
   );
 }

src/services/apis.js

     url: `${prefix}/taShareFailAndProcessingRecord`,
     method: 'get',
     action: 'admin.taRole.get',
+  },
+  shareChildList : {
+    url: `${prefix}/taShareChildRecord`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
+  exportShareChildRecord: {
+    url: `${prefix}/taShareChildRecord/export`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
+  exportShareRecord: {
+    url: `${prefix}/taShareRecord/export`,
+    method: 'get',
+    action: 'admin.taRole.get',
   }
  },
  third: {