diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue index 0682e5d27a..c0e027ec7a 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -844,10 +844,16 @@ export default { } return clf }, - // 计算附加费 == 外出费 + 厂家补助 + 施救费 + 附加项目列表中所有销售价之和 + // 计算附加费 fjfTotal() { let fjf = '0' - fjf = parseFloat(this.formobj.outAmount !== '' ? this.formobj.outAmount : '0') + parseFloat(this.formobj.subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') + parseFloat(this.formobj.rescueAmount !== '' ? this.formobj.rescueAmount : '0') + // 加税点项目包含附加项目时,附加费 = 外出费开票金额 + 厂家补助开票金额 + 施救费开票金额 + 附加项目列表中所有销售价之和 + if (this.formobj.outKPAmount !== '' || this.formobj.subsidyKPAmount !== '' || this.formobj.rescueKPAmount !== '') { + fjf = parseFloat(this.formobj.outKPAmount !== '' ? this.formobj.outKPAmount : '0') + parseFloat(this.formobj.subsidyKPAmount !== '' ? this.formobj.subsidyKPAmount : '0') + parseFloat(this.formobj.rescueKPAmount !== '' ? this.formobj.rescueKPAmount : '0') + } else { + // 附加费 = 外出费 + 厂家补助 + 施救费 + 附加项目列表中所有销售价之和 + fjf = parseFloat(this.formobj.outAmount !== '' ? this.formobj.outAmount : '0') + parseFloat(this.formobj.subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') + parseFloat(this.formobj.rescueAmount !== '' ? this.formobj.rescueAmount : '0') + } if (this.formobj.aitemVos.length > 0) { this.formobj.aitemVos.forEach((e) => { if (e.aitemName !== '') { @@ -857,7 +863,7 @@ export default { } return fjf }, - // 计算应收合计 = 工时费 + 材料费 + 附加费 + 税额 + // 计算应收合计 = 工时费 + 材料费 + 附加费 ysTotal() { let ys = '0' ys = Math.round((parseFloat(ys) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal)) * 100) / 100