Commit d8e8d403 by zhujian

fix

parent a2806bcd
......@@ -114,7 +114,7 @@ function ExamTable(props: any) {
pageSize={query.size}
total={total}
toPage={(page: any) => {
setQuery({ ...query, current: query.current + 1 })
setQuery({ ...query, current: page + 1 })
}}
/>
......
......@@ -2,6 +2,7 @@ import React, { useEffect, useRef, useState } from 'react';
import { Route, withRouter } from "react-router-dom";
import { Row, Input, Select, Tooltip, Col } from 'antd';
import RangePicker from '@/modules/common/DateRangePicker';
import WWOpenDataCom from '@/components/WWOpenDataCom';
import { PageControl, XMTable } from '@/components';
import Service from '@/common/js/service';
import ENUM from '../../enum';
......@@ -34,6 +35,16 @@ function StudyTable(props: any) {
function getList() {
Service.Hades('public/hades/getTaskCustomerRecordPage', query).then((res: any) => {
res.result.records.map((item: any) => {
item.department =item.departmentNameList.map((_item:any)=>{
if (_item == '1000') {
return '微信'
} else {
return <WWOpenDataCom type="departmentName" openid={_item} />
}
})
})
setList(res.result.records)
setTotal(res.result.total)
})
......@@ -63,8 +74,17 @@ function StudyTable(props: any) {
key: 'departmentNameList',
dataIndex: 'departmentNameList',
render: (val: any, record: any) => {
return <div>
{
record.department.map((item:any,index:number)=>{
if((index+1) ==record.department.length){
return item
}else{
return [item,';']
}
return <div>{val.join(';')}</div>;
})
}</div>
},
},
......@@ -120,16 +140,16 @@ function StudyTable(props: any) {
dataIndex: 'operate',
render: (val: any, record: any) => {
return (
<div className='operate-area'>
<span
className='operate-item'
style={{ color: 'rgba(41, 102, 255, 1)', cursor: 'pointer' }}
onClick={() => {
props.history.push(`${props.match.url}/user-learning-data/${record.storeCustomerId}`);
}}>
查看数据
</span>
</div>
<div className='operate-area'>
<span
className='operate-item'
style={{ color: 'rgba(41, 102, 255, 1)', cursor: 'pointer' }}
onClick={() => {
props.history.push(`${props.match.url}/user-learning-data/${record.storeCustomerId}`);
}}>
查看数据
</span>
</div>
);
},
},
......@@ -267,7 +287,7 @@ function StudyTable(props: any) {
pageSize={query.size}
total={total}
toPage={(page: any) => {
setQuery({ ...query, current: query.current + 1 })
setQuery({ ...query, current: page + 1 })
}}
/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment