From 5a9b9a1e535f2d88f70c3d05df12daf023fb2f3f Mon Sep 17 00:00:00 2001
From: 17630416519 <qazwsx123>
Date: Fri, 16 Jan 2026 15:04:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99BOM=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/baseManagement/basematerialBOM.js     |  14 +-
 .../Material/MaterialBom.vue                  | 177 +++++++++++++-----
 2 files changed, 136 insertions(+), 55 deletions(-)

diff --git a/src/api/baseManagement/basematerialBOM.js b/src/api/baseManagement/basematerialBOM.js
index 9534a68..fdb8e9e 100644
--- a/src/api/baseManagement/basematerialBOM.js
+++ b/src/api/baseManagement/basematerialBOM.js
@@ -69,13 +69,11 @@ export function getBaseMaterialBom(id) {
 	})
 }
 
-/**
- * 删除
- * @param {主键} pid
- */
-export function delBaseMaterialBom(pid) {
+ //删除
+export function delBaseMaterialBom(ids) {
+	const idsStr = Array.isArray(ids) ? ids.join(',') : String(ids)
 	return request({
-		url: 'MasterDataManagement/Material/MaterialBom/' + pid,
-		method: 'delete'
+	  url: `MasterDataManagement/Material/MaterialBom/${idsStr}`, 
+	  method: 'delete',
 	})
-}
\ No newline at end of file
+  }
\ No newline at end of file
diff --git a/src/views/masterDataManagement/Material/MaterialBom.vue b/src/views/masterDataManagement/Material/MaterialBom.vue
index b50a2f7..de5b193 100644
--- a/src/views/masterDataManagement/Material/MaterialBom.vue
+++ b/src/views/masterDataManagement/Material/MaterialBom.vue
@@ -21,33 +21,34 @@
           </el-button>
           <el-button class="tool-box" color="#00aa00" icon="Upload" @click="handleDownload"> 导出 </el-button>
           <el-button type="danger" icon="delete" @click="handleBatchDelete"
-            :disabled="ids.length === 0">批量删除</el-button>
+            :disabled="mainIds.length === 0 && !hasSelectedChild">批量删除</el-button>
         </el-col>
       </el-col>
     </el-row>
 
-    <vxe-table border="inner" ref="tableRef" :column-config="{ resizable: true }" :expand-config="{
+    <vxe-table border="inner" ref="tableRef" :column-config="{ resizable: true }" :checkbox-config="{trigger: 'row'}" @checkbox-change="handleSelectionChange" @checkbox-all="handleSelectAll" :expand-config="{
       lazy: true,
       loadMethod: loadContentMethod,
       iconOpen: 'vxe-icon-square-minus-fill',
       iconClose: 'vxe-icon-square-plus-fill'
-    }" :data="dataList" @checkbox-change="handleSelectionChange" @checkbox-all="handleSelectAll">
-      <!-- <vxe-column type="checkbox" width="60" fixed="left"></vxe-column> -->
+    }" :data="dataList">
       <vxe-column type="seq" width="60"></vxe-column>
       <vxe-column type="expand" width="80">
         <template #content="{ row }">
-          <vxe-table border size="mini" stripe :data="row.children" @checkbox-change="handleSelectionChange2"
-            @checkbox-all="handleSelectAll2">
+          <vxe-table border size="mini" stripe :data="row.children" 
+            :ref="el => setChildTableRef(el, row.id)"
+            @checkbox-change="(params) => handleSelectionChange2(params, row)" 
+            @checkbox-all="(params) => handleSelectAll2(params, row)">
             <vxe-column type="checkbox" width="60" fixed="left"></vxe-column>
             <vxe-column type="seq" width="60"></vxe-column>
             <vxe-column field="subInvCode" title="子件编码"></vxe-column>
             <vxe-column field="subInvName" title="子件名称"></vxe-column>
             <vxe-column field="iusequantity" title="使用数量"></vxe-column>
             <vxe-column field="bomVersion" title="bom版本"></vxe-column>
-            <vxe-column field="iusequantity" title="操作">
-              <template #default="{ row }">
-                <el-button type="success" size="small" icon="edit" title="编辑" @click="handleSubEdit(row)"></el-button>
-                <el-button type="danger" @click="handleSubDelete(row)" size="small" icon="delete" title="删除" />
+            <vxe-column field="operation" title="操作">
+              <template #default="{ row: subRow }">
+                <el-button type="success" size="small" icon="edit" title="编辑" @click="handleSubEdit(subRow)"></el-button>
+                <el-button type="danger" @click="handleSubDelete(subRow)" size="small" icon="delete" title="删除" />
               </template>
             </vxe-column>
           </vxe-table>
@@ -56,7 +57,7 @@
       <vxe-column field="invCode" title="母件编码"></vxe-column>
       <vxe-column field="invName" title="母件名称"></vxe-column>
       <vxe-column field="bomVersion" title="bom版本"></vxe-column>
-      <!-- <vxe-column field="iusequantity" title="操作">
+      <!-- <vxe-column field="operation" title="操作">
         <template #default="{ row }">
           <el-button type="success" size="small" icon="edit" title="编辑" @click="handleEdit(row)"></el-button>
           <el-button type="danger" size="small" icon="delete" title="删除" @click="handleDelete(row)"></el-button>
@@ -137,13 +138,22 @@
 </template>
 
 <script setup name="BaseMaterialBOM">
-import { listBaseMaterialBom, GetMonterInvList, GetSonInvList, updateBaseMaterialBom,delBaseMaterialBom } from '@/api/baseManagement/basematerialBOM.js'
+import { listBaseMaterialBom, GetMonterInvList, GetSonInvList, updateBaseMaterialBom, delBaseMaterialBom } from '@/api/baseManagement/basematerialBOM.js'
 import { addBaseMaterialBom, updateBaseMaterialBom as updateMainBom } from '@/api/baseManagement/basematerialBOM.js'
 import useUserStore from '@/store/modules/user'
+import { ref, reactive, computed } from 'vue' // 补充引入Vue核心API
+
 const userStore = useUserStore()
 const userName = userStore.userName
 const { proxy } = getCurrentInstance()
-const ids = ref([])
+
+// 主件选中ID数组
+const mainIds = ref([])
+// 子件选中ID映射，key为父项ID，value为子项ID数组
+const childIdsMap = ref({})
+// 子表格引用映射
+const childTableRefs = ref({})
+
 const loading = ref(false)
 const showSearch = ref(true)
 
@@ -247,27 +257,49 @@ function getList() {
   })
 }
 
