Commit 6cbbfe7d authored by 我在何方's avatar 我在何方

收款单优化

parent 92d62e15
...@@ -25,7 +25,11 @@ ...@@ -25,7 +25,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="num" /> <el-table-column :label="$t('箱数')" align="center" prop="num" />
<el-table-column :label="$t('体积/重量')" align="center" prop="weight" /> <el-table-column :label="$t('体积/重量')" align="center" prop="weight">
<template slot-scope="scope">
{{ scope.row.volume + "/" + scope.row.weight }}
</template>
</el-table-column>
<el-table-column :label="$t('收入类型')" align="center" prop="feeType"> <el-table-column :label="$t('收入类型')" align="center" prop="feeType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
...@@ -120,7 +124,8 @@ ...@@ -120,7 +124,8 @@
<!-- <el-table-column label="应收金额" align="center" prop="receivableAmount" /> --> <!-- <el-table-column label="应收金额" align="center" prop="receivableAmount" /> -->
<el-table-column :label="$t('应收金额')" align="center" prop="receivableAmount"> <el-table-column :label="$t('应收金额')" align="center" prop="receivableAmount">
<template slot-scope="scope" v-if="scope.row.type !== 'total'"> <template slot-scope="scope" v-if="scope.row.type !== 'total'">
{{ `${scope.row.receivableAmount - scope.row.discountTotal}(${scope.row.receivableAmount} - ${scope.row.discountTotal})` }} <span v-if="scope.row.discountTotal>0">{{ `${scope.row.receivableAmount - scope.row.discountTotal }(${scope.row.receivableAmount} - ${scope.row.discountTotal})` }}</span>
<span v-else>{{ `${scope.row.receivableAmount - scope.row.discountTotal }` }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="220"> <el-table-column align="center" width="220">
......
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
<!-- <el-table-column label="汇率" align="center" prop="totalAmount" /> --> <!-- <el-table-column label="汇率" align="center" prop="totalAmount" /> -->
<el-table-column :label="$t('实收日期')" align="center" prop="payedAt"> <el-table-column :label="$t('实收日期')" align="center" prop="payedAt">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.payedAt, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.writeOffAt, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('业务员')" align="center" prop="salesmanName" /> <el-table-column :label="$t('业务员')" align="center" prop="salesmanName" />
......
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