|
@@ -1,152 +1,156 @@
|
|
<template>
|
|
<template>
|
|
- <a-card size="small" :bordered="false" class="promotionSalesRealTimeReport-wrap">
|
|
|
|
|
|
+ <div>
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
- <a-tabs default-active-key="1" @change="handleChange">
|
|
|
|
|
|
+ <a-tabs default-active-key="1" @change="handleChange" :tabBarStyle="{'background':'#fff'}">
|
|
<a-tab-pane key="1" tab="促销销售单报表">
|
|
<a-tab-pane key="1" tab="促销销售单报表">
|
|
- <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
|
|
|
|
- <a-form-model
|
|
|
|
- layout="inline"
|
|
|
|
- ref="ruleForm"
|
|
|
|
- :rules="rules"
|
|
|
|
- :model="queryParam">
|
|
|
|
- <a-row :gutter="15">
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-model-item label="销售审核日期" prop="salesDate">
|
|
|
|
- <rangeDate ref="rangeDate" :value="queryParam.salesDate" @change="salesDateChange" />
|
|
|
|
- </a-form-model-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <!-- :disabledDate="disabledDate" -->
|
|
|
|
- <a-form-model-item label="促销开始时间">
|
|
|
|
- <a-range-picker
|
|
|
|
- style="width:100%"
|
|
|
|
- v-model="time"
|
|
|
|
- :format="dateFormat"
|
|
|
|
- :placeholder="['开始时间', '结束时间']"
|
|
|
|
- @change="dateChange"></a-range-picker>
|
|
|
|
- </a-form-model-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-model-item label="促销名称">
|
|
|
|
- <a-input id="promotionSalesRealTimeReport-title" v-model.trim="queryParam.promoRuleReport.title" allowClear placeholder="请输入促销名称"/>
|
|
|
|
- </a-form-model-item>
|
|
|
|
- </a-col>
|
|
|
|
- <template v-if="advanced">
|
|
|
|
|
|
+ <a-card size="small" :bordered="false" class="promotionSalesRealTimeReport-wrap searchBottomSpace">
|
|
|
|
+ <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
|
|
|
|
+ <a-form-model
|
|
|
|
+ layout="inline"
|
|
|
|
+ ref="ruleForm"
|
|
|
|
+ :rules="rules"
|
|
|
|
+ :model="queryParam">
|
|
|
|
+ <a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-model-item label="促销类型">
|
|
|
|
- <v-select
|
|
|
|
- v-model="queryParam.promoRuleReport.promotionRuleType"
|
|
|
|
- ref="ruleType"
|
|
|
|
- id="promotionSalesRealTimeReport-ruleType"
|
|
|
|
- code="PROMOTION_RULE_TYPE"
|
|
|
|
- placeholder="请选择促销类型"
|
|
|
|
- allowClear></v-select>
|
|
|
|
|
|
+ <a-form-model-item label="销售审核日期" prop="salesDate">
|
|
|
|
+ <rangeDate ref="rangeDate" :value="queryParam.salesDate" @change="salesDateChange" />
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-model-item label="规则">
|
|
|
|
- <a-input id="promotionSalesRealTimeReport-ruleInfo" v-model.trim="queryParam.promoRuleReport.ruleInfo" allowClear placeholder="请输入规则关键字"/>
|
|
|
|
|
|
+ <!-- :disabledDate="disabledDate" -->
|
|
|
|
+ <a-form-model-item label="促销开始时间">
|
|
|
|
+ <a-range-picker
|
|
|
|
+ style="width:100%"
|
|
|
|
+ v-model="time"
|
|
|
|
+ :format="dateFormat"
|
|
|
|
+ :placeholder="['开始时间', '结束时间']"
|
|
|
|
+ @change="dateChange"></a-range-picker>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-model-item label="销售单号">
|
|
|
|
- <a-input id="promotionSalesRealTimeReport-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
|
|
|
|
|
|
+ <a-form-model-item label="促销名称">
|
|
|
|
+ <a-input id="promotionSalesRealTimeReport-title" v-model.trim="queryParam.promoRuleReport.title" allowClear placeholder="请输入促销名称"/>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <template v-if="advanced">
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="促销类型">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.promoRuleReport.promotionRuleType"
|
|
|
|
+ ref="ruleType"
|
|
|
|
+ id="promotionSalesRealTimeReport-ruleType"
|
|
|
|
+ code="PROMOTION_RULE_TYPE"
|
|
|
|
+ placeholder="请选择促销类型"
|
|
|
|
+ allowClear></v-select>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="规则">
|
|
|
|
+ <a-input id="promotionSalesRealTimeReport-ruleInfo" v-model.trim="queryParam.promoRuleReport.ruleInfo" allowClear placeholder="请输入规则关键字"/>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="销售单号">
|
|
|
|
+ <a-input id="promotionSalesRealTimeReport-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="客户级别">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.buyerLevel"
|
|
|
|
+ ref="buyerLevel"
|
|
|
|
+ id="promotionSalesRealTimeReport-buyerLevel"
|
|
|
|
+ code="DEALER_LEVEL"
|
|
|
|
+ placeholder="请选择客户级别"
|
|
|
|
+ allowClear></v-select>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="客户名称">
|
|
|
|
+ <a-input id="promotionSalesRealTimeReport-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入客户名称"/>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="所在区域">
|
|
|
|
+ <subarea ref="subarea" id="promotionSalesRealTimeReport-subarea" @change="subareaChange"></subarea>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="地区">
|
|
|
|
+ <AreaList id="promotionSalesRealTimeReport-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ </template>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-model-item label="客户级别">
|
|
|
|
- <v-select
|
|
|
|
- v-model="queryParam.buyerLevel"
|
|
|
|
- ref="buyerLevel"
|
|
|
|
- id="promotionSalesRealTimeReport-buyerLevel"
|
|
|
|
- code="DEALER_LEVEL"
|
|
|
|
- placeholder="请选择客户级别"
|
|
|
|
- allowClear></v-select>
|
|
|
|
- </a-form-model-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-model-item label="客户名称">
|
|
|
|
- <a-input id="promotionSalesRealTimeReport-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入客户名称"/>
|
|
|
|
- </a-form-model-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-model-item label="所在区域">
|
|
|
|
- <subarea ref="subarea" id="promotionSalesRealTimeReport-subarea" @change="subareaChange"></subarea>
|
|
|
|
- </a-form-model-item>
|
|
|
|
- </a-col>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-model-item label="地区">
|
|
|
|
- <AreaList id="promotionSalesRealTimeReport-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
|
|
|
|
- </a-form-model-item>
|
|
|
|
|
|
+ <span class="table-page-search-submitButtons">
|
|
|
|
+ <a-button type="primary" :disabled="disabled" @click="testForm('search')" >查询</a-button>
|
|
|
|
+ <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm">重置</a-button>
|
|
|
|
+ <a-button
|
|
|
|
+ style="margin-left: 10px"
|
|
|
|
+ type="primary"
|
|
|
|
+ class="button-warning"
|
|
|
|
+ @click="testForm('export')"
|
|
|
|
+ :disabled="disabled"
|
|
|
|
+ :loading="exportLoading"
|
|
|
|
+ v-if="$hasPermissions('B_promotionSalesExport')"
|
|
|
|
+ >导出</a-button>
|
|
|
|
+ <a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
|
+ {{ advanced ? '收起' : '展开' }}
|
|
|
|
+ <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
|
+ </a>
|
|
|
|
+ </span>
|
|
</a-col>
|
|
</a-col>
|
|
- </template>
|
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <span class="table-page-search-submitButtons">
|
|
|
|
- <a-button type="primary" :disabled="disabled" @click="testForm('search')" >查询</a-button>
|
|
|
|
- <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm">重置</a-button>
|
|
|
|
- <a-button
|
|
|
|
- style="margin-left: 10px"
|
|
|
|
- type="primary"
|
|
|
|
- class="button-warning"
|
|
|
|
- @click="testForm('export')"
|
|
|
|
- :disabled="disabled"
|
|
|
|
- :loading="exportLoading"
|
|
|
|
- v-if="$hasPermissions('B_promotionSalesExport')"
|
|
|
|
- >导出</a-button>
|
|
|
|
- <a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
|
- {{ advanced ? '收起' : '展开' }}
|
|
|
|
- <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
|
- </a>
|
|
|
|
- </span>
|
|
|
|
- </a-col>
|
|
|
|
- </a-row>
|
|
|
|
- </a-form-model>
|
|
|
|
- </div>
|
|
|
|
|
|
+ </a-row>
|
|
|
|
+ </a-form-model>
|
|
|
|
+ </div>
|
|
|
|
+ </a-card>
|
|
<!-- 列表 -->
|
|
<!-- 列表 -->
|
|
- <s-table
|
|
|
|
- class="sTable"
|
|
|
|
- ref="table"
|
|
|
|
- size="small"
|
|
|
|
- :rowKey="(record) => record.no"
|
|
|
|
- rowKeyName="no"
|
|
|
|
- :columns="columns"
|
|
|
|
- :data="loadData"
|
|
|
|
- :style="{ height: tableHeight+84.5+'px' }"
|
|
|
|
- :scroll="{ y: tableHeight-40,x:1890}"
|
|
|
|
- :defaultLoadData="false"
|
|
|
|
- bordered>
|
|
|
|
- <!-- 促销时间 -->
|
|
|
|
- <template slot="promotionTime" slot-scope="text, record">
|
|
|
|
- <span>{{ record.promotion.promotionDateStart }}-{{ record.promotion.promotionDateEnd }}</span>
|
|
|
|
- </template>
|
|
|
|
- <!-- 规则 -->
|
|
|
|
- <!-- <template slot="promotionDesc" slot-scope="text, record">
|
|
|
|
|
|
+ <a-card size="small" :bordered="false">
|
|
|
|
+ <s-table
|
|
|
|
+ class="sTable"
|
|
|
|
+ ref="table"
|
|
|
|
+ size="small"
|
|
|
|
+ :rowKey="(record) => record.no"
|
|
|
|
+ rowKeyName="no"
|
|
|
|
+ :columns="columns"
|
|
|
|
+ :data="loadData"
|
|
|
|
+ :style="{ height: tableHeight+84.5+'px' }"
|
|
|
|
+ :scroll="{ x:1890,y: tableHeight-34}"
|
|
|
|
+ :defaultLoadData="false"
|
|
|
|
+ bordered>
|
|
|
|
+ <!-- 促销时间 -->
|
|
|
|
+ <template slot="promotionTime" slot-scope="text, record">
|
|
|
|
+ <span>{{ record.promotion.promotionDateStart }}-{{ record.promotion.promotionDateEnd }}</span>
|
|
|
|
+ </template>
|
|
|
|
+ <!-- 规则 -->
|
|
|
|
+ <!-- <template slot="promotionDesc" slot-scope="text, record">
|
|
<span v-if="record.promotionRule.promotionRuleType=='PROMO_PROD'">{{ record.promotionRule.promotionRuleTypeDictValue }}</span>
|
|
<span v-if="record.promotionRule.promotionRuleType=='PROMO_PROD'">{{ record.promotionRule.promotionRuleTypeDictValue }}</span>
|
|
<span v-else-if="record.promotionRule.promotionRuleType=='RATIO_AMOUNT'">{{ record.promotionRule.regularSameFlag==1?'同款':'不同款' }}产品购买满{{ record.promotionRule.regularQty }}个正价产品,送{{ record.promotionQty }}个促销产品</span>
|
|
<span v-else-if="record.promotionRule.promotionRuleType=='RATIO_AMOUNT'">{{ record.promotionRule.regularSameFlag==1?'同款':'不同款' }}产品购买满{{ record.promotionRule.regularQty }}个正价产品,送{{ record.promotionQty }}个促销产品</span>
|
|
<span v-else>购买满{{ record.promotionRule.regularAmount }}元正价产品,送{{ record.promotionRule.giveAmount }}元促销品采购额{{ record.promotionRule.accrualFlag&&record.promotionRule.accrualFlag==1?'(金额叠加)':'(金额不叠加)' }}</span>
|
|
<span v-else>购买满{{ record.promotionRule.regularAmount }}元正价产品,送{{ record.promotionRule.giveAmount }}元促销品采购额{{ record.promotionRule.accrualFlag&&record.promotionRule.accrualFlag==1?'(金额叠加)':'(金额不叠加)' }}</span>
|
|
</template> -->
|
|
</template> -->
|
|
- <!-- 地区 -->
|
|
|
|
- <template slot="addressInfo" slot-scope="text, record">
|
|
|
|
- <span>{{ record.provinceName }}{{ record.cityName?'/'+record.cityName:'' }}{{ record.districtName?'/'+record.districtName :'' }}</span>
|
|
|
|
- </template>
|
|
|
|
- <template slot="footer">
|
|
|
|
- <a-row>
|
|
|
|
- <a-col span="24">
|
|
|
|
- <a-row>
|
|
|
|
- <a-col span="4">数量(非促):{{ (totalData && (totalData.notGiftQty || totalData.notGiftQty==0)) ? totalData.notGiftQty : '--' }}</a-col>
|
|
|
|
- <a-col span="4">数量(促):{{ (totalData && (totalData.giftQty || totalData.giftQty==0)) ? totalData.giftQty: '--' }}</a-col>
|
|
|
|
- <a-col span="4">实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
|
|
|
|
- <a-col span="4">开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
|
|
|
|
- <a-col span="4">成本金额:{{ (totalData && (totalData.totalRealCost || totalData.totalRealCost==0)) ? totalData.totalRealCost : '--' }}</a-col>
|
|
|
|
- <a-col span="4">损失成本:{{ (totalData && (totalData.lossCost || totalData.lossCost==0)) ? toThousands(totalData.lossCost) : '--' }}</a-col>
|
|
|
|
- <a-col span="4">损失费用:{{ (totalData && (totalData.lossAmount || totalData.lossAmount==0)) ? toThousands(totalData.lossAmount) : '--' }}</a-col>
|
|
|
|
- <a-col span="4">采购额结余:{{ (totalData && (totalData.surplusPromoGiftsAmount || totalData.surplusPromoGiftsAmount==0)) ? toThousands(totalData.surplusPromoGiftsAmount) : '--' }}</a-col>
|
|
|
|
- <a-col span="4">采购额超出:{{ (totalData && (totalData.outPromoGiftsAmount || totalData.outPromoGiftsAmount==0)) ? toThousands(totalData.outPromoGiftsAmount) : '--' }}</a-col>
|
|
|
|
- </a-row>
|
|
|
|
- </a-col>
|
|
|
|
- </a-row>
|
|
|
|
- </template>
|
|
|
|
- </s-table>
|
|
|
|
|
|
+ <!-- 地区 -->
|
|
|
|
+ <template slot="addressInfo" slot-scope="text, record">
|
|
|
|
+ <span>{{ record.provinceName }}{{ record.cityName?'/'+record.cityName:'' }}{{ record.districtName?'/'+record.districtName :'' }}</span>
|
|
|
|
+ </template>
|
|
|
|
+ <template slot="footer">
|
|
|
|
+ <a-row>
|
|
|
|
+ <a-col span="24">
|
|
|
|
+ <a-row>
|
|
|
|
+ <a-col span="4">数量(非促):{{ (totalData && (totalData.notGiftQty || totalData.notGiftQty==0)) ? totalData.notGiftQty : '--' }}</a-col>
|
|
|
|
+ <a-col span="4">数量(促):{{ (totalData && (totalData.giftQty || totalData.giftQty==0)) ? totalData.giftQty: '--' }}</a-col>
|
|
|
|
+ <a-col span="4">实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
|
|
|
|
+ <a-col span="4">开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
|
|
|
|
+ <a-col span="4">成本金额:{{ (totalData && (totalData.totalRealCost || totalData.totalRealCost==0)) ? totalData.totalRealCost : '--' }}</a-col>
|
|
|
|
+ <a-col span="4">损失成本:{{ (totalData && (totalData.lossCost || totalData.lossCost==0)) ? toThousands(totalData.lossCost) : '--' }}</a-col>
|
|
|
|
+ <a-col span="4">损失费用:{{ (totalData && (totalData.lossAmount || totalData.lossAmount==0)) ? toThousands(totalData.lossAmount) : '--' }}</a-col>
|
|
|
|
+ <a-col span="4">采购额结余:{{ (totalData && (totalData.surplusPromoGiftsAmount || totalData.surplusPromoGiftsAmount==0)) ? toThousands(totalData.surplusPromoGiftsAmount) : '--' }}</a-col>
|
|
|
|
+ <a-col span="4">采购额超出:{{ (totalData && (totalData.outPromoGiftsAmount || totalData.outPromoGiftsAmount==0)) ? toThousands(totalData.outPromoGiftsAmount) : '--' }}</a-col>
|
|
|
|
+ </a-row>
|
|
|
|
+ </a-col>
|
|
|
|
+ </a-row>
|
|
|
|
+ </template>
|
|
|
|
+ </s-table>
|
|
|
|
+ </a-card>
|
|
</a-tab-pane>
|
|
</a-tab-pane>
|
|
<a-tab-pane key="2" tab="促销销售单实时报表" force-render>
|
|
<a-tab-pane key="2" tab="促销销售单实时报表" force-render>
|
|
<gatherList></gatherList>
|
|
<gatherList></gatherList>
|
|
@@ -155,7 +159,7 @@
|
|
<!-- 导出提示框 -->
|
|
<!-- 导出提示框 -->
|
|
<reportModal :visible="showExport" @close="showExport=false"></reportModal>
|
|
<reportModal :visible="showExport" @close="showExport=false"></reportModal>
|
|
</a-spin>
|
|
</a-spin>
|
|
- </a-card>
|
|
|
|
|
|
+ </div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
@@ -169,7 +173,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
|
|
import getDate from '@/libs/getDate.js'
|
|
import getDate from '@/libs/getDate.js'
|
|
import subarea from '@/views/common/subarea.js'
|
|
import subarea from '@/views/common/subarea.js'
|
|
import AreaList from '@/views/common/areaList.js'
|
|
import AreaList from '@/views/common/areaList.js'
|
|
-import moment from 'moment'
|
|
|
|
|
|
+// import moment from 'moment'
|
|
export default {
|
|
export default {
|
|
name: 'PriceDifferenceDetailReportList',
|
|
name: 'PriceDifferenceDetailReportList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
@@ -216,11 +220,11 @@ export default {
|
|
exportLoading: false,
|
|
exportLoading: false,
|
|
showExport: false,
|
|
showExport: false,
|
|
columns: [
|
|
columns: [
|
|
- { title: '促销名称', dataIndex: 'promotion.title', width: '160px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left', ellipsis: true },
|
|
|
|
|
|
+ { title: '促销名称', dataIndex: 'promotion.title', width: '160px', align: 'left', customRender: function (text) { return text || '--' }, fixed: 'left', ellipsis: true },
|
|
{ title: '促销时间', scopedSlots: { customRender: 'promotionTime' }, width: '130px', align: 'center', fixed: 'left' },
|
|
{ title: '促销时间', scopedSlots: { customRender: 'promotionTime' }, width: '130px', align: 'center', fixed: 'left' },
|
|
{ title: '费用所属部门', dataIndex: 'departmentName', width: '160px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
|
|
{ title: '费用所属部门', dataIndex: 'departmentName', width: '160px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
|
|
{ title: '促销类型', dataIndex: 'promotionRule.promotionRuleTypeDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
{ title: '促销类型', dataIndex: 'promotionRule.promotionRuleTypeDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
- { title: '规则', dataIndex: 'promotionRule.ruleInfo', width: '180px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
|
|
|
|
+ { title: '规则', dataIndex: 'promotionRule.ruleInfo', width: '180px', align: 'left', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
{ title: '销售单号', dataIndex: 'salesBillNo', width: '120px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
{ title: '销售单号', dataIndex: 'salesBillNo', width: '120px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
{ title: '区域', dataIndex: 'subareaArea.subareaName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '区域', dataIndex: 'subareaArea.subareaName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -396,7 +400,7 @@ export default {
|
|
},
|
|
},
|
|
setTableH () {
|
|
setTableH () {
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 260
|
|
|
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 280
|
|
}
|
|
}
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|
|
@@ -434,4 +438,7 @@ export default {
|
|
text-align:center;
|
|
text-align:center;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ .ant-tabs-tabpane.ant-tabs-tabpane-active{
|
|
|
|
+ margin-top:-11px !important;
|
|
|
|
+ }
|
|
</style>
|
|
</style>
|