|
@@ -35,7 +35,13 @@
|
|
|
<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.shelfState" allowClear placeholder="请选择状态"></v-select>
|
|
|
+ <v-select
|
|
|
+ id="userd-state"
|
|
|
+ code="SHELF_STATE"
|
|
|
+ v-model="queryParam.shelfState"
|
|
|
+ allowClear
|
|
|
+ placeholder="请选择状态"
|
|
|
+ :notIn="['NOT_ENABLE']"></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="5" :sm="24">
|
|
@@ -104,6 +110,7 @@ import dealerList from '@/views/common/dealerList.vue'
|
|
|
import storeList from '@/views/common/storeList.vue'
|
|
|
import { hdExportExcel } from '@/libs/exportExcel'
|
|
|
import { toThousands } from '@/libs/tools.js'
|
|
|
+import { dealChooseDate } from '@/utils/util'
|
|
|
export default {
|
|
|
name: 'UserList',
|
|
|
components: { STable, VSelect, rangeDate, dealerList, storeList, areaList },
|
|
@@ -139,8 +146,8 @@ export default {
|
|
|
{ title: '配件经销商', dataIndex: 'dealerName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '所在地', scopedSlots: { customRender: 'area' }, width: '11%', align: 'center' },
|
|
|
{ title: '货架状态', dataIndex: 'shelfStateDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '铺货数量', dataIndex: 'totalShelfMaxQty', width: '11%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' } },
|
|
|
- { title: '铺货金额', dataIndex: 'totalShelfMaxCost', width: '11%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' } },
|
|
|
+ { title: '铺货数量', dataIndex: 'totalShelfMaxQty', width: '11%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
+ { title: '铺货金额', dataIndex: 'totalShelfMaxCost', width: '11%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text, 2) : '--' } },
|
|
|
{ slots: { title: 'customTitle' }, dataIndex: 'lastOrderDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
@@ -180,13 +187,13 @@ export default {
|
|
|
},
|
|
|
// 时间 change
|
|
|
dateChange (date) {
|
|
|
- this.queryParam.shelfCreateBeginDate = date[0]
|
|
|
- this.queryParam.shelfCreateEndDate = date[1]
|
|
|
+ this.queryParam.shelfCreateBeginDate = date[0] ? dealChooseDate(date[0], 'start') : ''
|
|
|
+ this.queryParam.shelfCreateEndDate = date[1] ? dealChooseDate(date[1], 'end') : ''
|
|
|
},
|
|
|
// 时间 change
|
|
|
orderDateChange (date) {
|
|
|
- this.queryParam.lastOrderBeginDate = date[0]
|
|
|
- this.queryParam.lastOrderEndDate = date[1]
|
|
|
+ this.queryParam.lastOrderBeginDate = date[0] ? dealChooseDate(date[0], 'start') : ''
|
|
|
+ this.queryParam.lastOrderEndDate = date[1] ? dealChooseDate(date[1], 'end') : ''
|
|
|
},
|
|
|
// 经销商 change
|
|
|
dealerChange (obj) {
|
|
@@ -217,6 +224,11 @@ export default {
|
|
|
dealerProvinceSn: undefined,
|
|
|
dealerCitySn: undefined
|
|
|
}
|
|
|
+ this.areaArr = []
|
|
|
+ this.$refs.rangeDate.resetDate()
|
|
|
+ if (this.advanced) {
|
|
|
+ this.$refs.orderDate.resetDate()
|
|
|
+ }
|
|
|
this.$refs.dealerList.resetForm()
|
|
|
this.$refs.storeList.resetForm()
|
|
|
this.$refs.table.refresh(true)
|