This commit is contained in:
liushuai
2019-12-04 17:21:01 +08:00
parent ad1a5d749f
commit d3bd8686e3
6 changed files with 175 additions and 139 deletions

View File

@@ -21,11 +21,6 @@
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="请款时间" prop="请款时间" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.请款时间 ? scope.row.请款时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="请款人" prop="姓名" align="center" min-width="70" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.姓名 }}
@@ -36,38 +31,43 @@
{{ scope.row.请款金额 }}
</template>
</el-table-column>
<el-table-column label="审核内容" width="80" align="center">
<el-table-column label="请款时间" prop="请款时间" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.请款时间 ? scope.row.请款时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="审核结果" width="80" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未过审核原因" width="100" align="center">
<el-table-column label="审核未过原因" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }}
</template>
</el-table-column>
<el-table-column label="审批内容" width="70" align="center">
<el-table-column label="审批结果" width="70" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审批原因" width="110" align="center">
<el-table-column label="审批未过原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="80" align="center">
<el-table-column label="付款结果" width="80" align="center">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已付款</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
</template>
</el-table-column>
<el-table-column label="未付原因" width="100" align="center">
<el-table-column label="未付原因" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</template>
@@ -100,6 +100,11 @@
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column width="120" align="center" label="合同总额" prop="合同总额">
<template slot-scope="scope">
{{ parseFloat(scope.row.合同总额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="120" align="center" label="已付金额" prop="已付金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.已付金额).toFixed(2) }}
@@ -139,16 +144,16 @@
{{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
</template>
</el-table-column>
<el-table-column label="合计" align="center" min-width="100" prop="合计">
<template slot-scope="scope">
{{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="单价" align="center" min-width="100" prop="单价">
<template slot-scope="scope">
{{ parseFloat(scope.row.单价||0).toFixed(2) }}
</template>
</el-table-column>
<!--<el-table-column label="合计" align="center" min-width="100" prop="合计">-->
<!--<template slot-scope="scope">-->
<!--{{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="单价" align="center" min-width="100" prop="单价">-->
<!--<template slot-scope="scope">-->
<!--{{ parseFloat(scope.row.单价||0).toFixed(2) }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
<template slot-scope="scope">
{{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
@@ -370,7 +375,7 @@ export default {
if (index === 0) {
sums[index] = '总价'
return
} else if (index === 2 || index === 3) {
} else if (index === 2 || index === 3 || index === 1) {
const values = data.map(item => Number(item[column.property]))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {