|
@@ -21,14 +21,14 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="4" :sm="24">
|
|
|
- <a-form-item label="所在地">
|
|
|
- <areaList level="2" placeholder="请选择所在地"></areaList>
|
|
|
+ <a-form-item label="所在地" >
|
|
|
+ <areaList level="2" placeholder="请选择所在地" @change="areaChange"></areaList>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
<a-col :md="4" :sm="24">
|
|
|
<a-form-item label="货架状态">
|
|
|
- <v-select id="userd-state" code="SHELF_STATE" v-model="queryParam.state" allowClear placeholder="请选择状态"></v-select>
|
|
|
+ <v-select id="userd-state" code="SHELF_STATE" v-model="queryParam.shelfState" allowClear placeholder="请选择状态"></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="5" :sm="24">
|
|
@@ -36,7 +36,7 @@
|
|
|
<rangeDate ref="orderDate" :value="orderTime" @change="orderDateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
+ <!-- <a-col :md="5" :sm="24">
|
|
|
<a-form-item label="货架取货数量">
|
|
|
<a-input-group compact>
|
|
|
<a-input-number
|
|
@@ -83,12 +83,12 @@
|
|
|
placeholder="请输入最大值"/>
|
|
|
</a-input-group>
|
|
|
</a-form-item>
|
|
|
- </a-col>
|
|
|
+ </a-col> -->
|
|
|
</template>
|
|
|
<a-col :md="4" :sm="24" style="margin-bottom: 10px;">
|
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" id="userd-refresh">查询</a-button>
|
|
|
<a-button type="" @click="reset" style="margin-left: 10px;" id="userd-reset">重置</a-button>
|
|
|
- <a-button type="primary" class="button-warning" style="margin-left: 10px;" id="userd-reset">导出</a-button>
|
|
|
+ <a-button type="primary" @click="exportFile" class="button-warning" style="margin-left: 10px;" id="userd-reset">导出</a-button>
|
|
|
<a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
{{ advanced ? '收起' : '展开' }}
|
|
|
<a-icon :type="advanced ? 'up' : 'down'"/>
|
|
@@ -97,21 +97,21 @@
|
|
|
</a-row>
|
|
|
</a-form>
|
|
|
</div>
|
|
|
- <div class="table-operator">
|
|
|
+ <div class="table-operator" v-if="statisticsObj">
|
|
|
<a-alert type="info">
|
|
|
<div slot="message" class="total-bar">
|
|
|
<div>
|
|
|
- 货架数量:<strong>399</strong>;
|
|
|
- 铺货数量合计:<strong>399</strong>;
|
|
|
- 铺货金额合计:<strong>26545</strong>;
|
|
|
- 货架取货数量合计:<strong>399</strong>;
|
|
|
- 货架取货金额合计:<strong>26545</strong>;
|
|
|
+ 货架数量:<strong>{{ statisticsObj.shelfNum }}</strong>;
|
|
|
+ 铺货数量合计:<strong>{{ statisticsObj.totalShelfMaxQty }}</strong>;
|
|
|
+ 铺货金额合计:<strong>{{ statisticsObj.totalShelfMaxCost }}</strong>;
|
|
|
+ 货架取货数量合计:<strong>{{ statisticsObj.totalOrderAmount }}</strong>;
|
|
|
+ 货架取货金额合计:<strong>{{ statisticsObj.totalOrderQty }}</strong>;
|
|
|
</div>
|
|
|
<div>
|
|
|
- 急送数量合计:<strong>399</strong>;
|
|
|
- 急送金额合计:<strong>26545</strong>;
|
|
|
- 销售数量合计:<strong>399</strong>;
|
|
|
- 销售金额合计:<strong>26545</strong>;
|
|
|
+ 急送数量合计:<strong>{{ statisticsObj.tempOrderQty }}</strong>;
|
|
|
+ 急送金额合计:<strong>{{ statisticsObj.tempOrderAmount }}</strong>;
|
|
|
+ 销售数量合计:<strong>{{ statisticsObj.saleOrderQty }}</strong>;
|
|
|
+ 销售金额合计:<strong>{{ statisticsObj.saleOrderAmount }}</strong>;
|
|
|
</div>
|
|
|
</div>
|
|
|
</a-alert>
|
|
@@ -121,21 +121,15 @@
|
|
|
ref="table"
|
|
|
:style="{ height: tableHeight+84.5+'px', wordBreak: 'break-all' }"
|
|
|
size="small"
|
|
|
- rowKey="id"
|
|
|
+ :rowKey="(record,index)=>{return index}"
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
:scroll="{ y: tableHeight }"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
- <span slot="customTitle">
|
|
|
- <a-popover>
|
|
|
- <template slot="content">
|
|
|
- 货架铺货情况为实时数据,<br>与查询条件查询中的下单时间无关
|
|
|
- </template>
|
|
|
- <a-icon type="question-circle" theme="twoTone" />
|
|
|
- </a-popover>
|
|
|
- 货架铺货情况
|
|
|
- </span>
|
|
|
+ <div slot="area" slot-scope="text, record">
|
|
|
+ {{ record.dealerProvinceName }} {{ record.dealerCityName }}
|
|
|
+ </div>
|
|
|
</s-table>
|
|
|
</a-spin>
|
|
|
</a-card>
|
|
@@ -145,11 +139,12 @@
|
|
|
<script>
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
-import { bondRecordByPage } from '@/api/boundRecord.js'
|
|
|
+import { queryShelfOrderReportPage, queryShelfOrderTotalReport, exportShelfOrderReport } from '@/api/report.js'
|
|
|
import areaList from '@/views/common/areaList.js'
|
|
|
import dealerList from '@/views/common/dealerList.vue'
|
|
|
import storeList from '@/views/common/storeList.vue'
|
|
|
import { toThousands } from '@/libs/tools.js'
|
|
|
+import { hdExportExcel } from '@/libs/exportExcel'
|
|
|
export default {
|
|
|
name: 'UserList',
|
|
|
components: { STable, VSelect, rangeDate, dealerList, storeList, areaList },
|
|
@@ -162,53 +157,61 @@ export default {
|
|
|
orderTime: [],
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
|
- shelfName: '',
|
|
|
- state: undefined
|
|
|
+ beginDate: '', // 下单时间
|
|
|
+ endDate: '',
|
|
|
+ shelfCreateBeginDate: '', // 货架创建时间
|
|
|
+ shelfCreateEndDate: '',
|
|
|
+ storeSn: undefined,
|
|
|
+ dealerSn: undefined,
|
|
|
+ shelfState: undefined,
|
|
|
+ dealerProvinceSn: undefined,
|
|
|
+ dealerCitySn: undefined
|
|
|
},
|
|
|
showModal: false,
|
|
|
itemData: null, // 编辑行数据
|
|
|
openStatusModal: false, // 货架状态弹窗初始状态
|
|
|
+ statisticsObj: null,
|
|
|
// 表头
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
|
|
|
- { title: '货架创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '货架创建时间', dataIndex: 'shelfCreateDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '汽车修理厂', dataIndex: 'storeName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '配件经销商', dataIndex: 'dealerName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '所在地', dataIndex: 'createDate2', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '货架状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '所在地', scopedSlots: { customRender: 'area' }, width: '11%', align: 'center' },
|
|
|
+ { title: '货架状态', dataIndex: 'shelfStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{
|
|
|
slots: { title: 'customTitle' },
|
|
|
children: [
|
|
|
- { title: '铺货数量', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true },
|
|
|
- { title: '铺货金额', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true }
|
|
|
+ { title: '铺货数量', dataIndex: 'totalShelfMaxQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '铺货金额', dataIndex: 'totalShelfMaxCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } }
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
title: '货架订单',
|
|
|
children: [
|
|
|
- { title: '取货数量', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true },
|
|
|
- { title: '取货金额', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true }
|
|
|
+ { title: '取货数量', dataIndex: 'totalOrderQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '取货金额', dataIndex: 'totalOrderAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } }
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
title: '急送订单',
|
|
|
children: [
|
|
|
- { title: '急送数量', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true },
|
|
|
- { title: '急送金额', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true }
|
|
|
+ { title: '急送数量', dataIndex: 'tempOrderQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '急送金额', dataIndex: 'tempOrderAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } }
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
title: '销售单',
|
|
|
children: [
|
|
|
- { title: '销售数量', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true },
|
|
|
- { title: '销售金额', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true }
|
|
|
+ { title: '销售数量', dataIndex: 'saleOrderQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '销售金额', dataIndex: 'saleOrderAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } }
|
|
|
]
|
|
|
}
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
this.spinning = true
|
|
|
- return bondRecordByPage(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
+ return queryShelfOrderReportPage(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
let data
|
|
|
if (res.status == 200) {
|
|
|
data = res.data
|
|
@@ -218,6 +221,7 @@ export default {
|
|
|
_item.no = no + i + 1
|
|
|
}
|
|
|
}
|
|
|
+ this.getStatistics(this.queryParam)
|
|
|
this.spinning = false
|
|
|
return data
|
|
|
})
|
|
@@ -230,8 +234,8 @@ export default {
|
|
|
},
|
|
|
// 时间 change
|
|
|
dateChange (date) {
|
|
|
- this.queryParam.beginDate = date[0]
|
|
|
- this.queryParam.endDate = date[1]
|
|
|
+ this.queryParam.shelfCreateBeginDate = date[0]
|
|
|
+ this.queryParam.shelfCreateEndDate = date[1]
|
|
|
},
|
|
|
// 时间 change
|
|
|
orderDateChange (date) {
|
|
@@ -246,11 +250,23 @@ export default {
|
|
|
storeChange (obj) {
|
|
|
this.queryParam.storeSn = obj.key || undefined
|
|
|
},
|
|
|
+ // 地区
|
|
|
+ areaChange (val, opts) {
|
|
|
+ this.queryParam.dealerProvinceSn = val && val[0] ? val[0] : ''
|
|
|
+ this.queryParam.dealerCitySn = val && val[1] ? val[1] : ''
|
|
|
+ },
|
|
|
// 重置
|
|
|
reset () {
|
|
|
this.queryParam = {
|
|
|
- shelfName: '',
|
|
|
- state: undefined
|
|
|
+ beginDate: '', // 下单时间
|
|
|
+ endDate: '',
|
|
|
+ shelfCreateBeginDate: '', // 货架创建时间
|
|
|
+ shelfCreateEndDate: '',
|
|
|
+ storeSn: undefined,
|
|
|
+ dealerSn: undefined,
|
|
|
+ shelfState: undefined,
|
|
|
+ dealerProvinceSn: undefined,
|
|
|
+ dealerCitySn: undefined
|
|
|
}
|
|
|
this.$refs.dealerList.resetForm()
|
|
|
this.$refs.storeList.resetForm()
|
|
@@ -262,9 +278,27 @@ export default {
|
|
|
_this.setTableH()
|
|
|
})
|
|
|
},
|
|
|
+ // 导出
|
|
|
+ exportFile () {
|
|
|
+ const _this = this
|
|
|
+ this.spinning = true
|
|
|
+ hdExportExcel(exportShelfOrderReport, this.queryParam, '订单数据汇总', function () {
|
|
|
+ _this.spinning = false
|
|
|
+ })
|
|
|
+ },
|
|
|
setTableH () {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
this.tableHeight = window.innerHeight - tableSearchH - 225
|
|
|
+ },
|
|
|
+ // 获取订单汇总统计数据
|
|
|
+ getStatistics (ajaxData) {
|
|
|
+ queryShelfOrderTotalReport(ajaxData).then(res => {
|
|
|
+ if (res.status == 200) {// eslint-disable-line
|
|
|
+ this.statisticsObj = res.data
|
|
|
+ } else {
|
|
|
+ this.$message.error(res.message)
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
},
|
|
|
watch: {
|