From e1ddcc03148b1693433ea9971ea876703fc3e7ea Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Sun, 25 Jun 2023 12:40:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BathroomQuotation/BathroomQuotation/Edit.vue   |  9 ++++++++-
 .../BathroomQuotation/BathroomQuotation/drawer.vue | 14 +++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
index c4bc260..b9cdcc4 100644
--- a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
+++ b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
@@ -1548,7 +1548,7 @@ export default {
         this.resetMaterial();
 
         if (selectedData.spec) {
-          row.height_formula = selectedData.spec;
+          row.material_default_height = selectedData.spec;
         }
       }
 
@@ -1558,6 +1558,13 @@ export default {
       if (!row.paint_number && this.settignsValues.Default_rate_of_paint_surface) {
         row.paint_number = this.settignsValues.Default_rate_of_paint_surface;
       }
+      if (!row.board_length_formula) {
+        row.board_length_formula = this.settignsValues.Default_board_length_formula || '{板材的长}*{板材的宽}*{部件的数量}/{主材利用率}/1000000/2.96';
+      }
+
+      if (!row.paint_area_formula) {
+        row.paint_area_formula = this.settignsValues.Default_paint_area_formula || '{板材的长}*{板材的宽}*{部件的数量}*{油漆面}/1000000';
+      }
     },
     fittings_onPopupSelected({ rows, name, params }) {
       console.log(rows, name, params);
diff --git a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
index 4145acb..2ea1530 100644
--- a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
+++ b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
@@ -124,8 +124,6 @@
             </template>
 
           </vxe-column>
-          <vxe-column field="real_quantity" title="实木用量(立方)" width="80"
-            :edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
           <vxe-column field="paint_area_formula" title="油漆面积(㎡)" width="220" :edit-render="{ name: 'EditExpressions' }">
             <template #default="{ row }">
               <a-tooltip>
@@ -141,6 +139,8 @@
               </a-tooltip>
             </template>
           </vxe-column>
+          <vxe-column field="real_quantity" title="实木用量(立方)" width="80"
+            :edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
           <vxe-column field="remark" title="备注" width="120" :edit-render="{ name: 'textarea' }"></vxe-column>
 
         </vxe-table>
@@ -1076,7 +1076,7 @@ export default {
         this.resetMaterial();
 
         if(selectedData.spec){
-          row.height_formula = selectedData.spec;
+          row.material_default_height = selectedData.spec;
         }
       }
       if (!row.rate_materials && this.settignsValues.Main_material_utilization_rate) {
@@ -1085,6 +1085,14 @@ export default {
       if (!row.paint_number && this.settignsValues.Default_rate_of_paint_surface) {
         row.paint_number = this.settignsValues.Default_rate_of_paint_surface;
       }
+      
+      if (!row.board_length_formula) {
+        row.board_length_formula = this.settignsValues.Default_board_length_formula || '{板材的长}*{板材的宽}*{部件的数量}/{主材利用率}/1000000/2.96';
+      }
+
+      if (!row.paint_area_formula) {
+        row.paint_area_formula = this.settignsValues.Default_paint_area_formula || '{板材的长}*{板材的宽}*{部件的数量}*{油漆面}/1000000';
+      }
     },
     fittings_onPopupSelected({ rows, name, params }) {
       console.log(rows, name, params);