|
@@ -70,7 +70,7 @@
|
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
|
<a-button type="primary" @click="handleSearch" :disabled="disabled" id="rebateDetailReport-refresh">查询</a-button>
|
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="rebateDetailReport-reset">重置</a-button>
|
|
|
- <a-button
|
|
|
+ <!-- <a-button
|
|
|
type="primary"
|
|
|
style="margin-left: 5px"
|
|
|
@click="handleExport"
|
|
@@ -78,7 +78,7 @@
|
|
|
:loading="exportLoading"
|
|
|
v-if="$hasPermissions('M_salesReturnReportExport')"
|
|
|
class="button-warning"
|
|
|
- id="rebateDetailReport-export-btn">导出</a-button>
|
|
|
+ id="rebateDetailReport-export-btn">导出</a-button> -->
|
|
|
<a @click="advanced=!advanced" style="margin-left: 5px">
|
|
|
{{ advanced ? '收起' : '展开' }}
|
|
|
<a-icon :type="advanced ? 'up' : 'down'"/>
|
|
@@ -95,7 +95,8 @@
|
|
|
class="sTable fixPagination"
|
|
|
ref="table"
|
|
|
size="small"
|
|
|
- :rowKey="(record) => record.id"
|
|
|
+ :rowKey="(record) => record.no"
|
|
|
+ rowKeyName="no"
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
:pageSize="30"
|
|
@@ -107,7 +108,7 @@
|
|
|
<a-row type="flex" justify="end" :gutter="10">
|
|
|
<a-col flex="10%" >总开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
|
|
|
<a-col flex="10%" >总实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
|
|
|
- <a-col flex="10%" >差价金额:{{ (totalData && (totalData.directRebateAmount || totalData.directRebateAmount==0)) ? toThousands(totalData.directRebateAmount) : '--' }}</a-col>
|
|
|
+ <a-col flex="10%" >差价金额:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</a-col>
|
|
|
</a-row>
|
|
|
</template>
|
|
|
</s-table>
|
|
@@ -174,6 +175,9 @@ export default {
|
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
|
data.list[i].no = no + i + 1
|
|
|
data.list[i].inStockQty = data.list[i].qty
|
|
|
+ if (data.list[i].parentDealerName) {
|
|
|
+ data.list[i].parentDealerName += '(' + data.list[i].rebateRate * 100 + '%)'
|
|
|
+ }
|
|
|
}
|
|
|
this.disabled = false
|
|
|
}
|
|
@@ -190,11 +194,11 @@ export default {
|
|
|
const arr = [
|
|
|
{ title: '序号', dataIndex: 'no', width: '60px', align: 'center' },
|
|
|
{ title: '订单号', dataIndex: 'bizNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '类型', dataIndex: 'rebateBill.bizTypeDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '客户级别', dataIndex: 'rebateBill.buyerLevelDictValue', width: '90px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '客户名称', dataIndex: 'rebateBill.buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '差价归属方', dataIndex: 'rebateBill.directDealerName', width: '130px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '差价归属类型', dataIndex: 'rebateBill.indirectDealerName', width: '120px', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '类型', dataIndex: 'bizTypeDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '客户级别', dataIndex: 'buyerLevelDictValue', width: '90px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '差价归属方', dataIndex: 'parentDealerName', width: '130px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '差价归属类型', dataIndex: 'rebateParentTypeDictValue', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '品牌', dataIndex: 'productEntity.productBrandName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品分类', width: '160px', align: 'center', customRender: function (text, record) { return record.productEntity.productTypeName1 + (record.productEntity.productTypeName2 ? '>' : '') + (record.productEntity.productTypeName2 || '') } },
|
|
|
{ title: '产品编码', dataIndex: 'productEntity.code', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -205,8 +209,8 @@ export default {
|
|
|
{ title: '特约价', dataIndex: 'specialPrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '总开单金额', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '总实售金额', dataIndex: 'totalRealAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
- { title: '差价', dataIndex: 'directRebatePrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
- { title: '差价金额', dataIndex: 'directRebateAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
|
|
|
+ { title: '差价', dataIndex: 'rebatePrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
+ { title: '差价金额', dataIndex: 'rebateAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
|
|
|
]
|
|
|
return arr
|
|
|
}
|