|
@@ -13,7 +13,7 @@
|
|
|
@keyup.enter.native="handleSearch">
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="销售日期" prop="time">
|
|
|
+ <a-form-model-item label="下推时间" prop="time">
|
|
|
<rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
@@ -133,34 +133,14 @@
|
|
|
bordered>
|
|
|
<template slot="footer">
|
|
|
<a-row :gutter="15">
|
|
|
- <a-col
|
|
|
- :md="4"
|
|
|
- :sm="24">数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
|
|
|
- <a-col
|
|
|
- :md="4"
|
|
|
- :sm="24"
|
|
|
- v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">实售价:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
|
|
|
- <a-col
|
|
|
- :md="4"
|
|
|
- :sm="24"
|
|
|
- v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">开单价:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
|
|
|
- <a-col
|
|
|
- :md="4"
|
|
|
- :sm="24"
|
|
|
- v-if="$hasPermissions('M_salesOrderTotalList_costPrice')">成本:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
|
|
|
- <a-col
|
|
|
- :md="4"
|
|
|
- :sm="24"
|
|
|
- v-if="$hasPermissions('M_salesOrderTotalList_costPrice')&&$hasPermissions('M_salesOrderTotalList_salesPrice')">毛利:{{ (totalData && (totalData.grossProfit || totalData.grossProfit==0)) ? toThousands(totalData.grossProfit) : '--' }}</a-col>
|
|
|
- <a-col
|
|
|
- :md="4"
|
|
|
- :sm="24"
|
|
|
- v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">返利:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</a-col>
|
|
|
- <a-col
|
|
|
- :md="4"
|
|
|
- :sm="24"
|
|
|
- v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">优惠金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col>
|
|
|
- <!-- <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">折扣金额:{{ (totalData && (totalData.totalDiscountAmount || totalData.totalDiscountAmount==0)) ? toThousands(totalData.totalDiscountAmount) : '--' }}</a-col>
|
|
|
+ <a-col :md="4" :sm="24">下推数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
|
|
|
+ <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">实售金额:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
|
|
|
+ <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
|
|
|
+ <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_costPrice')">成本金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
|
|
|
+ <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_costPrice')&&$hasPermissions('M_salesOrderTotalList_salesPrice')">毛利:{{ (totalData && (totalData.grossProfit || totalData.grossProfit==0)) ? toThousands(totalData.grossProfit) : '--' }}</a-col>
|
|
|
+ <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">返利:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</a-col>
|
|
|
+ <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">优惠金额:{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? toThousands(totalData.discountAmount) : '--' }}</a-col>
|
|
|
+ <!-- <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">折扣金额:{{ (totalData && (totalData.totalDiscountAmount || totalData.totalDiscountAmount==0)) ? toThousands(totalData.totalDiscountAmount) : '--' }}</a-col>
|
|
|
<a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesOrderTotalList_salesPrice')">折后金额:{{ (totalData && (totalData.totalDiscountedAmount || totalData.totalDiscountedAmount==0)) ? toThousands(totalData.totalDiscountedAmount) : '--' }}</a-col> -->
|
|
|
</a-row>
|
|
|
</template>
|
|
@@ -269,91 +249,16 @@ export default {
|
|
|
computed: {
|
|
|
columns () {
|
|
|
const _this = this
|
|
|
- const arr = [{
|
|
|
- title: '销售单号',
|
|
|
- dataIndex: 'salesBillNo',
|
|
|
- width: 160,
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return text || '--'
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '开单日期',
|
|
|
- dataIndex: 'createDate',
|
|
|
- width: 130,
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return text || '--'
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '销售日期',
|
|
|
- dataIndex: 'auditDate',
|
|
|
- width: 130,
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return text || '--'
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '客户名称',
|
|
|
- dataIndex: 'dealerName',
|
|
|
- width: 120,
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return text || '--'
|
|
|
- },
|
|
|
- ellipsis: true
|
|
|
- },
|
|
|
- {
|
|
|
- title: '客户级别',
|
|
|
- dataIndex: 'dealerLevelDictValue',
|
|
|
- width: 120,
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return text || '--'
|
|
|
- },
|
|
|
- ellipsis: true
|
|
|
- },
|
|
|
- {
|
|
|
- title: '直接绑定客户名称',
|
|
|
- dataIndex: 'directDealerName',
|
|
|
- width: 120,
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return text || '--'
|
|
|
- },
|
|
|
- ellipsis: true
|
|
|
- },
|
|
|
- {
|
|
|
- title: '间接绑定客户名称',
|
|
|
- dataIndex: 'indirectDealerName',
|
|
|
- width: 120,
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return text || '--'
|
|
|
- },
|
|
|
- ellipsis: true
|
|
|
- },
|
|
|
- {
|
|
|
- title: '总数量',
|
|
|
- dataIndex: 'totalQty',
|
|
|
- width: 70,
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? text : '--')
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '数量(促)',
|
|
|
- dataIndex: 'giftQty',
|
|
|
- width: 70,
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? text : '--')
|
|
|
- }
|
|
|
- }
|
|
|
+ const arr = [
|
|
|
+ { title: '销售单号', dataIndex: 'salesBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '创建时间', dataIndex: 'createDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '销售审核时间', dataIndex: 'auditDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '客户名称', dataIndex: 'dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '直接绑定客户名称', dataIndex: 'directDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '间接绑定客户名称', dataIndex: 'indirectDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '总下推数量', dataIndex: 'totalQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '下推数量(促)', dataIndex: 'giftQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
|
|
|
// { title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
// { title: '开单价', dataIndex: 'totalAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
// { title: '成本价', dataIndex: 'totalCost', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -369,44 +274,12 @@ export default {
|
|
|
|
|
|
]
|
|
|
if (this.$hasPermissions('M_salesOrderTotalList_salesPrice')) {
|
|
|
- arr.push({
|
|
|
- title: '实售价',
|
|
|
- dataIndex: 'totalRealSaleAmount',
|
|
|
- width: 70,
|
|
|
- align: 'right',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? _this.toThousands(text) : '--')
|
|
|
- }
|
|
|
- })
|
|
|
- arr.push({
|
|
|
- title: '开单价',
|
|
|
- dataIndex: 'totalAmount',
|
|
|
- width: 70,
|
|
|
- align: 'right',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? _this.toThousands(text) : '--')
|
|
|
- }
|
|
|
- })
|
|
|
+ arr.push({ title: '实售金额', dataIndex: 'totalRealSaleAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
+ arr.push({ title: '开单金额', dataIndex: 'totalAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
}
|
|
|
if (this.$hasPermissions('M_salesOrderTotalList_costPrice')) { // 成本价权限
|
|
|
- arr.push({
|
|
|
- title: '成本价',
|
|
|
- dataIndex: 'totalCost',
|
|
|
- width: 70,
|
|
|
- align: 'right',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? _this.toThousands(text) : '--')
|
|
|
- }
|
|
|
- })
|
|
|
- arr.push({
|
|
|
- title: '成本价(促)',
|
|
|
- dataIndex: 'totalGiftCost',
|
|
|
- width: 90,
|
|
|
- align: 'right',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? _this.toThousands(text) : '--')
|
|
|
- }
|
|
|
- })
|
|
|
+ arr.push({ title: '成本金额', dataIndex: 'totalCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
+ arr.push({ title: '成本金额(促)', dataIndex: 'totalGiftCost', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
if (this.$hasPermissions('M_salesOrderTotalList_salesPrice')) {
|
|
|
arr.push({
|
|
|
title: '毛利',
|
|
@@ -420,75 +293,19 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (this.$hasPermissions('M_salesOrderTotalList_provincePrice')) {
|
|
|
- arr.push({
|
|
|
- title: '省级价',
|
|
|
- dataIndex: 'totalProvinceAmount',
|
|
|
- width: 70,
|
|
|
- align: 'right',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? _this.toThousands(text) : '--')
|
|
|
- }
|
|
|
- })
|
|
|
+ arr.push({ title: '省级金额', dataIndex: 'totalProvinceAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
}
|
|
|
if (this.$hasPermissions('M_salesOrderTotalList_cityPrice')) {
|
|
|
- arr.push({
|
|
|
- title: '市级价',
|
|
|
- dataIndex: 'totalCityAmount',
|
|
|
- width: 70,
|
|
|
- align: 'right',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? _this.toThousands(text) : '--')
|
|
|
- }
|
|
|
- })
|
|
|
+ arr.push({ title: '市级金额', dataIndex: 'totalCityAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
}
|
|
|
if (this.$hasPermissions('M_salesOrderTotalList_specialPrice')) {
|
|
|
- arr.push({
|
|
|
- title: '特约加盟店价',
|
|
|
- dataIndex: 'totalSpecialAmount',
|
|
|
- width: 90,
|
|
|
- align: 'right',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? _this.toThousands(text) : '--')
|
|
|
- }
|
|
|
- })
|
|
|
+ arr.push({ title: '特约金额', dataIndex: 'totalSpecialAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
}
|
|
|
if (this.$hasPermissions('M_salesOrderTotalList_salesPrice')) {
|
|
|
- arr.push({
|
|
|
- title: '直接差价',
|
|
|
- dataIndex: 'directRebateAmount',
|
|
|
- width: 70,
|
|
|
- align: 'right',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? _this.toThousands(text) : '--')
|
|
|
- }
|
|
|
- })
|
|
|
- arr.push({
|
|
|
- title: '间接差价',
|
|
|
- dataIndex: 'indirectRebateAmount',
|
|
|
- width: 70,
|
|
|
- align: 'right',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? _this.toThousands(text) : '--')
|
|
|
- }
|
|
|
- })
|
|
|
- arr.push({
|
|
|
- title: '返利',
|
|
|
- dataIndex: 'rebateAmount',
|
|
|
- width: 70,
|
|
|
- align: 'right',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? _this.toThousands(text) : '--')
|
|
|
- }
|
|
|
- })
|
|
|
- arr.push({
|
|
|
- title: '优惠金额',
|
|
|
- dataIndex: 'discountAmount',
|
|
|
- width: 70,
|
|
|
- align: 'right',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? _this.toThousands(text) : '--')
|
|
|
- }
|
|
|
- })
|
|
|
+ arr.push({ title: '直接差价金额', dataIndex: 'directRebateAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
+ arr.push({ title: '间接差价金额', dataIndex: 'indirectRebateAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
+ arr.push({ title: '返利', dataIndex: 'rebateAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
+ arr.push({ title: '优惠金额', dataIndex: 'discountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
// arr.push({ title: '折扣金额', dataIndex: 'totalDiscountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
// arr.push({ title: '折后金额', dataIndex: 'totalDiscountedAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
}
|