|
|
@@ -5,7 +5,14 @@
|
|
|
@search-change="searchChange" @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 337)"
|
|
|
@saveColumn="saveColumnTwo('crud', 'option', 'optionList', 337)">
|
|
|
<template slot="menuLeft">
|
|
|
- <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
|
|
|
+ <div style="display: flex;align-items: center;">
|
|
|
+ <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
|
|
|
+ <div style="display: flex;align-items: center;">
|
|
|
+ <div class="buttonBox">
|
|
|
+ <span>经营利润 = 销售毛利 - 已退货毛利</span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</template>
|
|
|
<template slot="header">
|
|
|
<el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%"
|
|
|
@@ -392,7 +399,11 @@ export default {
|
|
|
id: 10,
|
|
|
label: '已退货运费',
|
|
|
prop: 'freightCancellation'
|
|
|
- }],
|
|
|
+ }, {
|
|
|
+ id: 10,
|
|
|
+ label: '经营利润',
|
|
|
+ prop: 'earnedProfit'
|
|
|
+ }],
|
|
|
}
|
|
|
},
|
|
|
async created() {
|
|
|
@@ -571,4 +582,14 @@ export default {
|
|
|
}
|
|
|
</script>
|
|
|
|
|
|
-<style scoped></style>
|
|
|
+<style scoped>
|
|
|
+.buttonBox {
|
|
|
+ font-size: 12px;
|
|
|
+ color: #909399;
|
|
|
+ margin-left: 10px;
|
|
|
+ border: 1px solid #d3d4d6;
|
|
|
+ border-radius: 3px;
|
|
|
+ padding: 6px 10px;
|
|
|
+ background: #f4f4f5;
|
|
|
+}
|
|
|
+</style>
|