-// 获取选中的行数据
-function getSelectedRows() {
+// 设置子表格引用
+function setChildTableRef(el, parentId) {
+  if (el) {
+    childTableRefs.value[parentId] = el
+  }
+}
+
+// 处理主件表格复选框选中状态变化
+function handleSelectionChange() {
   if (tableRef.value) {
     const selectedRows = tableRef.value.getCheckboxRecords()
-    console.log('选中的行数据:', selectedRows)
-    return selectedRows
+    mainIds.value = selectedRows.map(row => row.id)
+    console.log('主件选中项ID:', mainIds.value)
   }
-  return []
 }
 
-// 处理单个复选框选中状态变化
-function handleSelectionChange() {
-  const selectedRows = tableRef.value.getCheckboxRecords()
-  ids.value = selectedRows.map(row => row.id) // 假设有id字段
-  console.log('当前选中项ID:', ids.value)
+// 处理主件表格全选/取消全选
+function handleSelectAll() {
+  if (tableRef.value) {
+    const selectedRows = tableRef.value.getCheckboxRecords()
+    mainIds.value = selectedRows.map(row => row.id)
+    console.log('主件全选后ID:', mainIds.value)
+  }
 }
 
-// 处理全选/取消全选
-function handleSelectAll({ records }) {
-  ids.value = records.map(row => row.id) // 假设有id字段
-  console.log('全选/取消全选后ID:', ids.value)
+// 处理子件表格复选框选中状态变化
+function handleSelectionChange2(params, parentRow) {
+  const selectedChildRows = params.$table.getCheckboxRecords()
+  const childIds = selectedChildRows.map(row => row.id)
+  // 将子件选中状态保存到映射中
+  childIdsMap.value[parentRow.id] = childIds
+  console.log('所有子件选中状态:', childIdsMap.value)
+}
+
+// 处理子件表格全选/取消全选
+function handleSelectAll2(params, parentRow) {
+  const selectedChildRows = params.$table.getCheckboxRecords()
+  const childIds = selectedChildRows.map(row => row.id)
+
+  // 将子件选中状态保存到映射中
+  childIdsMap.value[parentRow.id] = childIds
+  
+  console.log('所有子件选中状态:', childIdsMap.value)
 }
 
 // 编辑主件
@@ -289,6 +321,7 @@ function handleSubEdit(row) {
   subDialog.visible = true
   subDialog.isEdit = true
 }
+
 function formatDateTime(date) {
   const year = date.getFullYear();
   const month = String(date.getMonth() + 1).padStart(2, '0');
@@ -299,6 +332,7 @@ function formatDateTime(date) {
   
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
+
 // 提交主件表单
 function submitForm() {
   editFormRef.value.validate(valid => {
@@ -338,19 +372,15 @@ function submitSubForm() {
   subEditFormRef.value.validate(valid => {
     if (valid) {
       if (subDialog.isEdit) {
-        // 更新现有记录
         updateBaseMaterialBom(subFormData.value).then(res => {
           if (res.code === 200) {
             proxy.$modal.msgSuccess('修改成功')
             subDialog.visible = false
             resetSubForm()
-            // 刷新父级数据
             getList()
           }
         })
       } else {
-        // 添加新记录
-        // 注意：这里可能需要不同的API接口，根据实际业务调整
         addBaseMaterialBom(subFormData.value).then(res => {
           if (res.code === 200) {
             proxy.$modal.msgSuccess('新增成功')
@@ -376,36 +406,93 @@ function cancelSub() {
   resetSubForm()
 }
 
-// 删除子件
+// 删除子件（适配路径参数格式）
 function handleSubDelete(row) {
   proxy.$modal.confirm('确认删除该子件数据?')
     .then(() => {
-      // 实现删除逻辑
       console.log('删除子件数据:', row.id)
-      // 示例API调用
       return delBaseMaterialBom(row.id)
     })
     .then(() => {
       proxy.$modal.msgSuccess('删除成功')
       getList()
     })
+    .catch((err) => {
+      console.error('删除子件失败:', err)
+      proxy.$modal.msgError('删除失败，请稍后重试')
+    })
 }
 
-
-
-// 删除单行
+// 删除单行主件（适配路径参数格式）
 function handleDelete(row) {
   proxy.$modal.confirm('确认删除该条数据?')
     .then(() => {
-      // 实现删除逻辑
-      console.log('删除行数据:', row.id)
-      // 示例API调用
-      // return deleteById(row.id)
+      return delBaseMaterialBom(row.id)
     })
     .then(() => {
       proxy.$modal.msgSuccess('删除成功')
       getList()
     })
+    .catch((err) => {
+      console.error('删除主件失败:', err)
+      proxy.$modal.msgError('删除失败，请稍后重试')
+    })
+}
+
+// 检查是否有选中的子件
+const hasSelectedChild = computed(() => {
+  for (const parentId in childIdsMap.value) {
+    if (childIdsMap.value[parentId] && Array.isArray(childIdsMap.value[parentId]) && childIdsMap.value[parentId].length > 0) {
+      return true
+    }
+  }
+  return false
+})
+
+// 批量删除
+function handleBatchDelete() {
+  const allSelectedIds = []
+  if (Array.isArray(mainIds.value) && mainIds.value.length > 0) {
+    allSelectedIds.push(...mainIds.value)
+  }
+  
+  for (const parentId in childIdsMap.value) {
+    if (childIdsMap.value[parentId] && Array.isArray(childIdsMap.value[parentId]) && childIdsMap.value[parentId].length > 0) {
+      allSelectedIds.push(...childIdsMap.value[parentId])
+    }
+  }
+  if (allSelectedIds.length === 0) {
+    proxy.$modal.msgWarning('请选择要删除的数据');
+    return;
+  }
+  proxy.$modal.confirm(`确认删除选中的${allSelectedIds.length}条数据?`)
+    .then(async () => {
+      return delBaseMaterialBom(allSelectedIds);
+    })
+    .then((res) => {
+      if (res && res.code === 200) {
+        proxy.$modal.msgSuccess('删除成功');
+        mainIds.value = [];
+        childIdsMap.value = {};
+        for (const parentId in childTableRefs.value) {
+          if (childTableRefs.value[parentId] && typeof childTableRefs.value[parentId].clearCheckbox === 'function') {
+            childTableRefs.value[parentId].clearCheckbox();
+          }
+        }
+      
+        if (tableRef.value && typeof tableRef.value.clearCheckbox === 'function') {
+          tableRef.value.clearCheckbox();
+        }
+        // 刷新列表
+        getList();
+      } else {
+        proxy.$modal.msgError('删除失败，接口返回异常');
+      }
+    })
+    .catch((err) => {
+      console.error('批量删除失败:', err);
+      proxy.$modal.msgError('删除失败，请稍后重试');
+    });
 }
 
 // 子数据懒加载
@@ -428,7 +515,7 @@ function getToken() {
 const upload = reactive({
   open: false,
   title: '',
-  // isUploading: false,
+  isUploading: false,
   updateSupport: 0,
   uploadType: 1,
   headers: { Authorization: 'Bearer ' + getToken() },
@@ -457,14 +544,13 @@ function submitFileForm() {
   proxy.$refs['uploadRef'].submit()
 }
 
-//下砸模版
+//下载模版
 function importTemplate() {
   proxy.download('/MasterDataManagement/Material/MaterialBom/importTemplate', '物料类别导入模板')
 }
 
 /** 文件上传异常处理 */
 const handleFileError = (error, file, fileList) => {
-  // 修复：使用正确的响应对象
   if (error) {
     proxy.$message.error('模板导入异常!')
     return
@@ -481,7 +567,6 @@ const dialogVisibleActualAssembly = ref(false)
 
 /** 文件上传成功处理 */
 const handleFileSuccess = (response, file, fileList) => {
-
   const { code, msg, data } = response
   if (code === 500) {
     proxy.$message.error('模板存在异常!')
@@ -530,7 +615,6 @@ function sortChange(column) {
   handleQuery()
 }
 
-/// ======================= 数据同步 =============================
 import { SynchERPBOM } from '@/api/erp/baseInteractERP.js'
 const throttle = ref(false)
 const syncLoading = ref(false)
@@ -551,7 +635,6 @@ function handleSync() {
     }
   })
 }
-/// =================================================================
 
 handleQuery()
 </script>
\ No newline at end of file