feat(mes): 新增设备保养记录及明细相关功能,包括请求和响应 VO、Controller、Service 及 API 接口

pull/871/MERGE
YunaiV 2026-02-20 11:40:31 +08:00
parent 2a83789782
commit 9845059d4a
6 changed files with 902 additions and 0 deletions

View File

@ -0,0 +1,51 @@
import request from '@/config/axios'
// MES 设备保养记录 VO
export interface DvMaintenRecordVO {
id: number // 编号
planId: number // 计划编号
planName?: string // 计划名称
machineryId: number // 设备编号
machineryCode?: string // 设备编码
machineryName?: string // 设备名称
machineryBrand?: string // 品牌
machinerySpec?: string // 规格型号
maintenTime: Date // 保养时间
userId: number // 用户编号
nickname?: string // 保养人名称
status: number // 状态
remark: string // 备注
}
// MES 设备保养记录 API
export const DvMaintenRecordApi = {
// 查询设备保养记录分页
getMaintenRecordPage: async (params: any) => {
return await request.get({ url: `/mes/dv/mainten-record/page`, params })
},
// 查询设备保养记录详情
getMaintenRecord: async (id: number) => {
return await request.get({ url: `/mes/dv/mainten-record/get?id=` + id })
},
// 新增设备保养记录
createMaintenRecord: async (data: DvMaintenRecordVO) => {
return await request.post({ url: `/mes/dv/mainten-record/create`, data })
},
// 修改设备保养记录
updateMaintenRecord: async (data: DvMaintenRecordVO) => {
return await request.put({ url: `/mes/dv/mainten-record/update`, data })
},
// 删除设备保养记录
deleteMaintenRecord: async (id: number) => {
return await request.delete({ url: `/mes/dv/mainten-record/delete?id=` + id })
},
// 导出设备保养记录 Excel
exportMaintenRecord: async (params: any) => {
return await request.download({ url: `/mes/dv/mainten-record/export-excel`, params })
}
}

View File

@ -0,0 +1,43 @@
import request from '@/config/axios'
// TODO @AIline/index.ts 里;
// MES 设备保养记录明细 VO
export interface DvMaintenRecordLineVO {
id: number // 编号
recordId: number // 保养记录编号
subjectId: number // 项目编号
subjectName?: string // 项目名称
subjectContent?: string // 项目内容
subjectStandard?: string // 项目标准
status: number // 保养结果
result: string // 异常描述
remark: string // 备注
}
// MES 设备保养记录明细 API
export const DvMaintenRecordLineApi = {
// 查询设备保养记录明细分页
getMaintenRecordLinePage: async (params: any) => {
return await request.get({ url: `/mes/dv/mainten-record-line/page`, params })
},
// 查询设备保养记录明细详情
getMaintenRecordLine: async (id: number) => {
return await request.get({ url: `/mes/dv/mainten-record-line/get?id=` + id })
},
// 新增设备保养记录明细
createMaintenRecordLine: async (data: DvMaintenRecordLineVO) => {
return await request.post({ url: `/mes/dv/mainten-record-line/create`, data })
},
// 修改设备保养记录明细
updateMaintenRecordLine: async (data: DvMaintenRecordLineVO) => {
return await request.put({ url: `/mes/dv/mainten-record-line/update`, data })
},
// 删除设备保养记录明细
deleteMaintenRecordLine: async (id: number) => {
return await request.delete({ url: `/mes/dv/mainten-record-line/delete?id=` + id })
}
}

View File

