合并

src/pages/activity/helpActivity/helpRecord.jsx

   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk () {
-    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
+    this.props.onCancel()
   }
 
   // 弹框取消按钮
   handleCancel () {
-    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
+    this.props.onCancel()
   }
 
   getList (params) {
         dataIndex: 'createDate',
         key: 'createDate',
         align: 'center',
+        render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
       },
     ]
     return (
           footer={null}
           visible={this.state.visibleData.visible}
           // onOk={() => this.handleOk()}
-          onCancel={(e) => this.handleCancel(e)}
+          onCancel={e => this.handleCancel(e)}
         >
 
       <Button type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
   // eslint-disable-next-line react/sort-comp
   handleOk () {
     this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
-    
   }
 
   // 弹框取消按钮
   handleCancel () {
-    this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
+    console.log('核销关闭');
+    // this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
+    this.props.onCancel()
   }
 
   // eslint-disable-next-line class-methods-use-this
           footer={null}
           visible={this.state.visibleData.visible}
           // onOk={() => this.handleOk()}
-          onCancel={(e) => this.handleCancel(e)}
+          onCancel={e => this.handleCancel(e)}
         >
           <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
-           <Button onClick={(e) => this.verification(e)} style={{ marginLeft: '80px' }}>立即核销</Button>
+           <Button onClick={e => this.verification(e)} style={{ marginLeft: '80px' }}>立即核销</Button>
           </div>
         </Modal>
       </>
 
   // 提交事件
   function handleSubmit(e) {
-    displayNone()
+    // displayNone()
 
 
     e.preventDefault();
   function radioButtonHandleSizeChange(e) {
     setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
     setVerifierData({ visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' })
-    displayNone()
+    // displayNone()
 
     const { value } = e.target
     setCustomerType(value)
  function onSuccess(e) {
    console.log('回调：', e)
    getList(e)
-     // 核销
-   setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
+    
+   // 关闭
+   onCancel()
  }
+
+ function onCancel(e) {
+  // 核销
+  setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
+  // 助力者
+  setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
+ }
+
  // 返回到首页
  function returList(params) {
   router.push({
       key: 'createDate',
       align: 'center',
       width: '15%',
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
     },
     {
       title: '助力者',
       key: 'createDate',
       align: 'center',
       width: '10%',
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
       // eslint-disable-next-line no-nested-ternary
     },
     {
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
       render: (text, records) => {
-        if (records.verificationStatus === 0) { return '未核销' }
+        if (records.verificationStatus === 0 || records.verificationStatus === null) { return '未核销' }
         if (records.verificationStatus === 1) { return '已核销' }
       },
     },
       </div>
       {customerType === 'helpSucceed' ?
         <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" /> 
+        <Table dataSource={dataSource.list} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" />
       }
-        <Verifier visibleData={gVerifierData} onSuccess={(e) => onSuccess(e)} />
-       <InviteTable visibleData={gInviteData} />  
+        <Verifier visibleData={gVerifierData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)} />
+       <InviteTable visibleData={gInviteData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)}/>
     </>
   );
 }