|
@@ -245,12 +245,17 @@ export default {
|
|
|
this.disabled = true
|
|
|
this.queryParam.salePriceType = this.priceType
|
|
|
// 排序
|
|
|
- parameter.sortAlias = 'sd'
|
|
|
+ if (parameter.sortField == 'productCode') {
|
|
|
+ parameter.sortField = 'code'
|
|
|
+ parameter.sortAlias = 'product '
|
|
|
+ }
|
|
|
if (parameter.sortField == 'brandName') {
|
|
|
- parameter.sortField = 'brandSn'
|
|
|
+ parameter.sortField = 'productBrandSn'
|
|
|
+ parameter.sortAlias = 'product'
|
|
|
}
|
|
|
if (parameter.sortField == 'warehouseName') {
|
|
|
parameter.sortField = 'warehouseSn'
|
|
|
+ parameter.sortAlias = 'sd'
|
|
|
}
|
|
|
return querySumByProductLocation(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
const data = res.data
|
|
@@ -319,6 +324,7 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
+ this.queryParam.productCode = ''
|
|
|
this.queryParam.productName = ''
|
|
|
this.queryParam.productOrigCode = ''
|
|
|
this.queryParam.brandSn = undefined
|