Merge branch '20220518-折叠以后再展开才是实际的数据' into 'master-20220527'

5.27 折叠以后再展开才是实际的数据

See merge request eshop/fe_service_ebtp_frontend!83
This commit is contained in:
周建龙
2022-05-27 14:41:12 +08:00
2 changed files with 18 additions and 19 deletions

View File

@ -488,7 +488,7 @@ const Index: React.FC<IndexProps> = (props) => {
clearInterval(task)
}
}
}, []);
}, [messProp.roomId]);
const showTimeDetail = (endDate: any) => {
let endtime = new Date(endDate.replace(/-/g, '/')); //定义结束时间

View File

@ -10,7 +10,6 @@ import { getStatusByProId } from '@/services/downLoad';
import { ExclamationCircleOutlined } from '@ant-design/icons';
const Index: React.FC<{}> = () => {
const [dateList, setDateList] = useState([]);
let projectId = getProId()
const [expandedRowKeys, setExpandedRowKeys] = useState<ReactText[]>([0]);
//供应商资质库显示状态
@ -24,19 +23,19 @@ const Index: React.FC<{}> = () => {
* @returns true-有供应商资质库信息 false-无供应商资质库信息
*/
const getSupplierStatus = async (id: string) => {
await getStatusByProId({id: id}).then(res => {
setTip(false)
if(res?.code == 200) {
setSupplierStatus(res?.data)
}
await getStatusByProId({ id: id }).then(res => {
setTip(false)
if (res?.code == 200) {
setSupplierStatus(res?.data)
}
})
}
let listDate = dateList?.map((item: any, index: any) => ({
let listRender = (list: any[]) => list?.map((item: any, index: any) => ({
title: item.packageName + '—第' + item.roomSort + '轮',
description: (
<div>
<TableLook messProp={item} itemIndex={index} supplierStatus={supplierStatus}/>
<TableLook messProp={item} itemIndex={index} supplierStatus={supplierStatus} />
{/* {expandedRowKeys.includes(item.sectionVO.bsId) ? <TableLook messProp={item} itemIndex={index} /> : null} */}
</div>
)
@ -55,13 +54,13 @@ const Index: React.FC<{}> = () => {
<div>
<div>
<Row>
<Col span="24">
<div className="first-title"></div>
</Col>
<Col span="24" hidden={tip}>
<div><Tag hidden={!supplierStatus} style={{ marginBottom: "10px", marginLeft: "20px" }} icon={<ExclamationCircleOutlined />} color="warning"> --- </Tag></div>
<div><Tag hidden={getSessionProjectData().isIPassFile == '1' ? true : false} style={{ marginBottom: "20px" }} icon={<ExclamationCircleOutlined />} color="warning"> ipass</Tag></div>
</Col>
<Col span="24">
<div className="first-title"></div>
</Col>
<Col span="24" hidden={tip}>
<div><Tag hidden={!supplierStatus} style={{ marginBottom: "10px", marginLeft: "20px" }} icon={<ExclamationCircleOutlined />} color="warning"> --- </Tag></div>
<div><Tag hidden={getSessionProjectData().isIPassFile == '1' ? true : false} style={{ marginBottom: "20px" }} icon={<ExclamationCircleOutlined />} color="warning"> ipass</Tag></div>
</Col>
</Row>
</div>
</div>
@ -73,9 +72,9 @@ const Index: React.FC<{}> = () => {
await getPackages(params).then((res) => {
if (res.code == 200) {
let data = res.data;
setDateList(res.data.records)
// setDateList(res.data.records)
return Promise.resolve({
data: data.records,
data: listRender(data.records),
success: res.success,
total: res.data.total,
current: res.data.current,
@ -94,7 +93,7 @@ const Index: React.FC<{}> = () => {
showSizeChanger: true,
}}
expandable={{ expandedRowKeys, onExpandedRowsChange: setExpandedRowKeys, onExpand: changeList }}
dataSource={listDate}
// dataSource={listDate}
metas={{
title: {},
content: {},