|
@@ -60,8 +60,14 @@
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xs="24" :sm="12" :md="8" :lg="5">
|
|
<a-col :xs="24" :sm="12" :md="8" :lg="5">
|
|
- <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 label="称重值" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
|
+ <v-select
|
|
|
|
+ code="DEVICE_WEIGHT_TAG"
|
|
|
|
+ mode="multiple"
|
|
|
|
+ v-model="queryParam.weightTagList"
|
|
|
|
+ allowClear
|
|
|
|
+ placeholder="请选择(可多选)"
|
|
|
|
+ id="releaseRecordList-weightTagList"></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xs="24" :sm="12" :md="8" :lg="5">
|
|
<a-col :xs="24" :sm="12" :md="8" :lg="5">
|
|
@@ -73,6 +79,13 @@
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xs="24" :sm="12" :md="8" :lg="4">
|
|
<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="DELIVERY_WAY" v-model="queryParam.deliveryWay" allowClear placeholder="请选择投放方式" id="releaseRecordList-deliveryWay"></v-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ </a-row>
|
|
|
|
+ <a-row :gutter="24">
|
|
|
|
+ <a-col :offset="20">
|
|
<a-button class="handle-btn serach-btn" id="releaseRecordList-serach" type="primary" @click="refresh">查询</a-button>
|
|
<a-button class="handle-btn serach-btn" id="releaseRecordList-serach" type="primary" @click="refresh">查询</a-button>
|
|
<a-button class="handle-btn serach-btn" type="" id="releaseRecordList-reset" @click="handleReset">重置</a-button>
|
|
<a-button class="handle-btn serach-btn" type="" id="releaseRecordList-reset" @click="handleReset">重置</a-button>
|
|
<a-button class="export-btn" id="releaseRecordList-export" v-hasPermission="'B_exportDeliveryLog'" :loading="loading" @click="handleExport">导出</a-button>
|
|
<a-button class="export-btn" id="releaseRecordList-export" v-hasPermission="'B_exportDeliveryLog'" :loading="loading" @click="handleExport">导出</a-button>
|
|
@@ -131,7 +144,7 @@
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
-import { getDeliveryLogList, getDeliveryLogTotal, stationList, exportDeliveryLog } from '@/api/releaseRecord.js'
|
|
|
|
|
|
+import { getDeliveryLogList, getDeliveryLogTotal, stationList, exportDeliveryLog, numType } from '@/api/releaseRecord.js'
|
|
import moment from 'moment'
|
|
import moment from 'moment'
|
|
import getDate from '@/libs/getDate.js'
|
|
import getDate from '@/libs/getDate.js'
|
|
export default {
|
|
export default {
|
|
@@ -162,7 +175,8 @@ export default {
|
|
goldNumStart: null, // 兑换最小值
|
|
goldNumStart: null, // 兑换最小值
|
|
goldNumEnd: null, // 兑换最大值
|
|
goldNumEnd: null, // 兑换最大值
|
|
rubbishWeightStart: null, // 投放重量最小值
|
|
rubbishWeightStart: null, // 投放重量最小值
|
|
- rubbishWeightEnd: null// 投放重量最小值
|
|
|
|
|
|
+ rubbishWeightEnd: null, // 投放重量最小值
|
|
|
|
+ weightTagList: []
|
|
},
|
|
},
|
|
optionData: [],
|
|
optionData: [],
|
|
orderTotal: 0, // 总单数
|
|
orderTotal: 0, // 总单数
|
|
@@ -232,12 +246,14 @@ export default {
|
|
goldNumStart: null, // 兑换最小值
|
|
goldNumStart: null, // 兑换最小值
|
|
goldNumEnd: null, // 兑换最大值
|
|
goldNumEnd: null, // 兑换最大值
|
|
rubbishWeightStart: null, // 投放重量最小值
|
|
rubbishWeightStart: null, // 投放重量最小值
|
|
- rubbishWeightEnd: null// 投放重量最小值
|
|
|
|
|
|
+ rubbishWeightEnd: null, // 投放重量最小值
|
|
|
|
+ weightTagList: []
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
mounted () {
|
|
mounted () {
|
|
this.getStationList()
|
|
this.getStationList()
|
|
|
|
+ this.getNumType()
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
moment,
|
|
moment,
|
|
@@ -362,6 +378,7 @@ export default {
|
|
this.queryParam.rubbishWeightStart = ''// 投放重量最小值
|
|
this.queryParam.rubbishWeightStart = ''// 投放重量最小值
|
|
this.queryParam.rubbishWeightEnd = '' // 投放重量最大值
|
|
this.queryParam.rubbishWeightEnd = '' // 投放重量最大值
|
|
this.queryParam.deliveryWay = '' // 投放方式
|
|
this.queryParam.deliveryWay = '' // 投放方式
|
|
|
|
+ this.queryParam.weightTagList = []
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -384,6 +401,11 @@ export default {
|
|
.serach-btn{
|
|
.serach-btn{
|
|
margin-right: 10px;
|
|
margin-right: 10px;
|
|
}
|
|
}
|
|
|
|
+ .flex-1 {
|
|
|
|
+ flex: 1;
|
|
|
|
+ overflow-y: scroll;
|
|
|
|
+ max-height: 140px;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
.export-btn{
|
|
.export-btn{
|
|
background-color: #ff9900;
|
|
background-color: #ff9900;
|