合并

src/pages/activity/helpActivity/edithelpActivity.jsx

 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
 
+const header = props => {
+  const [isEnlist, setIsEnlist] = useState(1)
+
+  const radioOnChange = e => {
+    // console.log(e.target.value)
+    setIsEnlist(e.target.value)
+  }
+
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState({ channelNmae: [], result: [] })
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const { helpActivityId } = props
+  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
+
+
+      // 详情
+      const getDynamicData = helpActivityId => {
+        request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
+          data.activityTime = [moment(data.startDate), moment(data.endDate)]
+          const num = data.helpNum > 0 ? 1 : 0
+          setIsEnlist(num)
+          data.isEnlist = num
+          props.form.setFieldsValue(data)
+          setDynamicData(data)
+        })
+      }
+
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      // eslint-disable-next-line no-use-before-define
+      if (helpActivityId) {
+        getDynamicData(helpActivityId) 
+      }
+    }, [])
+
+  // function addChannel(params) {
+  //   request({ ...apis.channelList.addChannel, data: { ...params } }).then((data) => {
+  //     setData(data)
+  // }).catch((err) => {
+  //     console.log(err)
+  //     message.info(err.msg || err.message)
+  // })
+  // }
+
+  
+  const cancelPage = () => {
+    router.push({
+      pathname: '/activity/helpActivity/list',
+    });
+  }
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        if (values.isEnlist === 0) {
+          values.helpNum = 0
+        }
+
+        const { activityTime, signupTime, ...submitValue } = values
+        const [startDate, endDate] = activityTime
+        submitValue.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
+        submitValue.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
+        // const [enlistStart, enlistEnd] = signupTime
+        // submitValue.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
+        // submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
+        console.log('submit data --->', submitValue)
+        if (helpActivityId) {
+          submitValue.helpActivityId = helpActivityId
+          request({ ...apis.helpActivity.update, data: submitValue }).then((data) => {
+            message.info("保存成功")
+            cancelPage()
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.helpActivity.add, data: submitValue }).then((data) => {
+            message.info("保存成功")
+            cancelPage()
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        }
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="所属项目">
+        {getFieldDecorator('buildingId', {
+          rules: [
+            {
+              required: true,
+              message: '请选择所属项目',
+            },
+          ],
+        })(<BuildSelect />)}
+        </Form.Item>
+
+        <Form.Item label="活动标题">
+        {getFieldDecorator('title', {
+          rules: [
+            {
+              required: true,
+              message: '请输入活动标题',
+            },
+          ],
+        })(<Input />)}
+        </Form.Item>
+
+        <Form.Item label="活动主图">
+          {getFieldDecorator('img')(<ImageUploader />)}
+          <span>建议图片尺寸：750px*560px</span>
+        </Form.Item>
+
+        <Form.Item label="活动时间">
+        {getFieldDecorator('activityTime', {
+          rules: [
+            {
+              required: true,
+              message: '请选择活动时间',
+            },
+          ],
+        })(<RangePicker format="YYYY-MM-DD HH:mm" />)}
+        </Form.Item>
+
+
+
+        <Form.Item label="助力邀请人数">
+        {getFieldDecorator('personNum', {
+          rules: [
+            {
+              required: true,
+              message: '请输入活动人数',
+            },
+          ],
+        })(<Input />)}
+        </Form.Item>
+
+        <Form.Item label="是否助力">
+        {getFieldDecorator('isEnlist', {
+          rules: [
+            {
+              required: true,
+              message: '请选择是否助力',
+            },
+          ],
+        })(
+          <Radio.Group onChange={(e) => radioOnChange(e)}>
+            <Radio value={0}>不限制</Radio>
+            <Radio value={1}>限制</Radio>
+          </Radio.Group>,
+        )}
+        </Form.Item>
+         {
+           isEnlist === 1 && <Form.Item label="请输入助力人数">
+           {getFieldDecorator('helpNum', {
+             rules: [
+               {
+                 required: true,
+                 message: '请输入助力人数',
+               },
+             ],
+           })(<Input type="number" />)}
+           </Form.Item>
+         }
+
+        <Form.Item label="活动说明">
+          {getFieldDecorator('activityInstructions')(<ImageUploader />)}
+          <span>建议图片尺寸：750px*560px</span>
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
+          <Button type="primary" htmlType="submit">
+            确认
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => router.go(-1)}>
+            取消
+          </Button>
+          </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const Basic = Form.create({ name: 'header' })(header);
+
 /**
  *
  *
     setDynamicData({ ...dynamicData, isEnlist: e.target.value })
   }
 
-  const Basic = props => {
-    const fields = [
-      {
-        label: '选择项目',
-        name: 'buildingId',
-        render: <BuildSelect />,
-        value: dynamicData.buildingId,
-        rules: [
-          { required: true, message: '请选择项目' },
-        ],
-      },
-      {
-        label: '活动标题',
-        name: 'title',
-        type: FieldTypes.Text,
-        value: dynamicData.title,
-        rules: [
-          { required: true, message: '请输入活动标题' },
-        ]
-      },
-      {
-        label: '活动主图',
-        name: 'img',
-        type: FieldTypes.ImageUploader,
-        value: dynamicData.img,
-        help: '建议图片尺寸：750px*560px',
-      },
-      {
-        label: '活动时间',
-        name: 'activityTime',
-        type: FieldTypes.RangePicker,
-        value: dynamicData.startDate != null ? [moment(dynamicData.startDate, 'YYYY-MM-DD HH:mm'), moment(dynamicData.endDate, 'YYYY-MM-DD HH:mm')] : null,
-        props: { showTime: { format: 'HH:mm' } },
-        rules: [
-          { required: true, message: '请选择活动时间' },
-        ],
-      },
-      {
-        label: '助力邀请人数',
-        name: 'persionNum',
-        type: FieldTypes.Text,
-        value: dynamicData.persionNum,
-        rules: [
-          { required: true, message: '请输入活动人数' },
-        ]
-      },
-      {
-        label: '助力次数',
-        name: 'helpNumStatus',
-        type: FieldTypes.Text,
-        value: dynamicData.isEnlist != null ? dynamicData.isEnlist - 0 : 1,
-        rules: [
-          { required: true, message: '请选择是否助力' },
-        ],
-        render: <Radio.Group name="radiogroup" onChange={(e) => radioOnChange(e)}>
-        <Radio value={0}>不限制</Radio>
-        <Radio value={1}>次数限制</Radio>
-      </Radio.Group>,
-      },
-
-      {
-        label: '请输入助力人数',
-        name: 'helpNum',
-        // type: FieldTypes.RangePicker,
-        render: dynamicData.isEnlist === 1 ? (<Input/>) : '',
-        value: dynamicData.helpNum,
-        // props: {showTime:{ format: 'HH:mm' }},
-        // rules: [
-        //   { required: true, message: '请输入助力人数' },
-        // ],
-      },
-      {
-        label: '活动说明',
-        name: 'activityInstructions',
-        type: FieldTypes.ImageUploader,
-        value: dynamicData.activityInstructions,
-        help: '建议图片尺寸：750px*560px',
-      },
-    ]
-
-    const handleSubmit = val => {
-      const { activityTime, signupTime, ...submitValue } = val
-      console.log('val', val)
-      const [startDate, endDate] = activityTime
-      submitValue.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
-      submitValue.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
-      // const [enlistStart, enlistEnd] = signupTime
-      // submitValue.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
-      // submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
-      console.log('submit data --->', submitValue)
-      if (helpActivityId) {
-        submitValue.helpActivityId = helpActivityId
-        request({ ...apis.helpActivity.update, data: submitValue }).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      } else {
-        request({ ...apis.helpActivity.add, data: submitValue }).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      }
-    }
-
-    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
-  }
-
   const Poster = (props) => {
     const [inputValue, changeInput] = useState('')
     const [textAreaValue, changeTextArea] = useState('')
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic />}
+        {tab === 'basic' && <Basic helpActivityId={helpActivityId}/>}
         {tab === 'poster' && <Poster />}
         {tab === 'share' && <Share />}
       </div>

src/pages/activity/helpActivity/helpRecord.jsx

     super(props);
     this.state = {
       verification: { verificationCode: '' },
-      visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' },
+      visibleData: { visible: false, helpId: '', helpActivityId: '', helpRecordInitiateId: '', verificationCode: '' },
     }
   }
 
   componentDidUpdate (preProps, preState) {
     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/no-did-update-set-state
+      this.setState({ visibleData: { ...this.props.visibleData } })
     }
   }
 
   // eslint-disable-next-line react/sort-comp
   handleOk () {
     this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
+    
   }
 
   // 弹框取消按钮
   // eslint-disable-next-line class-methods-use-this
   verification(e) {
     this.audit({ helpRecordInitiateId: this.state.visibleData.helpId, verifyCode: this.state.visibleData.verificationCode })
-
-    this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
+    this.props.onSuccess({ pageNumber: 1, pageSize: 10, helpActivityId: this.props.visibleData.helpActivityId, status: 'helpSucceed' })
   }
 
   render () {
  * @returns
  */
 function body(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const [gInviteData, setGInviteData] = useState({ visible: false, helpId: '', realtyConsultant: '' })
 
   // 核销码弹框
-  const [gVerifierData, setVerifierData] = useState({ visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' })
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [gVerifierData, setVerifierData] = useState({ visible: false, helpId: '', helpActivityId: '', helpRecordInitiateId: '', verificationCode: '' })
 
   const { getFieldDecorator, getFieldsValue } = props.form
 
 // 助力记录弹框
 function helpRecord(row) {
   setVerifierData({ visible: false, helpId: row.helpRecordInitiateId, elpRecordInitiateId: '', verificationCode: '' })
-  
   setGInviteData({ visible: true, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
-
 }
  // 核销
  function helpInitiateRecordVerify(row) {
 // 关闭助力记录弹框
   setGInviteData({ visible: false, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
 
-  setVerifierData({ visible: true, helpId: row.helpRecordInitiateId, elpRecordInitiateId: '', verificationCode: '' })
+  // 核销
+  setVerifierData({ visible: true, helpId: row.helpRecordInitiateId, helpActivityId: row.helpActivityId, elpRecordInitiateId: '', verificationCode: '' })
+ }
+
+ function onSuccess(e) {
+   console.log('回调：', e)
+   getList(e)
+     // 核销
+   setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
  }
 
   const publicColumns = [
         <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" /> 
       }
-        <Verifier visibleData={gVerifierData} />
+        <Verifier visibleData={gVerifierData} onSuccess={(e) => onSuccess(e)} />
        <InviteTable visibleData={gInviteData} />  
     </>
   );