|
@@ -12,31 +12,36 @@
|
|
|
:rules="rules"
|
|
|
@keyup.enter.native="handleSearch">
|
|
|
<a-row :gutter="15">
|
|
|
+ <a-col :md="4" :sm="24">
|
|
|
+ <a-form-model-item label="所在区域">
|
|
|
+ <subarea v-model="queryParam.subareaSn"></subarea>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-model-item label="日期" prop="month">
|
|
|
- <a-month-picker v-model="queryParam.month" :allowClear="false" @change="onChange" :defaultValue="moment()" style="width: 100%;" />
|
|
|
+ <a-form-model-item label="日期" prop="time">
|
|
|
+ <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
+ <a-col :md="3" :sm="24">
|
|
|
<a-form-model-item label="省份" prop="provinceSn">
|
|
|
<a-select v-model="queryParam.provinceSn" allowClear placeholder="请选择省">
|
|
|
<a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col :md="5" :sm="24">
|
|
|
<a-form-model-item label="记账门店">
|
|
|
<custList id="priceDifferenceDetailList-rebateDealer" ref="rebateDealerList" @change="rebateDealerChange"></custList>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col :md="5" :sm="24">
|
|
|
<a-form-model-item label="客户名称">
|
|
|
<custList id="priceDifferenceDetailList-custList" ref="custList" :itemSn="queryParam.dealerSn" @change="custChange"></custList>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
</template>
|
|
|
- <a-col :md="7" :sm="24" style="margin-bottom: 10px;">
|
|
|
+ <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
|
<a-button type="primary" @click="handleSearch" :disabled="disabled" id="priceDifferenceDetailList-refresh">查询</a-button>
|
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="priceDifferenceDetailList-reset">重置</a-button>
|
|
|
<a-button
|
|
@@ -79,29 +84,36 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import moment from 'moment'
|
|
|
+import getDate from '@/libs/getDate.js'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import custList from '@/views/common/custList.vue'
|
|
|
import { getArea } from '@/api/data'
|
|
|
+import subarea from '@/views/common/subarea.js'
|
|
|
+import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import { hdExportExcel } from '@/libs/exportExcel'
|
|
|
import { reportRebateReportList, reportRebateCount, reportRebateExport } from '@/api/reportData'
|
|
|
export default {
|
|
|
- components: { STable, VSelect, custList },
|
|
|
+ components: { STable, VSelect, custList, subarea, rangeDate },
|
|
|
data () {
|
|
|
return {
|
|
|
- moment,
|
|
|
spinning: false,
|
|
|
advanced: false, // 高级搜索 展开/关闭
|
|
|
exportLoading: false,
|
|
|
queryParam: { // 查询条件
|
|
|
- month: moment().format('YYYY-MM'),
|
|
|
+ time: [
|
|
|
+ getDate.getCurrMonthDays().starttime,
|
|
|
+ getDate.getCurrMonthDays().endtime
|
|
|
+ ],
|
|
|
+ beginDate: getDate.getCurrMonthDays().starttime,
|
|
|
+ endDate: getDate.getCurrMonthDays().endtime,
|
|
|
provinceSn: undefined,
|
|
|
rebateDealerSn: undefined,
|
|
|
- dealerSn: undefined
|
|
|
+ dealerSn: undefined,
|
|
|
+ subareaSn: undefined
|
|
|
},
|
|
|
rules: {
|
|
|
- 'month': [{ required: true, message: '请选择月份', trigger: 'change' }],
|
|
|
- 'provinceSn': [{ required: true, message: '请选择省份', trigger: 'change' }]
|
|
|
+ 'time': [{ required: true, message: '请选择日期', trigger: 'change' }]
|
|
|
+ // 'provinceSn': [{ required: true, message: '请选择省份', trigger: 'change' }]
|
|
|
},
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
addrProvinceList: [], // 省下拉
|
|
@@ -133,14 +145,12 @@ export default {
|
|
|
computed: {
|
|
|
columns () {
|
|
|
const arr = [
|
|
|
- { title: '月份', dataIndex: 'month', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '区域', dataIndex: 'dealerSubareaNameSet', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '日期', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '省份', dataIndex: 'provinceName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '记账门店', dataIndex: 'rebateDealerName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '客户名称', dataIndex: 'dealerName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '产品品牌+二级分类', dataIndex: 'productBrandAndType2', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- // { title: '实售金额', dataIndex: 'totalRealAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '开单金额', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- // { title: '直接差额', dataIndex: 'rebateAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '类型', dataIndex: 'bizType', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
]
|
|
|
if (this.$hasPermissions('B_isShowPrice')) { // 售价权限
|
|
@@ -152,9 +162,15 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- // 月份 change
|
|
|
- onChange (date, dateString) {
|
|
|
- this.queryParam.month = dateString || null
|
|
|
+ // 创建时间 change
|
|
|
+ dateChange (date) {
|
|
|
+ if (date[0] && date[1]) {
|
|
|
+ this.queryParam.time = date
|
|
|
+ } else {
|
|
|
+ this.queryParam.time = []
|
|
|
+ }
|
|
|
+ this.queryParam.beginDate = date[0] || ''
|
|
|
+ this.queryParam.endDate = date[1] || ''
|
|
|
},
|
|
|
// 合计
|
|
|
getCount (params) {
|
|
@@ -214,10 +230,17 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
- this.queryParam.month = moment().format('YYYY-MM')
|
|
|
+ this.queryParam.time = [
|
|
|
+ getDate.getCurrMonthDays().starttime,
|
|
|
+ getDate.getCurrMonthDays().endtime
|
|
|
+ ]
|
|
|
+ this.$refs.rangeDate.resetDate(this.queryParam.time)
|
|
|
+ this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
|
|
|
+ this.queryParam.endDate = getDate.getCurrMonthDays().endtime
|
|
|
this.queryParam.provinceSn = undefined
|
|
|
this.queryParam.rebateDealerSn = undefined
|
|
|
this.queryParam.dealerSn = undefined
|
|
|
+ this.queryParam.subareaSn = undefined
|
|
|
this.$refs.rebateDealerList.resetForm()
|
|
|
this.totalData = null
|
|
|
if (this.advanced) {
|