|
@@ -4,7 +4,7 @@
|
|
|
<el-form label-width="100px">
|
|
<el-form label-width="100px">
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="5">
|
|
<el-col :span="5">
|
|
|
- <el-form-item label="盈/损/亏"
|
|
|
|
|
|
|
+ <el-form-item label="盈/损/亏/废"
|
|
|
><el-select
|
|
><el-select
|
|
|
filterable
|
|
filterable
|
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
@@ -64,7 +64,7 @@
|
|
|
>
|
|
>
|
|
|
<template v-slot:status="{ row }">
|
|
<template v-slot:status="{ row }">
|
|
|
<span :style="{ color: statusColor[row.status] }">{{
|
|
<span :style="{ color: statusColor[row.status] }">{{
|
|
|
- statusOpt[row.status]
|
|
|
|
|
|
|
+ statusLabel(row)
|
|
|
}}</span>
|
|
}}</span>
|
|
|
</template>
|
|
</template>
|
|
|
</ele-pro-table>
|
|
</ele-pro-table>
|
|
@@ -150,22 +150,26 @@
|
|
|
{ label: '所有', code: '' },
|
|
{ label: '所有', code: '' },
|
|
|
{ label: '盘盈', code: 2 },
|
|
{ label: '盘盈', code: 2 },
|
|
|
{ label: '盘亏', code: 3 },
|
|
{ label: '盘亏', code: 3 },
|
|
|
- { label: '盘损', code: 4 }
|
|
|
|
|
|
|
+ { label: '盘损', code: 4 },
|
|
|
|
|
+ { label: '报废', code: 5 }
|
|
|
],
|
|
],
|
|
|
statusOpt: {
|
|
statusOpt: {
|
|
|
2: '盘盈',
|
|
2: '盘盈',
|
|
|
3: '盘亏',
|
|
3: '盘亏',
|
|
|
- 4: '盘损'
|
|
|
|
|
|
|
+ 4: '盘损',
|
|
|
|
|
+ 5: '报废'
|
|
|
},
|
|
},
|
|
|
countKey: {
|
|
countKey: {
|
|
|
2: 'surplusQuantity',
|
|
2: 'surplusQuantity',
|
|
|
3: 'loseQuantity',
|
|
3: 'loseQuantity',
|
|
|
- 4: 'wornQuantity'
|
|
|
|
|
|
|
+ 4: 'wornQuantity',
|
|
|
|
|
+ 5: 'scrapQuantity'
|
|
|
},
|
|
},
|
|
|
statusColor: {
|
|
statusColor: {
|
|
|
2: 'red',
|
|
2: 'red',
|
|
|
3: '#70B603',
|
|
3: '#70B603',
|
|
|
- 4: ''
|
|
|
|
|
|
|
+ 4: '',
|
|
|
|
|
+ 5: ''
|
|
|
},
|
|
},
|
|
|
columns: [
|
|
columns: [
|
|
|
{
|
|
{
|
|
@@ -191,7 +195,7 @@
|
|
|
{
|
|
{
|
|
|
slot: 'status',
|
|
slot: 'status',
|
|
|
prop: 'status',
|
|
prop: 'status',
|
|
|
- label: '盈/损/亏',
|
|
|
|
|
|
|
+ label: '盈/损/亏/废',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
minWidth: 110
|
|
minWidth: 110
|
|
@@ -202,9 +206,7 @@
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
minWidth: 110,
|
|
minWidth: 110,
|
|
|
- formatter: (_row) => {
|
|
|
|
|
- return _row[this.countKey[_row.status]];
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ formatter: (_row) => this.statusQuantity(_row)
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
prop: 'planProfitLossCode',
|
|
prop: 'planProfitLossCode',
|
|
@@ -242,6 +244,14 @@
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
|
|
+ // 未匹配到状态时返回空串,避免新增盘点状态后这里显示空白或报错
|
|
|
|
|
+ statusLabel(row) {
|
|
|
|
|
+ return this.statusOpt[row.status] || '';
|
|
|
|
|
+ },
|
|
|
|
|
+ statusQuantity(row) {
|
|
|
|
|
+ const key = this.countKey[row.status];
|
|
|
|
|
+ return key ? row[key] : '';
|
|
|
|
|
+ },
|
|
|
async datasource({ page, limit, where, order }) {
|
|
async datasource({ page, limit, where, order }) {
|
|
|
console.log(page);
|
|
console.log(page);
|
|
|
console.log(limit);
|
|
console.log(limit);
|