|
@@ -126,7 +126,7 @@
|
|
<div>
|
|
<div>
|
|
<div>
|
|
<div>
|
|
总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
|
|
总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
|
|
- 总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
|
|
|
|
|
|
+ 总款数:<strong>{{ totalData&&totalData.totalCategory || totalData.totalCategory == 0 ? totalData.totalCategory : '--' }}</strong>;
|
|
总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
|
|
总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
|
|
已下推数量:<strong>{{ totalData&&(totalData.totalPushedQty || totalData.totalPushedQty==0) ? totalData.totalPushedQty : '--' }}</strong>;
|
|
已下推数量:<strong>{{ totalData&&(totalData.totalPushedQty || totalData.totalPushedQty==0) ? totalData.totalPushedQty : '--' }}</strong>;
|
|
已发货数量:<strong>{{ totalData&&(totalData.totalDispatchQty || totalData.totalDispatchQty==0) ? totalData.totalDispatchQty : '--' }}</strong>;
|
|
已发货数量:<strong>{{ totalData&&(totalData.totalDispatchQty || totalData.totalDispatchQty==0) ? totalData.totalDispatchQty : '--' }}</strong>;
|
|
@@ -358,9 +358,14 @@ export default {
|
|
this.spinning = true
|
|
this.spinning = true
|
|
delete parameter.tableId
|
|
delete parameter.tableId
|
|
delete parameter.index
|
|
delete parameter.index
|
|
|
|
+ if(parameter.sortOrder){
|
|
|
|
+ parameter["sortAlias"] = "sales_bill"
|
|
|
|
+ }else{
|
|
|
|
+ delete parameter.sortField
|
|
|
|
+ }
|
|
// 查询总计
|
|
// 查询总计
|
|
salesCount(Object.assign(parameter, this.queryParam)).then(res => {
|
|
salesCount(Object.assign(parameter, this.queryParam)).then(res => {
|
|
- this.totalData = Object.assign(this.totalData, res.data || {})
|
|
|
|
|
|
+ this.totalData = res.data || {}
|
|
})
|
|
})
|
|
return salesList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
return salesList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
let data
|
|
let data
|