|
|
@@ -99,7 +99,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
|
|
|
- <el-table-column class="table_td" v-if='warehouseNameKey=="鲅鱼圈金信库"' width='140' prop="actualWeighingFee"
|
|
|
+ <el-table-column class="table_td" v-if='warehouseName=="鲅鱼圈金信库"' width='140' prop="actualWeighingFee"
|
|
|
label="卸车过磅费（元）"></el-table-column>
|
|
|
<el-table-column class="table_td" prop="goodsName" width="70" label="货名"></el-table-column>
|
|
|
<el-table-column class="table_td" prop="type" width="60" label="类型"></el-table-column>
|
|
|
@@ -647,20 +647,24 @@
|
|
|
},
|
|
|
//合计
|
|
|
getSummaries(param) {
|
|
|
- debugger
|
|
|
console.log(param)
|
|
|
const {
|
|
|
columns,
|
|
|
data
|
|
|
} = param
|
|
|
const sums = []
|
|
|
+ var _number = []
|
|
|
+ if (this.warehouseName == "鲅鱼圈金信库") {
|
|
|
+ _number = [11, 12, 16, 17, 18]
|
|
|
+ } else {
|
|
|
+ _number = [10, 11, 15, 16, 17]
|
|
|
+ }
|
|
|
if (this.modification.length > 0) {
|
|
|
columns.forEach((column, index) => {
|
|
|
console.log(column, index)
|
|
|
if (index === 0) {
|
|
|
sums[index] = '合计'
|
|
|
} else if (index === 10 || index === 11 || index === 15 || index === 16) {
|
|
|
- debugger
|
|
|
const values = this.modification.map((item) => Number(item[column.property]))
|
|
|
if (!values.every((value) => isNaN(value))) {
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
|
@@ -673,7 +677,7 @@
|
|
|
}, 0)
|
|
|
sums[index] = sums[index].toFixed(3)
|
|
|
} else {
|
|
|
- sums[index] = '元'
|
|
|
+ // sums[index] = '元'
|
|
|
}
|
|
|
} else {
|
|
|
sums[index] = '--'
|
|
|
@@ -683,7 +687,8 @@
|
|
|
columns.forEach((column, index) => {
|
|
|
if (index === 0) {
|
|
|
sums[index] = '合计'
|
|
|
- } else if (index === 10 || index === 11 || index === 15 ||index === 16 || index === 17) {
|
|
|
+ } else if (index === _number[0] || index === _number[1] || index === _number[2] || index === _number[
|
|
|
+ 3] || index === _number[4]) {
|
|
|
const values = data.map((item) => Number(item[column.property]))
|
|
|
if (!values.every((value) => isNaN(value))) {
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
|
@@ -696,7 +701,7 @@
|
|
|
}, 0)
|
|
|
sums[index] = sums[index].toFixed(3)
|
|
|
} else {
|
|
|
- sums[index] = '元'
|
|
|
+ // sums[index] = '元'
|
|
|
}
|
|
|
} else {
|
|
|
sums[index] = '--'
|
|
|
@@ -1368,6 +1373,8 @@
|
|
|
for (let i = 0; i < this.warehouseList.length; i++) {
|
|
|
if (this.warehouseList[i].id == this.warehouseNameKey) {
|
|
|
this.warehouseName = this.warehouseList[i].warehouseName
|
|
|
+
|
|
|
+
|
|
|
localStorage.setItem('houseSelfCollect_house1',
|
|
|
JSON.stringify({
|
|
|
value: this.warehouseList[i].warehouseName,
|
