Commit ba10142e authored by cellee's avatar cellee

Signed-off-by: cellee <893264950@qq.com>

parent 00695ee7
...@@ -157,11 +157,21 @@ const BookingDetail = (props: any) => { ...@@ -157,11 +157,21 @@ const BookingDetail = (props: any) => {
<hr /> <hr />
{/* 已交押金且未产生退费且不是免费的 */} {/* 已交押金且未产生退费且不是免费的 */}
{(DataSave && {/* {(DataSave &&
DataSaveDetail && DataSaveDetail &&
DataSave.managerFeeStatus == 1 && DataSave.managerFeeStatus == 1 &&
DataSaveDetail.backMarginFee == 0 && DataSaveDetail.backMarginFee == 0 &&
DataSaveDetail.managerFee > 0) || DataSaveDetail.managerFee > 0) ||
(DataSaveDetail.managerFee == 0 &&
DataSaveDetail.marginFee > 0 &&
DataSave.status != 3 &&
DataSave.status != 5) ? ( */}
{(DataSave &&
DataSaveDetail &&
DataSave.managerFeeStatus == 1 &&
DataSaveDetail.backMarginFee == 0 &&
DataSaveDetail.marginFee > 0) ||
(DataSaveDetail.managerFee == 0 && (DataSaveDetail.managerFee == 0 &&
DataSaveDetail.marginFee > 0 && DataSaveDetail.marginFee > 0 &&
DataSave.status != 3 && DataSave.status != 3 &&
......
...@@ -203,7 +203,7 @@ const Bookings = (props: any) => { ...@@ -203,7 +203,7 @@ const Bookings = (props: any) => {
message.error('Reservation period already exists!'); message.error('Reservation period already exists!');
return false; return false;
} else { } else {
console.log(tmp); delete tmp.Time;
RA(11, tmp); RA(11, tmp);
} }
} }
...@@ -226,7 +226,7 @@ const Bookings = (props: any) => { ...@@ -226,7 +226,7 @@ const Bookings = (props: any) => {
// 然后在做切换 // 然后在做切换
Data3.map((item: any, index: any) => { Data3.map((item: any, index: any) => {
item.categorieList.map((thing: any, i: any) => { item.categorieList.map((thing: any, i: any) => {
if (thing.categoriesId == e.target.value) { if (thing.categoriesId == e.target.value.categoriesId) {
setCurString({ setCurString({
communityManagerFee: parseInt(item.communityManagerFee).toFixed(2), communityManagerFee: parseInt(item.communityManagerFee).toFixed(2),
communityMargin: parseInt(item.communityMargin).toFixed(2), communityMargin: parseInt(item.communityMargin).toFixed(2),
...@@ -360,7 +360,7 @@ const Bookings = (props: any) => { ...@@ -360,7 +360,7 @@ const Bookings = (props: any) => {
</i> </i>
{item.categorieList.map((thing: any, i: any) => { {item.categorieList.map((thing: any, i: any) => {
return ( return (
<Radio key={thing.categoriesId} value={thing.categoriesId}> <Radio key={thing.categoriesId} value={thing}>
{thing.categoriesName} {thing.categoriesName}
</Radio> </Radio>
); );
......
...@@ -272,6 +272,7 @@ const FacilityBookings = (props: any) => { ...@@ -272,6 +272,7 @@ const FacilityBookings = (props: any) => {
status: curString.status, status: curString.status,
subscribeDate: curString.subscribeDate, subscribeDate: curString.subscribeDate,
pageNum: curString.curPage, pageNum: curString.curPage,
globalMark: curString.globalMark,
}); });
} else { } else {
RA(8, { RA(8, {
......
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