yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(mes-dv): 设备台账列表添加左侧设备类型分类树 

- 新增 MachineryTypeTree 组件，支持搜索过滤和点击/取消选择
- 列表页改为左树右表布局（4:20 比例），参考物料模块
- 移除搜索栏中的「设备类型」下拉（由左侧树代替）
- 重置时同时清空分类树选中状态

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
pull/871/MERGE
YunaiV 2026-02-17 10:23:07 +08:00
parent e0ec6249ae
commit 5428ed8351
2 changed files with 220 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/views/mes/dv/machinery/MachineryTypeTree.vue Normal file
View File

@ -0,0 +1,78 @@
<template>
<div class="head-container">
<el-input v-model="filterName" class="mb-20px" clearable placeholder="请输入分类名称">
<template #prefix>
<Icon icon="ep:search" />
</template>
</el-input>
</div>
<div class="head-container">
<el-tree
ref="treeRef"
:data="machineryTypeList"
:expand-on-click-node="false"
:filter-node-method="filterNode"
:props="defaultProps"
default-expand-all
highlight-current
node-key="id"
@node-click="handleNodeClick"
/>
</div>
</template>
<script lang="ts" setup>
import { ElTree } from 'element-plus'
import { DvMachineryTypeApi } from '@/api/mes/dv/machinery/type'
import { defaultProps, handleTree } from '@/utils/tree'
defineOptions({ name: 'MachineryTypeTree' })
const filterName = ref('')
const machineryTypeList = ref<Tree[]>([])
const treeRef = ref<InstanceType<typeof ElTree>>()
/** 获得分类树 */
const getTree = async () => {
const res = await DvMachineryTypeApi.getMachineryTypeSimpleList()
machineryTypeList.value = []
machineryTypeList.value.push(...handleTree(res))
}
/** 基于名字过滤 */
const filterNode = (name: string, data: Tree) => {
if (!name) {
return true
}
return data.name.includes(name)
}
/** 处理分类被点击 */
let currentNode: any = {}
const handleNodeClick = async (row: { [key: string]: any }, treeNode: any) => {
if (currentNode && currentNode.name === row.name) {
treeNode.checked = !treeNode.checked
} else {
treeNode.checked = true
}
if (treeNode.checked) {
currentNode = row
emits('node-click', row)
} else {
treeRef.value!.setCurrentKey(undefined)
emits('node-click', undefined)
currentNode = null
}
}
const emits = defineEmits(['node-click'])
/** 监听过滤名称 */
watch(filterName, (val) => {
treeRef.value!.filter(val)
})
/** 初始化 */
onMounted(async () => {
await getTree()
})
</script>

286
src/views/mes/dv/machinery/index.vue
View File

