This commit is contained in:
parent
3a54568969
commit
3fa4e6e86c
|
|
@ -215,7 +215,7 @@
|
|||
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
|
||||
|
||||
<vxe-column field="amount_formula" title="金额" width="220" :edit-render="{ name: 'EditExpressions' }"
|
||||
:params="{ moreExpressionsList: getMoreExpressionsList }">
|
||||
:params="{ moreExpressionsList: getMoreExpressionsList }">
|
||||
<template #default="{ row }">
|
||||
<a-tooltip>
|
||||
<template slot="title">
|
||||
|
|
@ -365,13 +365,12 @@
|
|||
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
||||
}" :mouse-config="{ selected: true }" @pulldownSelected="drawer_onPulldownSelected"
|
||||
@popupSelected="drawer_onPopupSelected" :export-config="{}" @edit-closed="drawer_afterEditEvent"
|
||||
@edit-actived="drawer_beforeEditEvent"
|
||||
:footer-cell-class-name="drawer_footerCellClassName"
|
||||
@edit-actived="drawer_beforeEditEvent" :footer-cell-class-name="drawer_footerCellClassName"
|
||||
: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 field="name" title="抽屉" width="260"></vxe-column>
|
||||
<vxe-column field="quantity" title="数量" width="200"
|
||||
:edit-render="{ name: '$input', props: { type: 'integer' } }"></vxe-column>
|
||||
:edit-render="{ name: '$input', props: { type: 'integer' } }"></vxe-column>
|
||||
<vxe-column field="expense" formatter="formatNumber" title="单价（免漆）" width="200"></vxe-column>
|
||||
<vxe-column field="paint_expense" formatter="formatNumber" title="单价（油漆）" width="200"></vxe-column>
|
||||
|
||||
|
|
@ -1089,6 +1088,22 @@ export default {
|
|||
|
||||
{ field: 'show_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"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
]
|
||||
},
|
||||
]
|
||||
|
|
@ -1448,7 +1463,7 @@ export default {
|
|||
|
||||
|
||||
},
|
||||
|
||||
|
||||
loadSchemeDataById(dataId, callback) { // 加载方案数据
|
||||
const json = `{"id":${dataId}}`; // 构造json
|
||||
this.$mk.post({ // 获取详情数据
|
||||
|
|
@ -2325,9 +2340,9 @@ export default {
|
|||
console.log(row, column);
|
||||
|
||||
|
||||
row.amount = parseFloat(row.quantity ||0) * parseFloat(row.expense ||0) ;
|
||||
row.paint_amount = parseFloat(row.quantity ||0) * parseFloat(row.paint_expense ||0) ;
|
||||
|
||||
row.amount = parseFloat(row.quantity || 0) * parseFloat(row.expense || 0);
|
||||
row.paint_amount = parseFloat(row.quantity || 0) * parseFloat(row.paint_expense || 0);
|
||||
|
||||
|
||||
this.calculateAll();
|
||||
},
|
||||
|
|
@ -2565,16 +2580,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.parts_total_amount || 0) +
|
||||
parseFloat(this.formOptions.data.packaging_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.parts_total_amount || 0) +
|
||||
parseFloat(this.formOptions.data.packaging_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);
|
||||
|
|
@ -2803,21 +2818,21 @@ export default {
|
|||
this.calculateTotal();
|
||||
},
|
||||
|
||||
calculateTotal(){
|
||||
calculateTotal() {
|
||||
|
||||
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.parts_total_amount || 0) +
|
||||
parseFloat(this.formOptions.data.packaging_total_amount || 0)+
|
||||
parseFloat(this.formOptions.data.parts_total_amount || 0) +
|
||||
parseFloat(this.formOptions.data.packaging_total_amount || 0) +
|
||||
parseFloat(this.formOptions.data.drawer_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.parts_total_amount || 0) +
|
||||
parseFloat(this.formOptions.data.packaging_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) +
|
||||
parseFloat(this.formOptions.data.drawer_total_amount || 0);
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue