Compare commits
38 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 220b01127b | |||
| aa61dc2d1c | |||
| 86ed86fc68 | |||
| fba8b786c0 | |||
| a4bda4d636 | |||
| 00e36cdf3f | |||
| 8eb5dca4f0 | |||
| b671ebefae | |||
| fb5d6d46a8 | |||
| 039c0d4858 | |||
| 43299e5329 | |||
| 3fe34c471c | |||
| 134855fc31 | |||
| 01cee41301 | |||
| 1f0d757e29 | |||
| 762cad2c0d | |||
| 7ef3f40a4f | |||
| 58e41b669d | |||
| 9a48abbacd | |||
| f95edbdf0a | |||
| b30dfdf675 | |||
| 9a393fe7dc | |||
| a2468099c2 | |||
| cbed4dc2a3 | |||
| d66b96b2ff | |||
| cdfc90556d | |||
| dfa90d6e33 | |||
| 4a34075022 | |||
| 6a03300f2f | |||
| 7496f8cbc6 | |||
| 2f2305825a | |||
| b79cd6f995 | |||
| 70a3c34c20 | |||
| 2b5633190e | |||
| 77dfb4291b | |||
| d71b7f04fe | |||
| f8ae347846 | |||
| 94991a1ed3 |
+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