Mes
/
middle-admin-ant
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报价

This commit is contained in:
xielue 2023-07-31 21:40:26 +08:00
parent 2728d51fce
commit 0faba7c40f
3 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
View File

@ -503,7 +503,7 @@
</a-collapse-panel>
<a-collapse-panel key="3" header="费用结算" :disabled="false">
<a-collapse-panel key="3" header="其他费用" :disabled="false">
<div slot="extra">
（合计）金额：{{ parseFloat(formOptions.data.expense_total_amount || 0).toFixed(2) }}
@ -668,7 +668,7 @@
</a-collapse-panel>
<a-collapse-panel key="3" header="费用结算" :disabled="false">
<a-collapse-panel key="3" header="其他费用" :disabled="false">
<div slot="extra">
（合计）金额：{{ parseFloat(formOptions.data.paintExpense_total_amount || 0).toFixed(2) }}
</div>
@ -2556,12 +2556,16 @@ export default {
postdata.expense = parseFloat(this.formOptions.data.expense_total_amount || 0) +
parseFloat(this.formOptions.data.material_total_amount || 0) +
parseFloat(this.formOptions.data.labor_total_amount || 0);
parseFloat(this.formOptions.data.labor_total_amount || 0)+
parseFloat(this.formOptions.data.parts_total_amount || 0) +
parseFloat(this.formOptions.data.packaging_total_amount || 0);
postdata.paint_expense = parseFloat(this.formOptions.data.paintExpense_total_amount || 0) +
parseFloat(this.formOptions.data.paintMaterial_total_amount || 0) +
parseFloat(this.formOptions.data.paintLabor_total_amount || 0);
parseFloat(this.formOptions.data.paintLabor_total_amount || 0)+
parseFloat(this.formOptions.data.parts_total_amount || 0) +
parseFloat(this.formOptions.data.packaging_total_amount || 0);
this.formatDetailsData(postdata.fittingsList);
this.formatDetailsData(postdata.partsList);
@ -2789,12 +2793,16 @@ export default {
this.formOptions.data.expense = parseFloat(this.formOptions.data.expense_total_amount || 0) +
parseFloat(this.formOptions.data.material_total_amount || 0) +
parseFloat(this.formOptions.data.labor_total_amount || 0);
parseFloat(this.formOptions.data.labor_total_amount || 0) +
parseFloat(this.formOptions.data.parts_total_amount || 0) +
parseFloat(this.formOptions.data.packaging_total_amount || 0);
this.formOptions.data.paint_expense = parseFloat(this.formOptions.data.paintExpense_total_amount || 0) +
parseFloat(this.formOptions.data.paintMaterial_total_amount || 0) +
parseFloat(this.formOptions.data.paintLabor_total_amount || 0);
parseFloat(this.formOptions.data.paintLabor_total_amount || 0)+
parseFloat(this.formOptions.data.parts_total_amount || 0) +
parseFloat(this.formOptions.data.packaging_total_amount || 0);
this.formOptions.data.show_expense = parseFloat(this.formOptions.data.expense || 0).toFixed(2); // 计算所有 费用

20
src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
View File

@ -438,7 +438,7 @@
</a-collapse-panel>
<a-collapse-panel key="3" header="费用结算" :disabled="false">
<a-collapse-panel key="3" header="其他费用" :disabled="false">
<div slot="extra">
（合计）金额：{{ parseFloat(formOptions.data.expense_total_amount || 0).toFixed(2) }}
</div>
@ -601,7 +601,7 @@
</a-collapse-panel>
<a-collapse-panel key="3" header="费用结算" :disabled="false">
<a-collapse-panel key="3" header="其他费用" :disabled="false">
<div slot="extra">
（合计）金额：{{ parseFloat(formOptions.data.paintExpense_total_amount || 0).toFixed(2) }}
</div>
@ -2121,12 +2121,16 @@ export default {
this.formOptions.data.expense = parseFloat(this.formOptions.data.expense_total_amount || 0) +
parseFloat(this.formOptions.data.material_total_amount || 0) +
parseFloat(this.formOptions.data.labor_total_amount || 0);
parseFloat(this.formOptions.data.labor_total_amount || 0)+
parseFloat(this.formOptions.data.parts_total_amount || 0) +
parseFloat(this.formOptions.data.packaging_total_amount || 0);
this.formOptions.data.paint_expense = parseFloat(this.formOptions.data.paintExpense_total_amount || 0) +
parseFloat(this.formOptions.data.paintMaterial_total_amount || 0) +
parseFloat(this.formOptions.data.paintLabor_total_amount || 0);
parseFloat(this.formOptions.data.paintLabor_total_amount || 0)+
parseFloat(this.formOptions.data.parts_total_amount || 0) +
parseFloat(this.formOptions.data.packaging_total_amount || 0);
this.formOptions.data.show_expense = parseFloat(this.formOptions.data.expense || 0).toFixed(2);
@ -2162,12 +2166,16 @@ export default {
postdata.expense = parseFloat(this.formOptions.data.expense_total_amount || 0) +
parseFloat(this.formOptions.data.material_total_amount || 0) +
parseFloat(this.formOptions.data.labor_total_amount || 0);
parseFloat(this.formOptions.data.labor_total_amount || 0)+
parseFloat(this.formOptions.data.parts_total_amount || 0) +
parseFloat(this.formOptions.data.packaging_total_amount || 0);
postdata.paint_expense = parseFloat(this.formOptions.data.paintExpense_total_amount || 0) +
parseFloat(this.formOptions.data.paintMaterial_total_amount || 0) +
parseFloat(this.formOptions.data.paintLabor_total_amount || 0);
parseFloat(this.formOptions.data.paintLabor_total_amount || 0)+
parseFloat(this.formOptions.data.parts_total_amount || 0) +
parseFloat(this.formOptions.data.packaging_total_amount || 0);
postdata.amount = parseFloat(postdata.quantity || 0) * parseFloat(postdata.expense || 0);

2
src/pages/Middle/bathroom/basic/settings.js
View File

File diff suppressed because one or more lines are too long