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 10:51:47 +08:00
parent fca8ac3bc4
commit 0c11909b8a
2 changed files with 72 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -464,8 +464,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="labor_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="labor_onPulldownSelected"
@popupSelected="labor_onPopupSelected" :export-config="{}" @edit-closed="labor_afterEditEvent" @popupSelected="labor_onPopupSelected" :export-config="{}" @edit-closed="labor_afterEditEvent"
@edit-actived="labor_beforeEditEvent" @edit-actived="labor_beforeEditEvent" :footer-cell-class-name="labor_footerCellClassName"
:footer-cell-class-name="labor_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: labor_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: labor_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
<template #default="{ row }"> <template #default="{ row }">
@ -515,9 +514,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="expense_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="expense_onPulldownSelected"
@popupSelected="expense_onPopupSelected" :export-config="{}" @edit-closed="expense_afterEditEvent" @popupSelected="expense_onPopupSelected" :export-config="{}" @edit-closed="expense_afterEditEvent"
@edit-actived="expense_beforeEditEvent" @edit-actived="expense_beforeEditEvent" :footer-cell-class-name="expense_footerCellClassName"
:footer-cell-class-name="expense_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: expense_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: expense_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
<template #default="{ row }"> <template #default="{ row }">
@ -570,8 +567,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected"
@popupSelected="paintMaterial_onPopupSelected" :export-config="{}" @popupSelected="paintMaterial_onPopupSelected" :export-config="{}"
@edit-closed="paintMaterial_afterEditEvent" @edit-closed="paintMaterial_afterEditEvent" :footer-cell-class-name="paintMaterial_footerCellClassName"
:footer-cell-class-name="paintMaterial_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintMaterial_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintMaterial_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
<template #default="{ row }"> <template #default="{ row }">
@ -634,8 +630,7 @@
isEnter: false, isTab: true, isEdit: true, isChecked: true isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected" }" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected"
@popupSelected="paintLabor_onPopupSelected" :export-config="{}" @edit-closed="paintLabor_afterEditEvent" @popupSelected="paintLabor_onPopupSelected" :export-config="{}" @edit-closed="paintLabor_afterEditEvent"
@edit-actived="paintLabor_beforeEditEvent" @edit-actived="paintLabor_beforeEditEvent" :footer-cell-class-name="paintLabor_footerCellClassName"
:footer-cell-class-name="paintLabor_footerCellClassName"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintLabor_beforeEditMethod }"> :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintLabor_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly"> <vxe-column width="60" v-if="!isReadonly">
<template #default="{ row }"> <template #default="{ row }">
@ -1238,7 +1233,7 @@ export default {
this.fittings_list.forEach(o => { this.fittings_list.forEach(o => {
if(o.IsShowExpression){ if (o.IsShowExpression) {
this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的长"); this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的长");
this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的宽"); this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的宽");
this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的厚"); this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的厚");
@ -1501,10 +1496,10 @@ export default {
packagingList, // 包装列表 packagingList, // 包装列表
laborList, // 人工列表 laborList, // 人工列表
materialList, // 材料列表 materialList, // 材料列表
paint_laborList : paintLaborList, // 油漆人工列表 paint_laborList: paintLaborList, // 油漆人工列表
paint_materialList : paintMaterialList, // 油漆材料列表 paint_materialList: paintMaterialList, // 油漆材料列表
expense_list:expense_list, expense_list: expense_list,
paint_expenseList:paint_expenseList paint_expenseList: paint_expenseList
}); });
@ -2545,10 +2540,15 @@ export default {
postdata.expense_list = postdata.expense_list.filter(item => item.item_name ? true : false); postdata.expense_list = postdata.expense_list.filter(item => item.item_name ? true : false);
postdata.paint_expenseList = postdata.paint_expenseList.filter(item => item.item_name ? true : false); postdata.paint_expenseList = postdata.paint_expenseList.filter(item => item.item_name ? true : false);
postdata.expense = this.formOptions.data.expense_total_amount; postdata.expense = parseFloat(this.formOptions.data.expense_total_amount || 0) +
postdata.paint_expense = this.formOptions.data.paintExpense_total_amount; parseFloat(this.formOptions.data.material_total_amount || 0) +
parseFloat(this.formOptions.data.labor_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);
this.formatDetailsData(postdata.fittingsList); this.formatDetailsData(postdata.fittingsList);
this.formatDetailsData(postdata.partsList); this.formatDetailsData(postdata.partsList);
this.formatDetailsData(postdata.packagingList); this.formatDetailsData(postdata.packagingList);
@ -2720,9 +2720,9 @@ export default {
return this.getExpressionItemValue({ row, name, defaultValue }) return this.getExpressionItemValue({ row, name, defaultValue })
}); });
value = value.replace("/，/g",","); value = value.replace("/，/g", ",");
value = value.replace("/？/g","?"); value = value.replace("/？/g", "?");
value = value.replace("/：/g",":"); value = value.replace("/：/g", ":");
eval("value = " + value) eval("value = " + value)
return value; return value;
@ -2770,8 +2770,18 @@ export default {
this.calculateRows({ detailsData: this.paintExpense_detailsData, names: ["amount"], totalPrev: "paintExpense" }); this.calculateRows({ detailsData: this.paintExpense_detailsData, names: ["amount"], totalPrev: "paintExpense" });
console.log("this.formOptions.data.expense_total_amount:" + this.formOptions.data.expense_total_amount) console.log("this.formOptions.data.expense_total_amount:" + this.formOptions.data.expense_total_amount)
this.formOptions.data.expense = this.formOptions.data.expense_total_amount; // 计算所有 费用
this.formOptions.data.paint_expense = this.formOptions.data.paintExpense_total_amount; // 计算所有 油漆费用
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);
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);
this.formOptions.data.show_expense = parseFloat(this.formOptions.data.expense || 0).toFixed(2); // 计算所有 费用 this.formOptions.data.show_expense = parseFloat(this.formOptions.data.expense || 0).toFixed(2); // 计算所有 费用
this.formOptions.data.show_paint_expense = parseFloat(this.formOptions.data.paint_expense || 0).toFixed(2); // 计算所有 油漆费用 this.formOptions.data.show_paint_expense = parseFloat(this.formOptions.data.paint_expense || 0).toFixed(2); // 计算所有 油漆费用

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