@ -0,0 +1,305 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-row>
<el-col :span="8">
<!-- TODO @AI设备 select不用 设备名称品牌规格型号 -->
<el-form-item label="设备" prop="machineryId">
<el-select
v-model="formData.machineryId"
filterable
remote
reserve-keyword
placeholder="请输入设备名称或编码搜索"
:remote-method="getMachineryOptions"
@change="handleMachineryChange"
>
<el-option
v-for="item in machineryOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备名称">
<el-input v-model="machineryInfo.name" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="品牌">
<el-input v-model="machineryInfo.brand" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="规格型号">
<el-input v-model="machineryInfo.spec" disabled type="textarea" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<!-- TODO @AI使用包养计划的 select 组件 -->
<el-form-item label="保养计划" prop="planId">
<el-select
v-model="formData.planId"
filterable
remote
reserve-keyword
placeholder="请输入计划名称搜索"
:remote-method="getPlanOptions"
>
<el-option
v-for="item in planOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- TODO @AI保养人的 select -->
<el-form-item label="保养人" prop="userId">
<el-select
v-model="formData.userId"
filterable
remote
reserve-keyword
placeholder="请输入保养人搜索"
:remote-method="getUserOptions"
>
<el-option
v-for="item in userOptions"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="保养时间" prop="maintenTime">
<el-date-picker
v-model="formData.maintenTime"
type="datetime"
value-format="x"
placeholder="选择保养时间"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template v-if="formData.id">
<el-divider content-position="center">保养项目明细</el-divider>
<MaintenRecordLineList :record-id="formData.id" />
</template>
<template #footer>
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click="submitForm" :disabled="formLoading"> </el-button>
<!-- TODO @AI提交挪到 index.vue 外面 -->
<el-button
type="success"
@click="handleFinish"
v-if="formData.id && formData.status === 10"
:disabled="formLoading"
> </el-button
>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { DvMaintenRecordApi } from '@/api/mes/dv/maintenrecord'
import { DvMachineryApi } from '@/api/mes/dv/machinery'
import * as UserApi from '@/api/system/user'
import request from '@/config/axios'
import MaintenRecordLineList from './components/MaintenRecordLineList.vue'
// TODO @AI /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/system/user/UserForm.vue
defineOptions({ name: 'MaintenRecordForm' })
const { t } = useI18n()
const message = useMessage()
const dialogVisible = ref(false)
const dialogTitle = ref('')
const formLoading = ref(false)
const formType = ref('')
const formData = ref({
id: undefined,
planId: undefined,
machineryId: undefined,
maintenTime: undefined,
userId: undefined,
status: 10,
remark: ''
})
const formRules = reactive({
machineryId: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
maintenTime: [{ required: true, message: '保养时间不能为空', trigger: 'blur' }]
})
const formRef = ref()
const machineryOptions = ref<any[]>([])
const planOptions = ref<any[]>([])
const userOptions = ref<any[]>([])
const machineryInfo = reactive({
name: '',
brand: '',
spec: ''
})
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
if (id) {
formLoading.value = true
try {
formData.value = await DvMaintenRecordApi.getMaintenRecord(id)
//
if (formData.value.machineryId) {
const machinery = await DvMachineryApi.getMachinery(formData.value.machineryId)
if (machinery) {
machineryOptions.value = [machinery]
handleMachineryChange(machinery.id)
}
}
// TODO @ DvCheckPlanApi DvCheckPlanApi.getCheckPlan()
if (formData.value.planId) {
const plan = await request.get({
url: `/mes/dv/check-plan/get?id=${formData.value.planId}`
})
if (plan) planOptions.value = [plan]
}
if (formData.value.userId) {
const user = await UserApi.getUser(formData.value.userId)
if (user) userOptions.value = [user]
}
} finally {
formLoading.value = false
}
}
}
defineExpose({ open })
/** 提交表单 */
const emit = defineEmits(['success'])
const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
const data = formData.value as any
if (formType.value === 'create') {
await DvMaintenRecordApi.createMaintenRecord(data)
message.success(t('common.createSuccess'))
} else {
await DvMaintenRecordApi.updateMaintenRecord(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
emit('success')
} finally {
formLoading.value = false
}
}
/** 提交按钮(完成保养) */
const handleFinish = async () => {
if (formData.value.id && formData.value.status === 10) {
formLoading.value = true
try {
formData.value.status = 20
await DvMaintenRecordApi.updateMaintenRecord(formData.value as any)
message.success('已提交保养完成')
dialogVisible.value = false
emit('success')
} catch {
formData.value.status = 10
} finally {
formLoading.value = false
}
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
planId: undefined,
machineryId: undefined,
maintenTime: undefined,
userId: undefined,
status: 10,
remark: ''
}
machineryInfo.name = ''
machineryInfo.brand = ''
machineryInfo.spec = ''
formRef.value?.resetFields()
}
/** 获取设备选项 */
const getMachineryOptions = async (query: string) => {
const data = await DvMachineryApi.getMachineryPage({ name: query, pageNo: 1, pageSize: 20 })
machineryOptions.value = data.list
}
/** 处理设备变化 */
const handleMachineryChange = async (val: number) => {
const selected = machineryOptions.value.find((item) => item.id === val)
if (selected) {
machineryInfo.name = selected.name
machineryInfo.brand = selected.brand
machineryInfo.spec = selected.spec
}
}
/** 获取计划选项 */
// TODO @ DvCheckPlanApi DvCheckPlanApi.getCheckPlanPage()
const getPlanOptions = async (query: string) => {
try {
const data = await request.get({
url: `/mes/dv/check-plan/page`,
params: { name: query, pageNo: 1, pageSize: 20 }
})
planOptions.value = data.list
} catch {}
}
/** 获取用户选项 */
const getUserOptions = async (query: string) => {
try {
const data = await UserApi.getUserPage({ nickname: query, pageNo: 1, pageSize: 20 })
userOptions.value = data.list
} catch {}
}
</script>

