|
@@ -145,28 +145,31 @@ export default {
|
|
|
this.disabled = true
|
|
|
const newParameter = parameter
|
|
|
if (newParameter.sortField && newParameter.sortField == 'inStockCount') { // 有货
|
|
|
- if (newParameter.sortOrder != 'ascend') { // 降序
|
|
|
- newParameter.orderBy = 'xvfp.in_stock_count desc,xp.code asc'
|
|
|
+ if (newParameter.sortOrder) {
|
|
|
+ if (newParameter.sortOrder != 'ascend') { // 降序
|
|
|
+ newParameter.orderBy = 'xvfp.in_stock_count desc,xp.code asc'
|
|
|
+ } else {
|
|
|
+ newParameter.orderBy = 'xvfp.in_stock_count asc,xp.code asc'
|
|
|
+ }
|
|
|
+ this.order_by = newParameter.orderBy
|
|
|
} else {
|
|
|
- newParameter.orderBy = 'xvfp.in_stock_count asc,xp.code asc'
|
|
|
+ this.order_by = ''
|
|
|
}
|
|
|
- this.order_by = newParameter.orderBy
|
|
|
- } else {
|
|
|
- this.order_by = ''
|
|
|
}
|
|
|
if (newParameter.sortField && newParameter.sortField == 'notStockCount') { // 无货
|
|
|
- if (newParameter.sortOrder != 'ascend') { // 降序
|
|
|
- newParameter.orderBy = 'xvfp.not_stock_count desc,xp.code asc'
|
|
|
+ if (newParameter.sortOrder) {
|
|
|
+ if (newParameter.sortOrder != 'ascend') { // 降序
|
|
|
+ newParameter.orderBy = 'xvfp.not_stock_count desc,xp.code asc'
|
|
|
+ } else {
|
|
|
+ newParameter.orderBy = 'xvfp.not_stock_count asc,xp.code asc'
|
|
|
+ }
|
|
|
+ this.order_by = newParameter.orderBy
|
|
|
} else {
|
|
|
- newParameter.orderBy = 'xvfp.not_stock_count asc,xp.code asc'
|
|
|
+ this.order_by = ''
|
|
|
}
|
|
|
- this.order_by = newParameter.orderBy
|
|
|
- } else {
|
|
|
- this.order_by = ''
|
|
|
}
|
|
|
|
|
|
const params = Object.assign(newParameter, this.queryParam, { orderBy: this.order_by })
|
|
|
-
|
|
|
delete params.time
|
|
|
return reportPage(params).then(res => {
|
|
|
let data
|