|
@@ -93,7 +93,7 @@
|
|
|
<span>
|
|
|
货物信息
|
|
|
<span class="statistics">总金额合计: <span>{{ formatMoney(openAmountTotal) }}</span></span>
|
|
|
- <span class="statistics">本次开票数量合计: <span>{{ fourMoney(openQuantityTotal) }}</span></span>
|
|
|
+ <span class="statistics">本次开票数量合计: <span>{{ formatMoney(openQuantityTotal) }}</span></span>
|
|
|
</span>
|
|
|
<template v-if="!disabled" slot="right">
|
|
|
<div style="float:right" class="iconfont icon-Union-11 iconCharacters" @click="select('selectGoods')">选择已结算货物</div>
|
|
@@ -136,14 +136,14 @@
|
|
|
<el-table-column prop="goodsQuantity" label="数量">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tooltip class="item" effect="dark" :content="String(scope.row.goodsQuantity)" placement="top">
|
|
|
- <span class="one-ellipsis">{{ fourMoney(scope.row.goodsQuantity) }}</span>
|
|
|
+ <span class="one-ellipsis">{{ scope.row.goodsQuantity }}</span>
|
|
|
</el-tooltip>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="salesPrice" label="销售单价">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tooltip class="item" effect="dark" :content="String(scope.row.salesPrice)" placement="top">
|
|
|
- <span class="one-ellipsis">{{ formatMoney(scope.row.salesPrice) }}</span>
|
|
|
+ <span class="one-ellipsis">{{ formatMoney(scope.row.salesPrice, 4) }}</span>
|
|
|
</el-tooltip>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -434,8 +434,8 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
formatMoney() {
|
|
|
- return (val) => {
|
|
|
- return formatMoney(val)
|
|
|
+ return (val, reserveNum) => {
|
|
|
+ return formatMoney(val, reserveNum)
|
|
|
}
|
|
|
},
|
|
|
calcMoney() {
|
|
@@ -598,12 +598,12 @@ export default {
|
|
|
let sum = 0; let amount = 0
|
|
|
this.goodsInfoList.forEach((item, index) => {
|
|
|
sum += Number(item.openQuantity)
|
|
|
- item.openAmount = item.openQuantity * item.salesPrice
|
|
|
+ item.openAmount = Number(item.openQuantity) * Number(item.salesPrice)
|
|
|
amount += Number(item.openAmount)
|
|
|
})
|
|
|
- this.openQuantityTotal = sum
|
|
|
- this.openAmountTotal = amount
|
|
|
- this.ruleForm.openAmount = formatMoney(amount)
|
|
|
+ this.openQuantityTotal = (sum * 10000 / 10000).toFixed(2)
|
|
|
+ this.openAmountTotal = (amount * 10000 / 10000).toFixed(2)
|
|
|
+ this.ruleForm.openAmount = (amount * 10000 / 10000).toFixed(2)
|
|
|
},
|
|
|
// #region comment by lx 贸理通4.0版本优化发票管理
|
|
|
// addInfo() {
|