View File

@ -0,0 +1,149 @@
<!-- TODO @AI参考别的模块合并到 List.vue -->
<!-- TODO @AI参考 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/pro/route -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="500px">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="80px"
v-loading="formLoading"
>
<el-form-item label="项目" prop="subjectId">
<el-select
v-model="formData.subjectId"
filterable
remote
reserve-keyword
placeholder="请输入项目名称搜索"
:remote-method="getSubjectOptions"
>
<el-option
v-for="item in subjectOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="保养结果" prop="status">
<el-radio-group v-model="formData.status">
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.MES_MAINTEN_STATUS)"
:key="dict.value"
:value="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="异常描述" prop="result">
<el-input v-model="formData.result" type="textarea" placeholder="请输入异常描述" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click="submitForm" :disabled="formLoading"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { DvMaintenRecordLineApi } from '@/api/mes/dv/maintenrecord/maintenRecordLine'
import { DvSubjectApi } from '@/api/mes/dv/subject'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
defineOptions({ name: 'MaintenRecordLineForm' })
const { t } = useI18n()
const message = useMessage()
const dialogVisible = ref(false)
const dialogTitle = ref('')
const formLoading = ref(false)
const formType = ref('')
const formData = ref({
id: undefined,
recordId: undefined,
subjectId: undefined,
status: 1,
result: '',
remark: ''
})
const formRules = reactive({
subjectId: [{ required: true, message: '项目不能为空', trigger: 'blur' }],
status: [{ required: true, message: '保养结果不能为空', trigger: 'blur' }]
})
const formRef = ref()
const subjectOptions = ref<any[]>([])
/** 打开弹窗 */
const open = async (type: string, id?: number, recordId?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
formData.value.recordId = recordId
if (id) {
formLoading.value = true
try {
formData.value = await DvMaintenRecordLineApi.getMaintenRecordLine(id)
//
if (formData.value.subjectId) {
const subject = await DvSubjectApi.getSubject(formData.value.subjectId)
if (subject) subjectOptions.value = [subject]
}
} finally {
formLoading.value = false
}
}
}
defineExpose({ open })
/** 提交表单 */
const emit = defineEmits(['success'])
const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
const data = formData.value as any
if (formType.value === 'create') {
await DvMaintenRecordLineApi.createMaintenRecordLine(data)
message.success(t('common.createSuccess'))
} else {
await DvMaintenRecordLineApi.updateMaintenRecordLine(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
recordId: undefined,
subjectId: undefined,
status: 1,
result: '',
remark: ''
}
formRef.value?.resetFields()
}
/** 获取项目选项 */
const getSubjectOptions = async (query: string) => {
try {
const data = await DvSubjectApi.getSubjectPage({ name: query, pageNo: 1, pageSize: 20 })
subjectOptions.value = data.list
} catch {}
}
</script>

