|
@@ -82,7 +82,7 @@
|
|
|
:data="loadData"
|
|
|
:scroll="{ x: 2370 }"
|
|
|
bordered>
|
|
|
- <template slot="footer" v-if="countLabel.length>0">
|
|
|
+ <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
|
|
|
<a-row>
|
|
|
<a-col span="2">合计:</a-col>
|
|
|
<a-col span="22">
|
|
@@ -91,6 +91,14 @@
|
|
|
{{ item.title }}:{{ totalData?(totalData[item.dataIndex]||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
+ <a-row>
|
|
|
+ <a-col span="24" style="padding:8px;"></a-col>
|
|
|
+ </a-row>
|
|
|
+ <a-row>
|
|
|
+ <a-col span="4" v-for="item in countBrandLabel" :key="item.key">
|
|
|
+ {{ item.title }}:{{ totalData?(totalData[item.dataIndex] ||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
|
|
|
+ </a-col>
|
|
|
+ </a-row>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
</template>
|
|
@@ -139,6 +147,7 @@ export default {
|
|
|
},
|
|
|
columns: [],
|
|
|
countLabel: [],
|
|
|
+ countBrandLabel:[],
|
|
|
rules: {
|
|
|
'time': [{ required: true, message: '请选择备货销售日期', trigger: 'change' }]
|
|
|
},
|
|
@@ -264,7 +273,8 @@ export default {
|
|
|
const _this = this
|
|
|
const tableTitle = await salesXsjdReportTitle().then(res => res.data)
|
|
|
this.columns = tableTitle.list
|
|
|
- this.countLabel = tableTitle.count
|
|
|
+ this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
|
|
|
+ this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
|
|
|
this.columns.map(item => {
|
|
|
let mw = 40
|
|
|
if (item.customRender == 'amount') {
|