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 @@
-
-
-
-
-
-
@@ -104,9 +98,9 @@
-
+
([])
const deptTree = ref([])
const supplierOptions = ref([])
const deptNameMap = ref>({})
+const deptIdMap = ref>({})
const userPickerVisible = ref(false)
const userKeyword = ref('')
@@ -230,13 +224,25 @@ const selectUser = (user: UserVO) => {
const buildDeptNameMap = (nodes: any[]) => {
const map: Record = {}
+ const reverseMap: Record = {}
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"
>
新增
+
+ 批量删除
+
-
+
+
{{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}
@@ -101,14 +113,13 @@
-
-
-
+
+
-
-
+
+
@@ -216,6 +227,12 @@ const queryParams = reactive({
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
+const tableRef = ref()
+const selectedIds = ref([])
+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 {