金额格式化
parent
7409ea825b
commit
e02d48192f
|
@ -133,7 +133,7 @@
|
||||||
</el-button>
|
</el-button>
|
||||||
<#if isAdmin>
|
<#if isAdmin>
|
||||||
<#--判断是不是管理员本人的-->
|
<#--判断是不是管理员本人的-->
|
||||||
<el-button v-if="scope.row.applyPersonId==='${adminId}'" type="text" @click="editProcess(scope.row, scope)">编辑
|
<el-button v-if="scope.row.applyPersonId===${adminId}" type="text" @click="editProcess(scope.row, scope)">编辑
|
||||||
</el-button>
|
</el-button>
|
||||||
<#else>
|
<#else>
|
||||||
<el-button v-if="scope.row.status==='draft' || scope.row.status==='audit_not_passed'"
|
<el-button v-if="scope.row.status==='draft' || scope.row.status==='audit_not_passed'"
|
||||||
|
@ -144,7 +144,7 @@
|
||||||
|
|
||||||
<#if isAdmin>
|
<#if isAdmin>
|
||||||
<#--判断是不是管理员本人的-->
|
<#--判断是不是管理员本人的-->
|
||||||
<el-button v-if="scope.row.applyPersonId==='${adminId}'" type="text"
|
<el-button v-if="scope.row.applyPersonId===${adminId}" type="text"
|
||||||
@click="deleteProcess(scope.row, scope)">删除
|
@click="deleteProcess(scope.row, scope)">删除
|
||||||
</el-button>
|
</el-button>
|
||||||
<#else>
|
<#else>
|
||||||
|
|
|
@ -456,13 +456,17 @@
|
||||||
this.cooperationType = cooperationType
|
this.cooperationType = cooperationType
|
||||||
this.budgetGrossMargin = budgetGrossMargin
|
this.budgetGrossMargin = budgetGrossMargin
|
||||||
this.supplierMaterials = supplierMaterials && supplierMaterials.map(item => ({
|
this.supplierMaterials = supplierMaterials && supplierMaterials.map(item => ({
|
||||||
...item, attachment: mapAttachment(item.attachment)
|
...item, attachment: mapAttachment(item.attachment),
|
||||||
|
totalAmount: numberFixed(item.totalAmount),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
const convertCommon = detail => {
|
const convertCommon = detail => {
|
||||||
return {
|
return {
|
||||||
rowKey: rowKey++, feeType: computeFeeType(detail.type),
|
rowKey: rowKey++, feeType: computeFeeType(detail.type),
|
||||||
totalTaxInclude_: detail.totalTaxInclude, // 存在相同字段转换一下
|
price: numberFixed(detail.price),
|
||||||
|
payAmount: numberFixed(detail.payAmount),
|
||||||
|
totalTaxExclude: numberFixed(detail.totalTaxExclude),
|
||||||
|
totalTaxInclude_: numberFixed(detail.totalTaxInclude),// 存在相同字段转换一下
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let rowKey = 0
|
let rowKey = 0
|
||||||
|
@ -497,7 +501,12 @@
|
||||||
|
|
||||||
this.procurementDetails = computeProcurementDetails(procurementDetails)
|
this.procurementDetails = computeProcurementDetails(procurementDetails)
|
||||||
this.incomeDetails = incomeDetails.map(detail => ({
|
this.incomeDetails = incomeDetails.map(detail => ({
|
||||||
...detail, type: computeType(detail.type)
|
...detail, type: computeType(detail.type),
|
||||||
|
price: numberFixed(detail.price),
|
||||||
|
totalTax: numberFixed(detail.totalTax),
|
||||||
|
payAmount: numberFixed(detail.payAmount),
|
||||||
|
totalTaxExclude: numberFixed(detail.totalTaxExclude),
|
||||||
|
totalTaxInclude: numberFixed(detail.totalTaxInclude),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
this.attachments = attachments.map(item => ({
|
this.attachments = attachments.map(item => ({
|
||||||
|
|
|
@ -803,7 +803,10 @@
|
||||||
const convertCommon = detail => {
|
const convertCommon = detail => {
|
||||||
return {
|
return {
|
||||||
rowKey: rowKey++, feeType: computeFeeType(detail.type),
|
rowKey: rowKey++, feeType: computeFeeType(detail.type),
|
||||||
totalTaxInclude_: detail.totalTaxInclude, // 存在相同字段转换一下
|
price: numberFixed(detail.price),
|
||||||
|
payAmount: numberFixed(detail.payAmount),
|
||||||
|
totalTaxExclude: numberFixed(detail.totalTaxExclude),
|
||||||
|
totalTaxInclude_: numberFixed(detail.totalTaxInclude), // 存在相同字段转换一下
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue