From 9bf3e98f0277336bfd3ea0400a2dfb57e6786437 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 26 Nov 2025 17:13:18 +0800
Subject: [PATCH] =?UTF-8?q?BOM=E5=A4=8D=E5=88=B6=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A1=A8tree=E7=BB=93=E6=9E=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/part/bom_create.vue | 62 +++++++++++++++++++++------
 1 file changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/part/bom_create.vue b/src/views/modules/part/bom_create.vue
index e093898..3e69ea7 100644
--- a/src/views/modules/part/bom_create.vue
+++ b/src/views/modules/part/bom_create.vue
@@ -549,11 +549,12 @@
       <div class="rq ">
         <el-table
           :data="subDetailList"
-          height="256px"
+          height="286px"
           border
           style="width:100%">
+          <!-- 第一部分：到物料单位为止 -->
           <el-table-column
-            v-for="(item,index) in filteredBatchUpdateComponentsColumn" :key="index"
+            v-for="(item,index) in filteredBatchUpdateComponentsColumnPart1" :key="'part1-'+index"
             :sortable="item.columnSortable"
             :prop="item.columnProp"
             :header-align="item.headerAlign"
@@ -567,7 +568,40 @@
                   <span v-if="item.columnProp==='familyName'">
                     <el-input v-model="scope.row.familyName" readonly @click.native="handleFamilySelect(scope.row, scope.$index)" style="width: 100%"></el-input>
                   </span>
-                  <span v-else-if="item.columnProp==='productionData'">
+                  <span v-else>
+                    {{scope.row[item.columnProp]}}
+                  </span>
+                </span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+
+          <!-- 单位用量、调机量、损耗率 -->
+          <el-table-column
+            prop=""
+            header-align="center"
+            align="right"
+            min-width="80"
+            label="单位用量">
+            <template slot-scope="scope">
+              <el-input-number :controls="false" :step="0" :ref="`qtyPerAssembly${scope.$index}`" v-model="scope.row.qtyPerAssembly" @keyup.enter.native="focusNextInput(scope.$index, 'qtyPerAssembly')" style="height: 11px; width: 98%"></el-input-number>
+            </template>
+          </el-table-column>
+
+          <!-- 第二部分：从实际生产数量开始 -->
+          <el-table-column
+            v-for="(item,index) in filteredBatchUpdateComponentsColumnPart2" :key="'part2-'+index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed == ''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+                <span v-if="!item.columnHidden">
+                  <span v-if="item.columnProp==='productionData'">
                     <el-input-number :controls="false" :step="0" min="0"
                                      :disabled="!productionDataFamily.includes(scope.row.familyID)"
                                      v-model="scope.row.productionData"
@@ -636,16 +670,6 @@
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop=""
-            header-align="center"
-            align="right"
-            min-width="80"
-            label="单位用量">
-            <template slot-scope="scope">
-              <el-input-number :controls="false" :step="0" :ref="`qtyPerAssembly${scope.$index}`" v-model="scope.row.qtyPerAssembly" @keyup.enter.native="focusNextInput(scope.$index, 'qtyPerAssembly')" style="height: 11px; width: 98%"></el-input-number>
-            </template>
-          </el-table-column>
           <el-table-column
             prop=""
             header-align="center"
@@ -955,6 +979,18 @@ export default {
         if (item.columnProp === 'unitConversion') return this.unitConversionFlag;
         return true;
       });
+    },
+    // 批量编辑表格列 - 第一部分（到物料单位为止）
+    filteredBatchUpdateComponentsColumnPart1() {
+      const filtered = this.filteredBatchUpdateComponentsColumn;
+      const splitIndex = filtered.findIndex(item => item.columnProp === 'printUnitName');
+      return splitIndex >= 0 ? filtered.slice(0, splitIndex + 1) : filtered;
+    },
+    // 批量编辑表格列 - 第二部分（从实际生产数量开始）
+    filteredBatchUpdateComponentsColumnPart2() {
+      const filtered = this.filteredBatchUpdateComponentsColumn;
+      const splitIndex = filtered.findIndex(item => item.columnProp === 'printUnitName');
+      return splitIndex >= 0 ? filtered.slice(splitIndex + 1) : [];
     }
   },
   data() {