|
@@ -20,8 +20,8 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="5">
|
|
|
- <a-form-item label="投递类型" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
- <v-select code="RUBBISH_TYPE" v-model="queryParam.rubbishType" allowClear placeholder="请选择投递类型" id="releaseRecordList-rubbishType"></v-select>
|
|
|
+ <a-form-item label="投放类型" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
+ <v-select code="RUBBISH_TYPE" v-model="queryParam.rubbishType" allowClear placeholder="请选择投放类型" id="releaseRecordList-rubbishType"></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="5">
|
|
@@ -61,8 +61,8 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="5">
|
|
|
- <a-form-item label="投递方式" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
- <v-select code="ENABLE_FLAG" v-model="queryParam.loginFlag" allowClear placeholder="请选择投递方式" id="releaseRecordList-loginFlag"></v-select>
|
|
|
+ <a-form-item label="投放方式" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
+ <v-select code="DELIVERY_WAY" v-model="queryParam.deliveryWay" allowClear placeholder="请选择投放方式" id="releaseRecordList-deliveryWay"></v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="5">
|
|
@@ -156,6 +156,7 @@ export default {
|
|
|
srcDeviceCode: '', // 设备编号
|
|
|
stationNo: undefined, // 网点名称
|
|
|
rubbishType: '', // 投放类型
|
|
|
+ deliveryWay: '', // 投放方式
|
|
|
goldNumStart: null, // 兑换最小值
|
|
|
goldNumEnd: null, // 兑换最大值
|
|
|
rubbishWeightStart: null, // 投放重量最小值
|
|
@@ -171,7 +172,7 @@ export default {
|
|
|
{ title: '网点名称', dataIndex: 'stationName', width: 200, align: 'center' },
|
|
|
{ title: '设备编号', dataIndex: 'srcDeviceCode', width: 200, align: 'center' },
|
|
|
{ title: '用户账号', dataIndex: 'customerMobile', width: 200, align: 'center' },
|
|
|
- { title: '投递方式', dataIndex: '', width: 200, align: 'center' },
|
|
|
+ { title: '投放方式', dataIndex: 'deliveryWayDictValue', width: 200, align: 'center' },
|
|
|
{ title: '本次兑换乐豆(个)', dataIndex: 'goldNum', width: 100, align: 'center' },
|
|
|
{ title: '内置各箱体投放重量(g)',
|
|
|
children: [
|
|
@@ -293,7 +294,8 @@ export default {
|
|
|
goldNumEnd: this.queryParam.goldNumEnd, // 兑换最大值
|
|
|
rubbishWeightStart: this.queryParam.rubbishWeightStart, // 投放重量最小值
|
|
|
rubbishWeightEnd: this.queryParam.rubbishWeightEnd,
|
|
|
- rubbishType: this.queryParam.rubbishType
|
|
|
+ rubbishType: this.queryParam.rubbishType, // 投放类型
|
|
|
+ deliveryWay: this.queryParam.deliveryWay // 投放方式
|
|
|
}
|
|
|
if (this.queryOrderDate && this.queryOrderDate.length) {
|
|
|
params.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
|
|
@@ -324,11 +326,12 @@ export default {
|
|
|
this.queryParam.customerMobile = ''
|
|
|
this.queryParam.srcDeviceCode = ''
|
|
|
this.queryParam.stationNo = undefined
|
|
|
- this.queryParam.rubbishType = ''
|
|
|
+ this.queryParam.rubbishType = '' // 投放类型
|
|
|
this.queryParam.goldNumStart = '' // 兑换最小值
|
|
|
this.queryParam.goldNumEnd = '' // 兑换最大值
|
|
|
this.queryParam.rubbishWeightStart = ''// 投放重量最小值
|
|
|
- this.queryParam.rubbishWeightEnd = ''
|
|
|
+ this.queryParam.rubbishWeightEnd = '' // 投放重量最大值
|
|
|
+ this.queryParam.deliveryWay = '' // 投放方式
|
|
|
this.$refs.table.refresh(true)
|
|
|
}
|
|
|
}
|