This commit is contained in:
xielue 2023-08-31 21:29:20 +08:00
parent 3a54568969
commit 3fa4e6e86c
1 changed files with 35 additions and 20 deletions

View File

@ -365,8 +365,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="drawer_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="drawer_onPulldownSelected"
@popupSelected="drawer_onPopupSelected" :export-config="{}" @edit-closed="drawer_afterEditEvent" @popupSelected="drawer_onPopupSelected" :export-config="{}" @edit-closed="drawer_afterEditEvent"
@edit-actived="drawer_beforeEditEvent" @edit-actived="drawer_beforeEditEvent" :footer-cell-class-name="drawer_footerCellClassName"
:footer-cell-class-name="drawer_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: drawer_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: drawer_beforeEditMethod }">
<vxe-column type="seq" title="序号" width="48"></vxe-column> <vxe-column type="seq" title="序号" width="48"></vxe-column>
<vxe-column field="name" title="抽屉" width="260"></vxe-column> <vxe-column field="name" title="抽屉" width="260"></vxe-column>
@ -1089,6 +1088,22 @@ export default {
{ field: 'show_expense', title: '总费用(免漆)', span: 12, itemRender: { name: '$input' } }, { field: 'show_expense', title: '总费用(免漆)', span: 12, itemRender: { name: '$input' } },
{ field: 'show_paint_expense', title: '总费用(油漆)', span: 12, itemRender: { name: '$input' } }, { field: 'show_paint_expense', title: '总费用(油漆)', span: 12, itemRender: { name: '$input' } },
{
title: '创建人', span: 12,
field: 'user_detail',
itemRender: {
name: 'MkFormInputShow', props: {
params: {
dataType: "object",
valueField: "id",
textField: "name"
}
}
}
},
] ]
}, },
] ]
@ -2325,8 +2340,8 @@ export default {
console.log(row, column); console.log(row, column);
row.amount = parseFloat(row.quantity ||0) * parseFloat(row.expense ||0) ; row.amount = parseFloat(row.quantity || 0) * parseFloat(row.expense || 0);
row.paint_amount = parseFloat(row.quantity ||0) * parseFloat(row.paint_expense ||0) ; row.paint_amount = parseFloat(row.quantity || 0) * parseFloat(row.paint_expense || 0);
this.calculateAll(); this.calculateAll();
@ -2565,14 +2580,14 @@ export default {
postdata.expense = parseFloat(this.formOptions.data.expense_total_amount || 0) + postdata.expense = parseFloat(this.formOptions.data.expense_total_amount || 0) +
parseFloat(this.formOptions.data.material_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.parts_total_amount || 0) +
parseFloat(this.formOptions.data.packaging_total_amount || 0); parseFloat(this.formOptions.data.packaging_total_amount || 0);
postdata.paint_expense = parseFloat(this.formOptions.data.paintExpense_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.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.parts_total_amount || 0) +
parseFloat(this.formOptions.data.packaging_total_amount || 0); parseFloat(this.formOptions.data.packaging_total_amount || 0);
@ -2803,21 +2818,21 @@ export default {
this.calculateTotal(); this.calculateTotal();
}, },
calculateTotal(){ calculateTotal() {
this.formOptions.data.expense = parseFloat(this.formOptions.data.expense_total_amount || 0) + this.formOptions.data.expense = parseFloat(this.formOptions.data.expense_total_amount || 0) +
parseFloat(this.formOptions.data.material_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.parts_total_amount || 0) +
parseFloat(this.formOptions.data.packaging_total_amount || 0)+ parseFloat(this.formOptions.data.packaging_total_amount || 0) +
parseFloat(this.formOptions.data.drawer_total_amount || 0); parseFloat(this.formOptions.data.drawer_total_amount || 0);
this.formOptions.data.paint_expense = parseFloat(this.formOptions.data.paintExpense_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.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.parts_total_amount || 0) +
parseFloat(this.formOptions.data.packaging_total_amount || 0)+ parseFloat(this.formOptions.data.packaging_total_amount || 0) +
parseFloat(this.formOptions.data.drawer_total_amount || 0); parseFloat(this.formOptions.data.drawer_total_amount || 0);