Compare commits
3 Commits
fba8b786c0
...
220b01127b
| Author | SHA1 | Date | |
|---|---|---|---|
| 220b01127b | |||
| aa61dc2d1c | |||
| 86ed86fc68 |
+2
-2
@@ -37,10 +37,10 @@ public class ArBillGeneratePreviewExportRow implements Serializable {
|
|||||||
@Excel(name = "国家/地区", sort = 6, width = 18)
|
@Excel(name = "国家/地区", sort = 6, width = 18)
|
||||||
private String countryName;
|
private String countryName;
|
||||||
|
|
||||||
@Excel(name = "实际重(kg)", sort = 7, scale = 2, width = 16)
|
@Excel(name = "实际重(kg)", sort = 7, width = 16)
|
||||||
private BigDecimal actualWeight;
|
private BigDecimal actualWeight;
|
||||||
|
|
||||||
@Excel(name = "计费重(kg)", sort = 8, scale = 2, width = 16)
|
@Excel(name = "计费重(kg)", sort = 8, width = 16)
|
||||||
private BigDecimal chargeWeight;
|
private BigDecimal chargeWeight;
|
||||||
|
|
||||||
@Excel(name = "应收金额", sort = 9, scale = 2, width = 16)
|
@Excel(name = "应收金额", sort = 9, scale = 2, width = 16)
|
||||||
|
|||||||
Binary file not shown.
@@ -73,8 +73,8 @@
|
|||||||
<el-table-column :prop="dateColumnProp" :label="dateColumnLabel" width="170" :formatter="formatDateColumn" />
|
<el-table-column :prop="dateColumnProp" :label="dateColumnLabel" width="170" :formatter="formatDateColumn" />
|
||||||
<el-table-column prop="productName" label="产品" min-width="140" show-overflow-tooltip />
|
<el-table-column prop="productName" label="产品" min-width="140" show-overflow-tooltip />
|
||||||
<el-table-column prop="countryName" label="国家/地区" min-width="110" show-overflow-tooltip />
|
<el-table-column prop="countryName" label="国家/地区" min-width="110" show-overflow-tooltip />
|
||||||
<el-table-column prop="actualWeight" label="实际重(kg)" width="105" align="right" :formatter="formatNumberColumn" />
|
<el-table-column prop="actualWeight" label="实际重(kg)" width="105" align="right" :formatter="formatWeightColumn" />
|
||||||
<el-table-column prop="chargeWeight" label="计费重(kg)" width="105" align="right" :formatter="formatNumberColumn" />
|
<el-table-column prop="chargeWeight" label="计费重(kg)" width="105" align="right" :formatter="formatWeightColumn" />
|
||||||
<el-table-column prop="incomeTotal" label="应收金额" width="110" align="right" :formatter="formatNumberColumn" />
|
<el-table-column prop="incomeTotal" label="应收金额" width="110" align="right" :formatter="formatNumberColumn" />
|
||||||
<el-table-column prop="currency" label="币种" width="75" />
|
<el-table-column prop="currency" label="币种" width="75" />
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -541,6 +541,7 @@ function date(value) {
|
|||||||
}
|
}
|
||||||
function money(value) { const num = Number(value); return Number.isNaN(num) ? '-' : num.toFixed(2) }
|
function money(value) { const num = Number(value); return Number.isNaN(num) ? '-' : num.toFixed(2) }
|
||||||
function formatDateColumn(_, __, value) { return date(value) }
|
function formatDateColumn(_, __, value) { return date(value) }
|
||||||
|
function formatWeightColumn(_, __, value) { return value == null || value === '' ? '-' : value }
|
||||||
function formatNumberColumn(_, __, value) { return Number(value || 0).toFixed(2) }
|
function formatNumberColumn(_, __, value) { return Number(value || 0).toFixed(2) }
|
||||||
function createRequestId() { return globalThis.crypto?.randomUUID?.() || `ar-${Date.now()}-${Math.random().toString(16).slice(2)}` }
|
function createRequestId() { return globalThis.crypto?.randomUUID?.() || `ar-${Date.now()}-${Math.random().toString(16).slice(2)}` }
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user