Merge pull request '销账隐藏未收款' (#191) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/191
This commit is contained in:
commit
fbea7ade04
@ -102,11 +102,11 @@
|
||||
{{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.otherMoney || 0), 0) }}
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column :label="$t('未收金额')" align="center" prop="emisSettleSubBill.unrecedMoney" min-width="100" >
|
||||
<!-- <el-table-column :label="$t('未收金额')" align="center" prop="emisSettleSubBill.unrecedMoney" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
{{ unrecedMoney(scope.row) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<el-table-column :label="$t('申请说明')" align="center" prop="applyMemo" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="80">
|
||||
|
||||
@ -22,11 +22,11 @@
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('本次销账金额')" align="center" prop="applyMoney" min-width="140">
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('未收金额 ')" align="center" prop="" min-width="100" >
|
||||
<!-- <el-table-column :label="$t('未收金额 ')" align="center" prop="" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
{{scope.row.emisWaybill.freight - scope.row.emisSettleSubBill.recedMoney}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<el-table-column :label="$t('寄件日期')" align="center" prop="emisWaybill.sendDate" min-width="170"
|
||||
:show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('快件类型')" align="center" prop="expressType" min-width="200" />
|
||||
|
||||
@ -90,12 +90,11 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('本次销账金额')" align="center" prop="writeoffAmount" min-width="140" />
|
||||
<el-table-column :label="$t('未收金额')" align="center" prop="emisSettleSubBill.unrecedMoney" min-width="100" >
|
||||
<!-- <el-table-column :label="$t('未收金额')" align="center" prop="emisSettleSubBill.unrecedMoney" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<!-- 求和 -->
|
||||
{{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight -item.emisSettleSubBill.recedMoney || 0), 0) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<el-table-column :label="$t('申请说明')" align="center" prop="applyMemo" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="80">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user