From 3b0f662a896d90f87af0f6ffe26011f50c7c1916 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Thu, 27 Jul 2023 12:25:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E6=8A=BD=E5=B1=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BathroomQuotation/Edit.vue                 |  6 ++++--
 .../BathroomQuotation/drawer.vue               | 18 ++++--------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
index 94b92b9..37639f9 100644
--- a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
+++ b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
@@ -1500,8 +1500,10 @@ export default {
           packagingList, // 包装列表
           laborList, // 人工列表
           materialList,   // 材料列表
-          paintLaborList, // 油漆人工列表
-          paintMaterialList // 油漆材料列表
+          paint_laborList : paintLaborList, // 油漆人工列表
+          paint_materialList : paintMaterialList, // 油漆材料列表
+          expense_list:expense_list,
+          paint_expenseList:paint_expenseList
         });
 
 
diff --git a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
index fa26f38..9d72257 100644
--- a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
+++ b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
@@ -824,20 +824,10 @@ export default {
       moreExpressionsList_material_height: [],//材料的厚度 变量列表
       moreExpressionsList_fittings: [],
       expense_detailsData: [
-        {
-          item_name: "材料小计", amount_formula: "{免漆材料总费用}+{配件总费用}+{包装总费用}"
-        },
-        {
-          item_name: "人工费", amount_formula: "{免漆人工总费用}"
-        }
+        
       ],
       paintExpense_detailsData: [
-        {
-          item_name: "材料小计", amount_formula: "{油漆材料总费用}+{配件总费用}+{包装总费用}"
-        },
-        {
-          item_name: "人工费", amount_formula: "{油漆人工总费用}"
-        }
+       
       ],
 
       uploadDefaultImg: null,
@@ -928,8 +918,8 @@ export default {
     this.material_detailsData = data.materialList || [];
     this.paintLabor_detailsData = data.paint_laborList || [];
     this.paintMaterial_detailsData = data.paint_materialList || [];
-    //this.expense_detailsData = data.expense_list;
-    //this.paintExpense_detailsData = data.paint_expenseList; 
+    this.expense_detailsData = data.expense_list|| [];
+    this.paintExpense_detailsData = data.paint_expenseList|| [];
 
     this.materialHeightInit()
         this.fittingsListInit();