From 5153d8081e8711821ee762570dc7fc167b539bf1 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Thu, 20 Jul 2023 15:35:18 +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

---
 .../Mes/MesReporting/MesReporting/index.vue   |  4 +-
 .../BathroomScheme/BathroomScheme/Edit.vue    | 44 ++++++++++++++-----
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/pages/Middle/Mes/MesReporting/MesReporting/index.vue b/src/pages/Middle/Mes/MesReporting/MesReporting/index.vue
index 7077b4f..8830aca 100644
--- a/src/pages/Middle/Mes/MesReporting/MesReporting/index.vue
+++ b/src/pages/Middle/Mes/MesReporting/MesReporting/index.vue
@@ -575,7 +575,7 @@ export default {
       postdata.order_id = this.formOptions4.data.order_id;
       postdata.production_order_id = this.formOptions4.data.production_order_id;
       postdata.materials_id = this.formOptions4.data.materials_id;
-      postdata.batch_id = this.formOptions4.data.batch_id;
+      postdata.batch_id = this.formOptions4.data.id;
       postdata.batch_no = this.formOptions4.data.batch_no;
       postdata.production_plan_id = this.formOptions4.data.production_plan_id;
       postdata.production_dispatch_id = this.formOptions4.data.production_dispatch_id; 
@@ -587,7 +587,7 @@ export default {
       postdata.reporting_type = this.formOptions4.data.reporting_type;
       postdata.car_no = this.formOptions4.data.car_no;
       postdata.materials_code = this.formOptions4.data.materials_code;
-      
+       
 
       
       postdata.stage_id = this.formOptions3.data.sort_id;
diff --git a/src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue b/src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue
index 18ed0c9..7679832 100644
--- a/src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue
+++ b/src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue
@@ -48,13 +48,13 @@
             :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
 
           <vxe-column field="long_formula" title="长(公式)" width="220"
-          :params="{ moreExpressionsList: getMoreExpressionsList_material_height }"
+            :params="{ moreExpressionsList: getMoreExpressionsList }"
             :edit-render="{ name: 'EditExpressions' }"></vxe-column>
           <vxe-column field="width_formula" title="宽(公式)" width="220"
-          :params="{ moreExpressionsList: getMoreExpressionsList_material_height }"
+            :params="{ moreExpressionsList: getMoreExpressionsList }"
             :edit-render="{ name: 'EditExpressions' }"></vxe-column>
           <vxe-column field="height_formula" title="厚(公式)" width="220"
-          :params="{ moreExpressionsList: getMoreExpressionsList_material_height }"
+            :params="{ moreExpressionsList: getMoreExpressionsList }"
             :edit-render="{ name: 'EditExpressions' }"></vxe-column>
           <vxe-column field="quantity" title="数量" width="80"
             :edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
@@ -478,8 +478,8 @@ export default {
       paintLabor_detailsData: [],
 
       bathroomMaterial_list: [],//材料的数据
-      moreExpressionsList_material_height: [],//材料的厚度 变量列表
-
+      moreExpressionsList_material_height: [],//材料的厚度 变量列表 
+      moreExpressionsList_fittings: [],
       uploadDefaultImg: null,
       detailDataFieldName: "bathroom_scheme",
 
@@ -731,6 +731,7 @@ export default {
 
 
         this.materialHeightInit();
+        this.fittingsListInit();
         this.detailDataInit();
 
       }).catch((a) => {
@@ -756,6 +757,29 @@ export default {
   methods: {
 
 
+    fittingsListInit() { // 获取部件数据
+
+      this.$mk.post({ // 获取材料列表
+        url: `${BASE_URL.BASE_URL}//BathroomFittings/v1/bathroom/fittings/list`,
+        data: { "page": 1, "limit": 100, "order_bys": [], "search_rules": [] }
+      }).then(a => {
+
+        this.fittings_list = a.data.BathroomFittings || [];
+        this.moreExpressionsList_fittings = [];
+
+
+        this.fittings_list.forEach(o => {
+          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) + "的厚");
+          }
+
+
+        });
+
+      });
+    },
     materialHeightInit() {
 
       this.$mk.post({
@@ -789,8 +813,8 @@ export default {
       });
     },
 
-    getMoreExpressionsList_material_height() {
-      return this.moreExpressionsList_material_height;
+    getMoreExpressionsList() {
+      return [...this.moreExpressionsList_material_height, ...this.moreExpressionsList_fittings]
     },
 
     loadSettings() {
@@ -1005,15 +1029,15 @@ export default {
 
 
     // 包装下拉选择事件
-    packaging_onPulldownSelected({ row, name, column,params, selectedData }) {
+    packaging_onPulldownSelected({ row, name, column, params, selectedData }) {
       console.log(row, name, params);
 
       if (column.field == "packaging") {
 
         if (selectedData && selectedData.default_quantity) {
           row.quantity = selectedData.default_quantity; // 设置默认数量
-          
-          row.quantity_formula = selectedData.default_quantity;  
+
+          row.quantity_formula = selectedData.default_quantity;
         }
       }