|
@@ -197,7 +197,7 @@ export default {
|
|
recyclable: '', // 可回收物总计
|
|
recyclable: '', // 可回收物总计
|
|
queryParam: {
|
|
queryParam: {
|
|
srcDeviceCode: undefined, // 设备编号
|
|
srcDeviceCode: undefined, // 设备编号
|
|
- stationName: '', // 网点名称
|
|
|
|
|
|
+ stationNo: undefined, // 网点名称
|
|
orderType: 'max', // 排序规则
|
|
orderType: 'max', // 排序规则
|
|
beginDate: null, // 开始时间
|
|
beginDate: null, // 开始时间
|
|
endDate: null, // 结束时间
|
|
endDate: null, // 结束时间
|
|
@@ -212,7 +212,8 @@ export default {
|
|
// 将默认当天时间日期回显在时间选择框中
|
|
// 将默认当天时间日期回显在时间选择框中
|
|
time: [],
|
|
time: [],
|
|
dateFormat: 'YYYY-MM-DD', // 日期格式
|
|
dateFormat: 'YYYY-MM-DD', // 日期格式
|
|
- columns: [{ title: '网点名称', dataIndex: 'stationName', width: 100, align: 'center' },
|
|
|
|
|
|
+ columns: [
|
|
|
|
+ { title: '网点名称', dataIndex: 'stationName', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
|
|
{ title: '设备编号', dataIndex: 'srcDeviceCode', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
|
|
{ title: '设备编号', dataIndex: 'srcDeviceCode', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
|
|
{ slots: { title: 'customTitle' },
|
|
{ slots: { title: 'customTitle' },
|
|
children: [{ title: '废旧衣物',
|
|
children: [{ title: '废旧衣物',
|
|
@@ -316,14 +317,12 @@ export default {
|
|
const _item = res.data.list[i]
|
|
const _item = res.data.list[i]
|
|
// 找出可回收垃圾库存量最大的值
|
|
// 找出可回收垃圾库存量最大的值
|
|
const arr = [_item.clothes, _item.paper, _item.plastic, _item.metal, _item.metPla, _item.glass, _item.recycling]
|
|
const arr = [_item.clothes, _item.paper, _item.plastic, _item.metal, _item.metPla, _item.glass, _item.recycling]
|
|
- if (arr) {
|
|
|
|
- arr.some(item => {
|
|
|
|
- const isTrue = item != 0
|
|
|
|
- console.log(isTrue)
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
const maxVal = Math.max(...arr)
|
|
const maxVal = Math.max(...arr)
|
|
- _item.maxVal = maxVal
|
|
|
|
|
|
+ if (maxVal == 0) {
|
|
|
|
+ _item.maxVal = null
|
|
|
|
+ } else {
|
|
|
|
+ _item.maxVal = maxVal
|
|
|
|
+ }
|
|
}
|
|
}
|
|
this.orderTotal = res.data.count || 0
|
|
this.orderTotal = res.data.count || 0
|
|
this.getTotal()
|
|
this.getTotal()
|
|
@@ -462,7 +461,7 @@ export default {
|
|
// 重置
|
|
// 重置
|
|
reset () {
|
|
reset () {
|
|
this.queryParam.srcDeviceCode = undefined
|
|
this.queryParam.srcDeviceCode = undefined
|
|
- this.queryParam.stationName = ''
|
|
|
|
|
|
+ this.queryParam.stationNo = undefined
|
|
this.queryParam.orderType = ''
|
|
this.queryParam.orderType = ''
|
|
this.queryParam.beginDate = null
|
|
this.queryParam.beginDate = null
|
|
this.queryParam.endDate = null
|
|
this.queryParam.endDate = null
|
|
@@ -470,6 +469,7 @@ export default {
|
|
this.queryParam.cityCode = undefined
|
|
this.queryParam.cityCode = undefined
|
|
this.queryParam.districtCode = undefined
|
|
this.queryParam.districtCode = undefined
|
|
this.time = []
|
|
this.time = []
|
|
|
|
+ this.$refs.table.refresh(true)
|
|
},
|
|
},
|
|
// 查看清运详情
|
|
// 查看清运详情
|
|
handleDetail (record) {
|
|
handleDetail (record) {
|