费用合计

src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue

@@ -464,8 +464,7 @@
                 isEnter: false, isTab: true, isEdit: true, isChecked: true
               }" :mouse-config="{ selected: true }" @pulldownSelected="labor_onPulldownSelected"
                 @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 }">
                 <vxe-column width="60" v-if="!isReadonly">
                   <template #default="{ row }">
@@ -515,9 +514,7 @@
                   isEnter: false, isTab: true, isEdit: true, isChecked: true
                 }" :mouse-config="{ selected: true }" @pulldownSelected="expense_onPulldownSelected"
                 @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 }">
                 <vxe-column width="60" v-if="!isReadonly">
                   <template #default="{ row }">
@@ -570,8 +567,7 @@
                   isEnter: false, isTab: true, isEdit: true, isChecked: true
                 }" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected"
                 @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 }">
                 <vxe-column width="60" v-if="!isReadonly">
                   <template #default="{ row }">
@@ -634,8 +630,7 @@
                   isEnter: false, isTab: true, isEdit: true, isChecked: true
                 }" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected"
                 @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 }">
                 <vxe-column width="60" v-if="!isReadonly">
                   <template #default="{ row }">
@@ -2545,10 +2540,15 @@ export default {
         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.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.partsList);
         this.formatDetailsData(postdata.packagingList);
@@ -2770,8 +2770,18 @@ export default {
       this.calculateRows({ detailsData: this.paintExpense_detailsData, names: ["amount"], totalPrev: "paintExpense" });
 
       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_paint_expense = parseFloat(this.formOptions.data.paint_expense || 0).toFixed(2); // 计算所有 油漆费用

src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue

@@ -2077,8 +2077,16 @@ export default {
       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_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.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.paint_amount = parseFloat(postdata.quantity || 0) * parseFloat(postdata.paint_expense || 0);