@ -1,145 +1,141 @@
<!-- MES 设备台账列表 --> <!-- MES 设备台账列表 -->
<template> <template>
<ContentWrap> <el-row :gutter="20">
<!-- 搜索工作栏 --> <!-- 左侧分类树 -->
<el-form <el-col :span="4" :xs="24">
class="-mb-15px" <ContentWrap class="h-1/1">
:model="queryParams" <MachineryTypeTree @node-click="handleTypeNodeClick" />
ref="queryFormRef" </ContentWrap>
:inline="true" </el-col>
label-width="100px" <el-col :span="20" :xs="24">
> <ContentWrap>
<el-form-item label="设备编码" prop="code"> <!-- 搜索工作栏 -->
<el-input <el-form
v-model="queryParams.code" class="-mb-15px"
placeholder="请输入设备编码" :model="queryParams"
clearable ref="queryFormRef"
@keyup.enter="handleQuery" :inline="true"
class="!w-240px" label-width="100px"
/>
</el-form-item>
<el-form-item label="设备名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入设备名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="设备类型" prop="machineryTypeId">
<el-tree-select
v-model="queryParams.machineryTypeId"
:data="machineryTypeTree"
:props="defaultProps"
check-strictly
default-expand-all
placeholder="请选择设备类型"
clearable
class="!w-240px"
/>
</el-form-item>
<el-form-item label="所属车间" prop="workshopId">
<el-select
v-model="queryParams.workshopId"
placeholder="请选择所属车间"
clearable
class="!w-240px"
> >
<el-option <el-form-item label="设备编码" prop="code">
v-for="item in workshopList" <el-input
:key="item.id" v-model="queryParams.code"
:label="item.name" placeholder="请输入设备编码"
:value="item.id" clearable
/> @keyup.enter="handleQuery"
</el-select> class="!w-240px"
</el-form-item> />
<el-form-item label="设备状态" prop="status"> </el-form-item>
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px"> <el-form-item label="设备名称" prop="name">
<el-option <el-input
v-for="dict in getIntDictOptions(DICT_TYPE.MES_DV_MACHINERY_STATUS)" v-model="queryParams.name"
:key="dict.value" placeholder="请输入设备名称"
:label="dict.label" clearable
:value="dict.value" @keyup.enter="handleQuery"
/> class="!w-240px"
</el-select> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item label="所属车间" prop="workshopId">
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-select
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> v-model="queryParams.workshopId"
<el-button placeholder="请选择所属车间"
type="primary" clearable
plain class="!w-240px"
@click="openForm('create')" >
v-hasPermi="['mes:dv-machinery:create']" <el-option
> v-for="item in workshopList"
<Icon icon="ep:plus" class="mr-5px" /> 新增 :key="item.id"
</el-button> :label="item.name"
<el-button :value="item.id"
type="success" />
plain </el-select>
@click="handleExport" </el-form-item>
:loading="exportLoading" <el-form-item label="设备状态" prop="status">
v-hasPermi="['mes:dv-machinery:export']" <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
> <el-option
<Icon icon="ep:download" class="mr-5px" /> 导出 v-for="dict in getIntDictOptions(DICT_TYPE.MES_DV_MACHINERY_STATUS)"
</el-button> :key="dict.value"
</el-form-item> :label="dict.label"
</el-form> :value="dict.value"
</ContentWrap> />
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['mes:dv-machinery:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:dv-machinery:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- TODO @AI：左侧要是分类树；类似别的模块 --> <!-- 列表 -->
<ContentWrap>
<!-- 列表 --> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<ContentWrap> <el-table-column label="设备编码" align="center" prop="code" width="120" />
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table-column label="设备名称" align="center" prop="name" min-width="150" />
<el-table-column label="设备编码" align="center" prop="code" width="120" /> <el-table-column label="品牌" align="center" prop="brand" width="100" />
<el-table-column label="设备名称" align="center" prop="name" min-width="150" /> <el-table-column label="规格型号" align="center" prop="spec" width="120" />
<el-table-column label="品牌" align="center" prop="brand" width="100" /> <el-table-column label="设备类型" align="center" prop="machineryTypeName" width="120" />
<el-table-column label="规格型号" align="center" prop="spec" width="120" /> <el-table-column label="所属车间" align="center" prop="workshopName" width="120" />
<el-table-column label="设备类型" align="center" prop="machineryTypeName" width="120" /> <el-table-column label="设备状态" align="center" prop="status" width="100">
<el-table-column label="所属车间" align="center" prop="workshopName" width="120" /> <template #default="scope">
<el-table-column label="设备状态" align="center" prop="status" width="100"> <dict-tag :type="DICT_TYPE.MES_DV_MACHINERY_STATUS" :value="scope.row.status" />
<template #default="scope"> </template>
<dict-tag :type="DICT_TYPE.MES_DV_MACHINERY_STATUS" :value="scope.row.status" /> </el-table-column>
</template> <el-table-column
</el-table-column> label="创建时间"
<el-table-column align="center"
label="创建时间" prop="createTime"
align="center" :formatter="dateFormatter"
prop="createTime" width="180px"
:formatter="dateFormatter" />
width="180px" <el-table-column label="操作" align="center" width="130">
/> <template #default="scope">
<el-table-column label="操作" align="center" width="130"> <el-button
<template #default="scope"> link
<el-button type="primary"
link @click="openForm('update', scope.row.id)"
type="primary" v-hasPermi="['mes:dv-machinery:update']"
@click="openForm('update', scope.row.id)" >
v-hasPermi="['mes:dv-machinery:update']" 编辑
> </el-button>
编辑 <el-button
</el-button> link
<el-button type="danger"
link @click="handleDelete(scope.row.id)"
type="danger" v-hasPermi="['mes:dv-machinery:delete']"
@click="handleDelete(scope.row.id)" >
v-hasPermi="['mes:dv-machinery:delete']" 删除
> </el-button>
删除 </template>
</el-button> </el-table-column>
</template> </el-table>
</el-table-column> <!-- 分页 -->
</el-table> <Pagination
<!-- 分页 --> :total="total"
<Pagination v-model:page="queryParams.pageNo"
:total="total" v-model:limit="queryParams.pageSize"
v-model:page="queryParams.pageNo" @pagination="getList"
v-model:limit="queryParams.pageSize" />
@pagination="getList" </ContentWrap>
/> </el-col>
</ContentWrap> </el-row>
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<MachineryForm ref="formRef" @success="getList" /> <MachineryForm ref="formRef" @success="getList" />
@ -149,10 +145,9 @@
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
import { DvMachineryApi, DvMachineryVO } from '@/api/mes/dv/machinery' import { DvMachineryApi, DvMachineryVO } from '@/api/mes/dv/machinery'
import { DvMachineryTypeApi } from '@/api/mes/dv/machinery/type'
import { MdWorkshopApi, MdWorkshopVO } from '@/api/mes/md/workstation/workshop' import { MdWorkshopApi, MdWorkshopVO } from '@/api/mes/md/workstation/workshop'
import { defaultProps, handleTree } from '@/utils/tree'
import MachineryForm from './MachineryForm.vue' import MachineryForm from './MachineryForm.vue'
import MachineryTypeTree from './MachineryTypeTree.vue'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
defineOptions({ name: 'MesDvMachinery' }) defineOptions({ name: 'MesDvMachinery' })
@ -174,7 +169,6 @@ const queryParams = reactive({
}) })
const queryFormRef = ref() // 搜索的表单 const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中 const exportLoading = ref(false) // 导出的加载中
const machineryTypeTree = ref<any[]>([]) // 设备类型树
const workshopList = ref<MdWorkshopVO[]>([]) // 车间列表 const workshopList = ref<MdWorkshopVO[]>([]) // 车间列表
/** 查询列表 */ /** 查询列表 */
@ -198,6 +192,13 @@ const handleQuery = () => {
/** 重置按钮操作 */ /** 重置按钮操作 */
const resetQuery = () => { const resetQuery = () => {
queryFormRef.value.resetFields() queryFormRef.value.resetFields()
queryParams.machineryTypeId = undefined
handleQuery()
}
/** 处理分类树节点点击 */
const handleTypeNodeClick = (row: any) => {
queryParams.machineryTypeId = row?.id
handleQuery() handleQuery()
} }
@ -240,9 +241,6 @@ const handleExport = async () => {
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
await getList() await getList()
// 加载设备类型树
const typeData = await DvMachineryTypeApi.getMachineryTypeSimpleList()
machineryTypeTree.value = handleTree(typeData)
// 加载车间列表 // 加载车间列表
workshopList.value = await MdWorkshopApi.getWorkshopSimpleList() workshopList.value = await MdWorkshopApi.getWorkshopSimpleList()
}) })