From 1ff3d18ac307882e12c23e6bd72fb664a7cf63a3 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Wed, 2 Aug 2023 11:47:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E5=8D=95=E4=BB=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BathroomQuotation/BathroomQuotation/drawer.vue       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
index 9b7eee6..73c8611 100644
--- a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
+++ b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
@@ -369,6 +369,7 @@
               </template>
 
             </vxe-column>
+
             <vxe-column field="price" title="单价" width="120"
               :edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
             <vxe-column field="amount_formula" title="金额" width="200" :edit-render="{ name: 'EditExpressions' }">
@@ -533,7 +534,7 @@
               </template>
             </vxe-column>
             <vxe-column field="price" title="单价" width="120"
-              :edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
+              :edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column> 
             <vxe-column field="amount_formula" title="金额" width="200" :edit-render="{ name: 'EditExpressions' }">
               <template #default="{ row }">
                 <a-tooltip>
@@ -914,6 +915,8 @@ export default {
     this.expense_detailsData = data.expense_list || [];
     this.paintExpense_detailsData = data.paint_expenseList || [];
 
+      
+
     this.materialHeightInit()
     this.fittingsListInit();
     this.detailDataInit();
@@ -1842,7 +1845,7 @@ export default {
 
 
 
-    resetMaterial() {
+    resetMaterial() { 
       let material_items = [];
 
       this.fittings_detailsData.forEach(item => {
@@ -1924,7 +1927,7 @@ export default {
       let material_list = [];
       material_items.forEach(item => {
         let name = this.formatName(item[1]);
-        let old = this.material_detailsData.filter(a => a.material && a.material[0] == item[0] ? true : false);
+        let old = this.paintMaterial_detailsData.filter(a => a.material && a.material[0] == item[0] ? true : false);
         let info = {
           isMain: true,
           material: item,