|
@@ -111,8 +111,8 @@
|
|
|
:data="loadData"
|
|
|
:row-selection="{ columnWidth: 30 }"
|
|
|
@rowSelection="rowSelectionFun"
|
|
|
- :pagination="{pageSize:showTotal?10:30}"
|
|
|
:defaultLoadData="false"
|
|
|
+ :showPagination="false"
|
|
|
pageAlign="right"
|
|
|
bordered>
|
|
|
<!-- 产品编码 -->
|
|
@@ -180,7 +180,7 @@
|
|
|
</template>
|
|
|
<!-- 总计 -->
|
|
|
<template slot="page">
|
|
|
- <div v-if="showTotal" style="width: auto;display: inline-block;">
|
|
|
+ <div v-if="showTotal" style="width: auto;display: inline-block;padding:5px 0;">
|
|
|
总款数:<strong>{{ countData&&(countData.totalCategory || countData.totalCategory==0) ? countData.totalCategory : 0 }}</strong>;
|
|
|
总数量:<strong>{{ countData&&(countData.totalQty || countData.totalQty==0) ? countData.totalQty : 0 }}</strong>;
|
|
|
<span v-if="$hasPermissions('B_salesEdit_salesPrice')">总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount) : '0.00' }}</strong>;</span>
|
|
@@ -206,7 +206,7 @@ import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
|
import ProductBrand from '@/views/common/productBrand.js'
|
|
|
import productTypeAll from '@/views/common/productTypeAll.js'
|
|
|
import {
|
|
|
- salesDetailList,
|
|
|
+ salesDetailAllList,
|
|
|
salesDetailInsert,
|
|
|
salesDetailUpdateQty,
|
|
|
salesDetailDel,
|
|
@@ -265,18 +265,18 @@ export default {
|
|
|
this.disabled = true
|
|
|
this.queryParam.salesBillSn = this.salesBillSn || ''
|
|
|
this.getCount()
|
|
|
- return salesDetailList(Object.assign(parameter, this.queryParam, { showStock: true })).then(res => {
|
|
|
+ return salesDetailAllList(Object.assign(parameter, this.queryParam, { showStock: true })).then(res => {
|
|
|
let data
|
|
|
if (res.status == 200) {
|
|
|
data = res.data
|
|
|
- const no = (data.pageNo - 1) * data.pageSize
|
|
|
- for (var i = 0; i < data.list.length; i++) {
|
|
|
- data.list[i].no = no + i + 1
|
|
|
+ const no = 0
|
|
|
+ for (var i = 0; i < data.length; i++) {
|
|
|
+ data[i].no = no + i + 1
|
|
|
// 存储变更前的数量和仓库
|
|
|
- data.list[i].qtyBackups = data.list[i].qty
|
|
|
- data.list[i].warehouseBackups = data.list[i].warehouseSn
|
|
|
+ data[i].qtyBackups = data[i].qty
|
|
|
+ data[i].warehouseBackups = data[i].warehouseSn
|
|
|
}
|
|
|
- this.dataSource = data.list
|
|
|
+ this.dataSource = data
|
|
|
}
|
|
|
this.disabled = false
|
|
|
this.loading = false
|