|
@@ -704,8 +704,8 @@ class _ExpenseDetailReportPageState
|
|
|
'billDate': d.billDate != null && d.billDate!.length >= 10
|
|
'billDate': d.billDate != null && d.billDate!.length >= 10
|
|
|
? d.billDate!.substring(0, 10)
|
|
? d.billDate!.substring(0, 10)
|
|
|
: '-',
|
|
: '-',
|
|
|
- 'amount': formatAmount(d.amount),
|
|
|
|
|
- 'approvedAmount': formatAmount(d.approvedAmount),
|
|
|
|
|
|
|
+ 'amount': d.amount,
|
|
|
|
|
+ 'approvedAmount': d.approvedAmount,
|
|
|
'reason': d.reason,
|
|
'reason': d.reason,
|
|
|
'isTransferred': d.isTransferred ? '1' : '',
|
|
'isTransferred': d.isTransferred ? '1' : '',
|
|
|
}).toList();
|
|
}).toList();
|
|
@@ -758,7 +758,7 @@ class _ExpenseDetailReportPageState
|
|
|
width: 180,
|
|
width: 180,
|
|
|
align: TDTableColAlign.right,
|
|
align: TDTableColAlign.right,
|
|
|
cellBuilder: (context, rowIndex) {
|
|
cellBuilder: (context, rowIndex) {
|
|
|
- final amount = double.parse(tableData[rowIndex]['amount'] as String);
|
|
|
|
|
|
|
+ final amount = (tableData[rowIndex]['amount'] as num).toDouble();
|
|
|
return Text(
|
|
return Text(
|
|
|
formatAmount(amount),
|
|
formatAmount(amount),
|
|
|
style: TextStyle(
|
|
style: TextStyle(
|
|
@@ -775,7 +775,7 @@ class _ExpenseDetailReportPageState
|
|
|
width: 180,
|
|
width: 180,
|
|
|
align: TDTableColAlign.right,
|
|
align: TDTableColAlign.right,
|
|
|
cellBuilder: (context, rowIndex) {
|
|
cellBuilder: (context, rowIndex) {
|
|
|
- final amount = double.parse(tableData[rowIndex]['approvedAmount'] as String);
|
|
|
|
|
|
|
+ final amount = (tableData[rowIndex]['approvedAmount'] as num).toDouble();
|
|
|
return Text(
|
|
return Text(
|
|
|
formatAmount(amount),
|
|
formatAmount(amount),
|
|
|
style: TextStyle(
|
|
style: TextStyle(
|