@ -2077,8 +2077,16 @@ export default {
this.calculateRows({ detailsData: this.paintExpense_detailsData, names: ["amount"], totalPrev: "paintExpense" }); this.calculateRows({ detailsData: this.paintExpense_detailsData, names: ["amount"], totalPrev: "paintExpense" });
this.formOptions.data.expense = this.formOptions.data.expense_total_amount;
this.formOptions.data.paint_expense = this.formOptions.data.paintExpense_total_amount; 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);
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);
this.formOptions.data.show_expense = parseFloat(this.formOptions.data.expense || 0).toFixed(2); this.formOptions.data.show_expense = parseFloat(this.formOptions.data.expense || 0).toFixed(2);
this.formOptions.data.show_paint_expense = parseFloat(this.formOptions.data.paint_expense || 0).toFixed(2); this.formOptions.data.show_paint_expense = parseFloat(this.formOptions.data.paint_expense || 0).toFixed(2);
@ -2111,8 +2119,15 @@ export default {
postdata.expense_list = postdata.expense_list.filter(item => item.item_name ? true : false); postdata.expense_list = postdata.expense_list.filter(item => item.item_name ? true : false);
postdata.paint_expenseList = postdata.paint_expenseList.filter(item => item.item_name ? true : false); postdata.paint_expenseList = postdata.paint_expenseList.filter(item => item.item_name ? true : false);
postdata.expense = this.formOptions.data.expense_total_amount; postdata.expense = parseFloat(this.formOptions.data.expense_total_amount || 0) +
postdata.paint_expense = this.formOptions.data.paintExpense_total_amount; parseFloat(this.formOptions.data.material_total_amount || 0) +
parseFloat(this.formOptions.data.labor_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);
postdata.amount = parseFloat(postdata.quantity || 0) * parseFloat(postdata.expense || 0); postdata.amount = parseFloat(postdata.quantity || 0) * parseFloat(postdata.expense || 0);
postdata.paint_amount = parseFloat(postdata.quantity || 0) * parseFloat(postdata.paint_expense || 0); postdata.paint_amount = parseFloat(postdata.quantity || 0) * parseFloat(postdata.paint_expense || 0);