View File

@ -0,0 +1,129 @@
<!-- TODO @AI参考 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/pro/route -->
<template>
<div class="app-container">
<el-row :gutter="10" class="mb8" v-if="!disabled">
<el-col :span="1.5">
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['mes:dv-mainten-record:update']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="list">
<el-table-column label="项目名称" align="center" prop="subjectName" />
<el-table-column label="项目内容" align="center" prop="subjectContent" />
<el-table-column label="标准" align="center" prop="subjectStandard" />
<el-table-column label="保养结果" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_MAINTEN_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="异常描述" align="center" prop="result" />
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
v-if="!disabled"
>
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:dv-mainten-record:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:dv-mainten-record:update']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<MaintenRecordLineForm ref="formRef" @success="getList" />
</div>
</template>
<script setup lang="ts">
import { DvMaintenRecordLineApi } from '@/api/mes/dv/maintenrecord/maintenRecordLine'
import MaintenRecordLineForm from './MaintenRecordLineForm.vue'
import { DICT_TYPE } from '@/utils/dict'
const props = defineProps({
recordId: {
type: Number,
required: true
},
disabled: {
type: Boolean,
default: false
}
})
const { t } = useI18n()
const message = useMessage()
const loading = ref(true)
const list = ref([])
const total = ref(0)
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
recordId: props.recordId
})
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await DvMaintenRecordLineApi.getMaintenRecordLinePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id, props.recordId)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await DvMaintenRecordLineApi.deleteMaintenRecordLine(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
watch(
() => props.recordId,
() => {
queryParams.recordId = props.recordId
getList()
},
{ immediate: true }
)
</script>

View File

@ -0,0 +1,225 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="90px"
>
<!-- TODO @AI计划 select如果没组件就封装一个 -->
<el-form-item label="计划名称" prop="planName">
<el-input
v-model="queryParams.planName"
placeholder="请输入计划名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<!-- TODO @AI设备 select如果没组件就封装一个 -->
<el-form-item label="设备编码" prop="machineryCode">
<el-input
v-model="queryParams.machineryCode"
placeholder="请输入设备编码"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="设备名称" prop="machineryName">
<el-input
v-model="queryParams.machineryName"
placeholder="请输入设备名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<!-- TODO @AI用户 select如果没组件就封装一个 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/system/user/components -->
<el-form-item label="保养人" prop="nickname">
<el-input
v-model="queryParams.nickname"
placeholder="请输入保养人名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="保养时间" prop="maintenTime">
<el-date-picker
v-model="queryParams.maintenTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</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-mainten-record:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:dv-mainten-record:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="设备编码" align="center" prop="machineryCode" />
<el-table-column label="设备名称" align="center" prop="machineryName" />
<el-table-column label="品牌" align="center" prop="machineryBrand" />
<el-table-column label="规格型号" align="center" prop="machinerySpec" />
<el-table-column label="计划名称" align="center" prop="planName" />
<el-table-column
label="保养时间"
align="center"
prop="maintenTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="保养人" align="center" prop="nickname" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_MAINTEN_RECORD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<!-- TODO @AI这里加个提交操作 -->
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:dv-mainten-record:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:dv-mainten-record:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗 -->
<MaintenRecordForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { DvMaintenRecordApi } from '@/api/mes/dv/maintenrecord'
import MaintenRecordForm from './MaintenRecordForm.vue'
import { DICT_TYPE } from '@/utils/dict'
defineOptions({ name: 'MesDvMaintenRecord' })
const message = useMessage()
const { t } = useI18n()
const loading = ref(true)
const list = ref([])
const total = ref(0)
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
planName: undefined,
machineryCode: undefined,
machineryName: undefined,
nickname: undefined,
maintenTime: []
})
const queryFormRef = ref()
const exportLoading = ref(false)
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await DvMaintenRecordApi.getMaintenRecordPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await DvMaintenRecordApi.deleteMaintenRecord(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
await message.exportConfirm()
exportLoading.value = true
const data = await DvMaintenRecordApi.exportMaintenRecord(queryParams)
download.excel(data, '设备保养记录.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>