Commit 43cc1623 authored by dragondean@qq.com's avatar dragondean@qq.com

收款单bug

parent 0eea2596
...@@ -5,10 +5,10 @@ ENV = 'production' ...@@ -5,10 +5,10 @@ ENV = 'production'
VUE_APP_TITLE = 捷道管理系统 VUE_APP_TITLE = 捷道管理系统
# 捷道管理系统/生产环境 # 捷道管理系统/生产环境
VUE_APP_BASE_API = '' VUE_APP_BASE_API = 'http://api2.groupage.cn'
# 根据服务器或域名修改 # 根据服务器或域名修改
PUBLIC_PATH = 'http://jd.admtest.jdshangmen.com/' # PUBLIC_PATH = 'http://jd.admtest.jdshangmen.com/'
# 二级部署路径 # 二级部署路径
VUE_APP_APP_NAME ='' VUE_APP_APP_NAME =''
......
...@@ -246,7 +246,10 @@ ...@@ -246,7 +246,10 @@
<!-- <el-tag>{{ verificationData.usCount.toFixed(6) }}{{$t('美元')}}</el-tag> <!-- <el-tag>{{ verificationData.usCount.toFixed(6) }}{{$t('美元')}}</el-tag>
<el-tag>{{ verificationData.rmbCount.toFixed(6) }}{{$t('人民币')}}</el-tag> <el-tag>{{ verificationData.rmbCount.toFixed(6) }}{{$t('人民币')}}</el-tag>
<el-tag>{{ verificationData.nairaCount.toFixed(6) }}{{$t('奈拉')}}</el-tag> --> <el-tag>{{ verificationData.nairaCount.toFixed(6) }}{{$t('奈拉')}}</el-tag> -->
<div> <template v-if="!Object.keys(writeOffTotal).length">
0
</template>
<div v-else>
<div v-for="(amount, currency) in writeOffTotal" :key="currency"> <div v-for="(amount, currency) in writeOffTotal" :key="currency">
{{amount}}<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="currency" /> {{amount}}<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="currency" />
</div> </div>
...@@ -464,9 +467,11 @@ export default { ...@@ -464,9 +467,11 @@ export default {
writeOffTotal(){ writeOffTotal(){
let total = {} let total = {}
this.detailed.forEach(item => { this.detailed.forEach(item => {
if(!total[item.currencyId]){ if(item.status){
total[item.currencyId] = item.amount if(!total[item.currencyId]){
}else total[item.currencyId] = NP.plus(total[item.currencyId], item.amount) total[item.currencyId] = item.amount
}else total[item.currencyId] = NP.plus(total[item.currencyId], item.amount)
}
}) })
return total return total
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment