|
@@ -703,10 +703,10 @@ 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': d.amount,
|
|
|
|
|
- 'approvedAmount': d.approvedAmount,
|
|
|
|
|
|
|
+ 'amount': d.amount.toStringAsFixed(2),
|
|
|
|
|
+ 'approvedAmount': d.approvedAmount.toStringAsFixed(2),
|
|
|
'reason': d.reason,
|
|
'reason': d.reason,
|
|
|
- 'isTransferred': d.isTransferred,
|
|
|
|
|
|
|
+ 'isTransferred': d.isTransferred ? '1' : '',
|
|
|
}).toList();
|
|
}).toList();
|
|
|
|
|
|
|
|
final totalPages = (_detailTotal / 20).ceil();
|
|
final totalPages = (_detailTotal / 20).ceil();
|
|
@@ -757,7 +757,7 @@ class _ExpenseDetailReportPageState
|
|
|
width: 85,
|
|
width: 85,
|
|
|
align: TDTableColAlign.right,
|
|
align: TDTableColAlign.right,
|
|
|
cellBuilder: (context, rowIndex) {
|
|
cellBuilder: (context, rowIndex) {
|
|
|
- final amount = tableData[rowIndex]['amount'] as double;
|
|
|
|
|
|
|
+ final amount = double.parse(tableData[rowIndex]['amount'] as String);
|
|
|
return Text(
|
|
return Text(
|
|
|
'¥${amount.toStringAsFixed(2)}',
|
|
'¥${amount.toStringAsFixed(2)}',
|
|
|
style: TextStyle(
|
|
style: TextStyle(
|
|
@@ -774,7 +774,7 @@ class _ExpenseDetailReportPageState
|
|
|
width: 85,
|
|
width: 85,
|
|
|
align: TDTableColAlign.right,
|
|
align: TDTableColAlign.right,
|
|
|
cellBuilder: (context, rowIndex) {
|
|
cellBuilder: (context, rowIndex) {
|
|
|
- final amount = tableData[rowIndex]['approvedAmount'] as double;
|
|
|
|
|
|
|
+ final amount = double.parse(tableData[rowIndex]['approvedAmount'] as String);
|
|
|
return Text(
|
|
return Text(
|
|
|
'¥${amount.toStringAsFixed(2)}',
|
|
'¥${amount.toStringAsFixed(2)}',
|
|
|
style: TextStyle(
|
|
style: TextStyle(
|
|
@@ -797,8 +797,8 @@ class _ExpenseDetailReportPageState
|
|
|
width: 70,
|
|
width: 70,
|
|
|
align: TDTableColAlign.center,
|
|
align: TDTableColAlign.center,
|
|
|
cellBuilder: (context, rowIndex) {
|
|
cellBuilder: (context, rowIndex) {
|
|
|
- final transferred = tableData[rowIndex]['isTransferred'] as bool;
|
|
|
|
|
- return transferred
|
|
|
|
|
|
|
+ final transferred = tableData[rowIndex]['isTransferred'] as String;
|
|
|
|
|
+ return transferred == '1'
|
|
|
? Container(
|
|
? Container(
|
|
|
padding: const EdgeInsets.symmetric(
|
|
padding: const EdgeInsets.symmetric(
|
|
|
horizontal: 6,
|
|
horizontal: 6,
|