Commit 0c187762 authored by cellee's avatar cellee

Merge branch 'final' of http://120.77.240.215:9701/Maple/tostumi.git into final

parents 49e9c351 82d3ebe0
...@@ -37,7 +37,7 @@ const Card = (props: any) => { ...@@ -37,7 +37,7 @@ const Card = (props: any) => {
null, null,
(text: any, record: any) => ( (text: any, record: any) => (
<Space size="middle"> <Space size="middle">
{record.build_number + '#' + record.floor_number + '-' + record.room_number} {record.build_number + ' #' + record.floor_number + '-' + record.room_number}
</Space> </Space>
), ),
], ],
......
...@@ -42,8 +42,8 @@ const CardAdd = (props: any) => { ...@@ -42,8 +42,8 @@ const CardAdd = (props: any) => {
} }
values.communityName = communityName; values.communityName = communityName;
console.log(values);
values.buildNumber = 'BLK ' + values.buildNumber; values.buildNumber = 'BLK ' + values.buildNumber;
console.log(values);
setLoading(true); setLoading(true);
RA(35, values, module, dispatch); RA(35, values, module, dispatch);
}; };
......
...@@ -35,7 +35,7 @@ const Renovation = (props: any) => { ...@@ -35,7 +35,7 @@ const Renovation = (props: any) => {
null, null,
(text: any, record: any) => ( (text: any, record: any) => (
<div> <div>
{record.communityBuildDecorate}#{record.communityFloorDecorate}- {record.communityBuildDecorate} #{record.communityFloorDecorate}-
{record.communityRoomDecoate} {record.communityRoomDecoate}
</div> </div>
), ),
......
...@@ -108,7 +108,7 @@ const ChargeManager = (props: any) => { ...@@ -108,7 +108,7 @@ const ChargeManager = (props: any) => {
title: 'Unit', title: 'Unit',
dataIndex: 'buildingNumber', dataIndex: 'buildingNumber',
render: (text: any, record: any) => ( render: (text: any, record: any) => (
<div>{`${record.buildingNumber}#${record.floorNumber}-${record.roomNumber}`}</div> <div>{`${record.buildingNumber} #${record.floorNumber}-${record.roomNumber}`}</div>
), ),
}, },
{ {
......
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