|
@@ -34,7 +34,7 @@
|
|
|
</a-col>
|
|
|
<a-col :xs="24" :sm="12" :md="8" :lg="4">
|
|
|
<a-form-item label="设备类型" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
- <v-select code="DEVICE_TYPE_CODE" v-model="queryParam.deviceType" allowClear placeholder="请选择设备类型" id="releaseRecordList-deviceType"></v-select>
|
|
|
+ <v-select code="DEVICE_TYPE" v-model="queryParam.deviceType" allowClear placeholder="请选择设备类型" id="releaseRecordList-deviceType"></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
@@ -157,7 +157,7 @@ export default {
|
|
|
customerMobile: '', // 用户手机
|
|
|
srcDeviceCode: '', // 设备编号
|
|
|
stationNo: undefined, // 网点名称
|
|
|
- deviceType: '', // 投放类型
|
|
|
+ deviceType: '', // 设备类型
|
|
|
deliveryWay: '', // 投放方式
|
|
|
goldNumStart: null, // 兑换最小值
|
|
|
goldNumEnd: null, // 兑换最大值
|
|
@@ -173,7 +173,7 @@ export default {
|
|
|
{ title: '投放时间', dataIndex: 'deliveryTime', width: 200, align: 'center' },
|
|
|
{ title: '网点名称', dataIndex: 'stationName', width: 200, align: 'center' },
|
|
|
{ title: '设备编号', dataIndex: 'srcDeviceCode', width: 200, align: 'center' },
|
|
|
- { title: '设备类型', dataIndex: 'deviceType', width: 200, align: 'center' },
|
|
|
+ { title: '设备类型', dataIndex: 'deviceTypeDictValue', width: 200, align: 'center' },
|
|
|
{ title: '用户账号', dataIndex: 'customerMobile', width: 200, align: 'center' },
|
|
|
{ title: '投放方式', dataIndex: 'deliveryWayDictValue', width: 200, align: 'center' },
|
|
|
{ title: '本次兑换乐豆(个)', dataIndex: 'goldNum', width: 100, align: 'center' },
|
|
@@ -227,7 +227,7 @@ export default {
|
|
|
customerMobile: '', // 用户手机
|
|
|
srcDeviceCode: '', // 设备编号
|
|
|
stationNo: undefined, // 网点名称
|
|
|
- rubbishType: '', // 投放类型
|
|
|
+ deviceType: '', // 设备类型
|
|
|
deliveryWay: '', // 投放方式
|
|
|
goldNumStart: null, // 兑换最小值
|
|
|
goldNumEnd: null, // 兑换最大值
|
|
@@ -324,19 +324,7 @@ export default {
|
|
|
},
|
|
|
// 合计
|
|
|
getListTotal () {
|
|
|
- const params = {
|
|
|
- customerMobile: this.queryParam.customerMobile,
|
|
|
- beginDate: this.queryParam.beginDate,
|
|
|
- endDate: this.queryParam.endDate,
|
|
|
- srcDeviceCode: this.queryParam.srcDeviceCode, // 设备编号
|
|
|
- stationNo: this.queryParam.stationNo, // 网点名称
|
|
|
- goldNumStart: this.queryParam.goldNumStart, // 兑换最小值
|
|
|
- goldNumEnd: this.queryParam.goldNumEnd, // 兑换最大值
|
|
|
- rubbishWeightStart: this.queryParam.rubbishWeightStart, // 投放重量最小值
|
|
|
- rubbishWeightEnd: this.queryParam.rubbishWeightEnd,
|
|
|
- rubbishType: this.queryParam.rubbishType, // 投放类型
|
|
|
- deliveryWay: this.queryParam.deliveryWay // 投放方式
|
|
|
- }
|
|
|
+ const params = this.queryParam
|
|
|
if (this.queryOrderDate && this.queryOrderDate.length) {
|
|
|
params.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
|
|
|
params.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
|
|
@@ -365,7 +353,7 @@ export default {
|
|
|
this.queryParam.customerMobile = ''
|
|
|
this.queryParam.srcDeviceCode = ''
|
|
|
this.queryParam.stationNo = undefined
|
|
|
- this.queryParam.rubbishType = '' // 投放类型
|
|
|
+ this.queryParam.deviceType = '' // 设备类型
|
|
|
this.queryParam.goldNumStart = '' // 兑换最小值
|
|
|
this.queryParam.goldNumEnd = '' // 兑换最大值
|
|
|
this.queryParam.rubbishWeightStart = ''// 投放重量最小值
|