合并

src/pages/activity/helpActivity/helpRecord.jsx

@@ -28,7 +28,7 @@ function body(props) {
 
   // 默认私客
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [customerType, setCustomerType] = useState('private')
+  const [customerType, setCustomerType] = useState('helpSucceed')
 
   // 调整归属 ============  start
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -46,13 +46,15 @@ function body(props) {
   // 变更状态 ============= end
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
+  const { helpActivityId } = props.location.query
   useEffect(() => {
-    getList({ pageNumber: 1, pageSize: 10, customerType })
+    console.log('customerType', customerType)
+    getList({ pageNumber: 1, pageSize: 10, status: customerType, helpActivityId })
   }, [])
 
   function getList(params) {
     // 网路请求
-    request({ ...apis.customer.customerRecommend, params: { ...params } }).then(res => {
+    request({ ...apis.helpActivity.record, params: { ...params } }).then(res => {
       setDataSource(res)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
@@ -104,8 +106,8 @@ function body(props) {
 
     const { value } = e.target
     setCustomerType(value)
-    //setColumns(value === 'private' ? privateColumns : publicColumns)
-    getList({ pageNumber: 1, pageSize: 10, customerType: value })
+    // setColumns(value === 'helpSucceed' ? privateColumns : publicColumns)
+    getList({ pageNumber: 1, pageSize: 10, status: value, helpActivityId })
   }
 
   function handleReset() {
@@ -168,106 +170,80 @@ function body(props) {
 
   const publicColumns = [
     {
-      title: '头像',
-      dataIndex: 'picture',
-      key: 'picture',
+      title: '发起者',
+      dataIndex: 'name',
+      key: 'name',
       align: 'center',
       width: '15%',
-      render: (_, record) => <Avatar shape="square" src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
     },
     {
-      title: '姓名',
-      dataIndex: 'name',
-      key: 'name',
+      title: '发起者手机号',
+      dataIndex: 'phone',
+      key: 'phone',
       align: 'center',
       width: '10%',
-      // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
     },
     {
-      title: '电话',
-      dataIndex: 'phone',
-      key: 'phone',
+      title: '发起时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
       align: 'center',
       width: '15%',
     },
     {
-      title: '推广人员',
-      dataIndex: 'sharePersonName',
-      key: 'sharePersonName',
+      title: '助力者',
+      dataIndex: 'helpCount',
+      key: 'helpCount',
       align: 'center',
       width: '15%',
+      render: (text, record) => <a style={ { color: '#66B3FF' } } >{record.helpCount}/{record.persionNumCount}</a>,
     },
   ]
 
   const privateColumns = [
     {
-      title: '头像',
-      dataIndex: 'picture',
-      key: 'picture',
-      align: 'center',
-      width: '15%',
-      render: (_, record) => <Avatar shape="square" src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
-    },
-    {
-      title: '姓名',
+      title: '发起者',
       dataIndex: 'name',
       key: 'name',
       align: 'center',
-      width: '10%',
-      // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
+      width: '15%',
+      // render: (_, record) => <Avatar shape="square" src={customerType === 'helpSucceed' ? record.picture : record.avatarurl} size={64} icon="user" />,
     },
     {
-      title: '电话',
+      title: '手机号',
       dataIndex: 'phone',
       key: 'phone',
       align: 'center',
-      width: '15%',
-    },
-    {
-      title: '性别',
-      dataIndex: 'sex',
-      key: 'sex',
-      align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+      // render: (_, record) => <><span>{customerType === 'helpSucceed' ? record.name : record.nickname}</span></>,
     },
     {
-      title: '置业顾问',
-      dataIndex: 'consultantName',
-      key: 'consultantName',
+      title: '发起时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
       align: 'center',
-      width: '15%',
+      width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => (
-        <>
-          <span>{record.consultantName}</span>
-          <br />
-          <span>{record.consultTel}</span>
-        </>
-      ),
     },
     {
-      title: '推广人员',
-      dataIndex: 'sharePersonName',
-      key: 'sharePersonName',
+      title: '助力者',
+      dataIndex: 'helpCount',
+      key: 'helpCount',
       align: 'center',
       width: '15%',
+      render: (text, record) => <a style={ { color: '#66B3FF' } } >{record.helpCount}人</a>,
     },
     {
-      title: '客户状态',
+      title: '核销状态',
       dataIndex: 'reportRecommendStatus',
       key: 'reportRecommendStatus',
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
       render: (text, records) => {
-        if (records.status === 1) { return '报备' }
-        if (records.status === 2) { return '到访' }
-        if (records.status === 3) { return '认筹' }
-        if (records.status === 4) { return '签约' }
+        if (records.verificationStatus === 0) { return '未核销' }
+        if (records.verificationStatus === 1) { return '已核销' }
       },
     },
     {
@@ -276,7 +252,15 @@ function body(props) {
       key: 'customerId',
       align: 'center',
       width: '25%',
-      // eslint-disable-next-line no-nested-ternary
+      render: (x, row) => (
+        <>
+          {row.verificationStatus === 0 &&
+          <AuthButton name="admin.SignList.get" noRight={null}>
+           <span style={{ color: '#1990FF', cursor: 'pointer' }}>核销</span>
+          </AuthButton>
+        }
+        </>
+      ),
     },
   ]
 
@@ -308,18 +292,18 @@ function body(props) {
         导出
       </Button>
 
-      <div style={{ margin: '20px 0'}}>
+      <div style={{ margin: '20px 0' }}>
         <AuthButton name="admin.customer.recommend.get" noRight={null}>
           <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
-            <Radio.Button value="private">助力成功</Radio.Button>
-            <Radio.Button value="public">进行中</Radio.Button>
-            <Radio.Button value="error ">助力失败</Radio.Button>
+            <Radio.Button value="helpSucceed">助力成功</Radio.Button>
+            <Radio.Button value="helpUnderway">进行中</Radio.Button>
+            <Radio.Button value="helpUnfinished ">助力失败</Radio.Button>
           </Radio.Group>
         </AuthButton>
       </div>
-      {customerType === 'private' ? 
-        <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" /> 
+      {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" /> 
       }
     </>
   );

src/pages/activity/helpActivity/list.jsx

@@ -94,7 +94,7 @@ const toEditGoods = (helpActivityId) => () => {
           {row.status === 1 &&
           <AuthButton name="admin.SignList.get" noRight={null}>
         
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.dynamicId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
@@ -111,7 +111,7 @@ const toEditGoods = (helpActivityId) => () => {
 
           {row.status === 2 &&
         <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.dynamicId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
         </AuthButton>
@@ -120,11 +120,11 @@ const toEditGoods = (helpActivityId) => () => {
       ),
     },
   ];
-  const getSignList = (dynamicId) => {
+  const getSignList = helpActivityId => {
       router.push({
           pathname: '/activity/helpActivity/helpRecord',
           query: {
-              dynamicId
+            helpActivityId,
           },
         });
   }

src/services/apis.js

@@ -704,6 +704,11 @@ export default {
     method: 'post',
     action: 'admin.taRole.get',
   },
+  record: {
+    url: `${prefix}/helpRecord`,
+    method: 'get',
+    action: 'admin.taRole.get',
+  },
  },
  third: {
   thirdPartyMiniapp: {