From 68db8c8b70b572f02381a16443d04199c0f81d4d Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Thu, 8 Jan 2026 10:32:07 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=AE=BE=E5=A4=87=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA/=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/deviceledger/index.ts             |  5 +-
 .../mes/deviceledger/DeviceLedgerForm.vue     | 37 ++++++-----
 src/views/mes/deviceledger/index.vue          | 61 ++++++++++++++-----
 3 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/src/api/mes/deviceledger/index.ts b/src/api/mes/deviceledger/index.ts
index f62231ae..eed0d1d0 100644
--- a/src/api/mes/deviceledger/index.ts
+++ b/src/api/mes/deviceledger/index.ts
@@ -17,7 +17,6 @@ export interface DeviceLedgerVO {
   deviceLocation: string // 设备位置
   useDept?: string // 使用部门
   deviceManager: string // 设备负责人
-  quantity?: number // 数量
   productionDate: Date // 设备生产日期
   factoryEntryDate: Date // 设备入厂日期
   deviceRemark: string // 设备备注
@@ -51,8 +50,8 @@ export const DeviceLedgerApi = {
   },
 
   // 删除设备类型
-  deleteDeviceLedger: async (id: number) => {
-    return await request.delete({ url: `/mes/device-ledger/delete?id=` + id })
+  deleteDeviceLedger: async (ids: string) => {
+    return await request.delete({ url: `/mes/device-ledger/delete?ids=` + ids })
   },
 
   // 导出设备类型 Excel
diff --git a/src/views/mes/deviceledger/DeviceLedgerForm.vue b/src/views/mes/deviceledger/DeviceLedgerForm.vue
index d587ed99..f964b635 100644
--- a/src/views/mes/deviceledger/DeviceLedgerForm.vue
+++ b/src/views/mes/deviceledger/DeviceLedgerForm.vue
@@ -57,12 +57,6 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="24">
-          <el-form-item label="数量" prop="quantity">
-            <el-input-number v-model="formData.quantity" :min="1" controls-position="right" class="!w-full" />
-          </el-form-item>
-        </el-col>
-
         <el-col :span="12">
           <el-form-item label="供应商" prop="supplier">
             <el-select v-model="formData.supplier" placeholder="请选择供应商" clearable filterable class="!w-full">
@@ -104,9 +98,9 @@
         </el-col>
 
         <el-col :span="24">
-          <el-form-item label="部门" prop="useDept">
+          <el-form-item label="部门" prop="systemOrg">
             <el-tree-select
-              v-model="formData.useDept"
+              v-model="formData.systemOrg"
               :data="deptTree"
               :props="treeSelectProps"
               check-strictly
@@ -185,9 +179,8 @@ const formData = ref({
   supplier: undefined,
   workshop: undefined,
   deviceLocation: undefined,
-  useDept: undefined,
+  systemOrg: undefined,
   deviceManager: undefined,
-  quantity: 1,
   productionDate: undefined,
   factoryEntryDate: undefined,
   remark: undefined,
@@ -207,6 +200,7 @@ const deviceTypeTree = ref<DeviceTypeTreeVO[]>([])
 const deptTree = ref<any[]>([])
 const supplierOptions = ref<string[]>([])
 const deptNameMap = ref<Record<number, string>>({})
+const deptIdMap = ref<Record<string, number>>({})
 
 const userPickerVisible = ref(false)
 const userKeyword = ref('')
@@ -230,13 +224,25 @@ const selectUser = (user: UserVO) => {
 
 const buildDeptNameMap = (nodes: any[]) => {
   const map: Record<number, string> = {}
+  const reverseMap: Record<string, number> = {}
   const stack = [...nodes]
   while (stack.length) {
     const node = stack.pop()!
-    if (typeof node.id === 'number') map[node.id] = node.name
+    if (typeof node.id === 'number') {
+      map[node.id] = node.name
+      if (node.name) reverseMap[String(node.name)] = node.id
+    }
     if (Array.isArray(node.children) && node.children.length) stack.push(...node.children)
   }
   deptNameMap.value = map
+  deptIdMap.value = reverseMap
+}
+
+const normalizeDeptValue = (value: any) => {
+  if (value === undefined || value === null || value === '') return undefined
+  if (typeof value === 'number') return value
+  const byName = deptIdMap.value[String(value)]
+  return byName === undefined ? undefined : byName
 }
 
 const ensureOptionsLoaded = async () => {
@@ -270,6 +276,8 @@ const open = async (type: string, id?: number, defaultDeviceTypeId?: number) =>
     formLoading.value = true
     try {
       formData.value = await DeviceLedgerApi.getDeviceLedger(id)
+      formData.value.workshop = normalizeDeptValue((formData.value as any).workshop)
+      formData.value.systemOrg = normalizeDeptValue((formData.value as any).systemOrg)
     } finally {
       formLoading.value = false
     }
@@ -286,11 +294,11 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const workshopId = formData.value.workshop
-    const useDeptId = formData.value.useDept
+    const systemOrgId = formData.value.systemOrg
     const data = {
       ...(formData.value as any),
       workshop: typeof workshopId === 'number' ? deptNameMap.value[workshopId] : undefined,
-      useDept: typeof useDeptId === 'number' ? deptNameMap.value[useDeptId] : undefined
+      systemOrg: typeof systemOrgId === 'number' ? deptNameMap.value[systemOrgId] : undefined
     } as unknown as DeviceLedgerVO
     if (formType.value === 'create') {
       await DeviceLedgerApi.createDeviceLedger(data)
@@ -321,9 +329,8 @@ const resetForm = () => {
     supplier: undefined,
     workshop: undefined,
     deviceLocation: undefined,
-    useDept: undefined,
+    systemOrg: undefined,
     deviceManager: undefined,
-    quantity: 1,
     productionDate: undefined,
     factoryEntryDate: undefined,
     remark: undefined,
diff --git a/src/views/mes/deviceledger/index.vue b/src/views/mes/deviceledger/index.vue
index 7ae38e3d..b86220b4 100644
--- a/src/views/mes/deviceledger/index.vue
+++ b/src/views/mes/deviceledger/index.vue
@@ -20,7 +20,7 @@
           :model="queryParams"
           ref="queryFormRef"
           :inline="true"
-          label-width="90px"
+          label-width="60px"
         >
           <el-form-item label="编码" prop="deviceCode">
             <el-input
@@ -56,6 +56,9 @@
             <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['mes:device-ledger:create']">
               <Icon icon="ep:plus" class="mr-5px" /> 新增
             </el-button>
+            <el-button type="danger" plain @click="handleBatchDelete" v-hasPermi="['mes:device-ledger:delete']">
+              <Icon icon="ep:delete" class="mr-5px" /> 批量删除
+            </el-button>
             <el-button
               type="success"
               plain
@@ -70,7 +73,16 @@
       </ContentWrap>
 
       <ContentWrap>
-        <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+        <el-table
+          ref="tableRef"
+          v-loading="loading"
+          :data="list"
+          :stripe="true"
+          :show-overflow-tooltip="true"
+          row-key="id"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" fixed="left" reserve-selection />
           <el-table-column label="序号" align="center" width="80" fixed="left">
             <template #default="scope">
               {{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}
@@ -101,14 +113,13 @@
           <el-table-column label="规格" align="center" prop="deviceSpec" />
           <el-table-column label="型号" align="center" prop="deviceModel" />
           <el-table-column label="品牌" align="center" prop="deviceBrand" />
-          <el-table-column label="数量" align="center" prop="quantity" />
           <el-table-column label="生产日期" align="center" prop="productionDate" :formatter="dateFormatter" width="180px" />
           <el-table-column label="入厂日期" align="center" prop="factoryEntryDate" :formatter="dateFormatter" width="180px" />
-          <el-table-column label="供应商" align="center" prop="supplier" />
-          <el-table-column label="所属车间" align="center" prop="workshop" />
+          <el-table-column label="供应商" align="center" prop="supplier" width="110px"/>
+          <el-table-column label="所属车间" align="center" prop="workshop" width="110px"/>
           <el-table-column label="位置" align="center" prop="deviceLocation" />
-          <el-table-column label="使用部门" align="center" prop="useDept" />
-          <el-table-column label="责任人" align="center" prop="deviceManager" />
+          <el-table-column label="使用部门" align="center" prop="systemOrg" width="110px"/>
+          <el-table-column label="责任人" align="center" prop="deviceManager" width="110px"/>
           <el-table-column label="备注" align="center" prop="remark" />
           <el-table-column label="创建人" align="center" prop="creator" />
           <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
@@ -216,6 +227,12 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
+const tableRef = ref()
+const selectedIds = ref<number[]>([])
+const handleSelectionChange = (rows: any[]) => {
+  selectedIds.value = rows?.map((row) => row.id).filter((id) => id !== undefined) ?? []
+}
+
 const dictStore = useDictStoreWithOut()
 const dictReady = ref(false)
 
@@ -366,31 +383,45 @@ const openForm = (type: string, id?: number) => {
 }
 
 /** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+const buildIdsParam = (ids: number | number[]) => {
+  return Array.isArray(ids) ? ids.join(',') : String(ids)
+}
+
+const handleDelete = async (ids: number | number[]) => {
   try {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await DeviceLedgerApi.deleteDeviceLedger(id)
+    const idsParam = buildIdsParam(ids)
+    await DeviceLedgerApi.deleteDeviceLedger(idsParam)
     message.success(t('common.delSuccess'))
+    selectedIds.value = []
+    tableRef.value?.clearSelection?.()
     // 刷新列表
     await getList()
   } catch {}
 }
 
+const handleBatchDelete = async () => {
+  if (!selectedIds.value.length) {
+    message.error('请选择需要删除的数据')
+    return
+  }
+  await handleDelete(selectedIds.value)
+}
+
 /** 导出按钮操作 */
 const handleExport = async () => {
+  if (!selectedIds.value.length) {
+    message.error('请选择需要导出的数据')
+    return
+  }
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await DeviceLedgerApi.exportDeviceLedger({
-      deviceCode: queryParams.deviceCode,
-      deviceName: queryParams.deviceName,
-      deviceStatus: queryParams.deviceStatus,
-      deviceType: queryParams.deviceType
-    })
+    const data = await DeviceLedgerApi.exportDeviceLedger({ ids: selectedIds.value.join(',') })
     download.excel(data, '设备台账.xls')
   } catch {
   } finally {