feat(mes): 添加维修工单和维修工单行相关功能,包括请求和响应 VO 及控制器

pull/871/MERGE
YunaiV 2026-02-20 19:16:40 +08:00
parent b8ea0645d3
commit 13e0222d0c
6 changed files with 712 additions and 6 deletions

View File

@ -0,0 +1,59 @@
import request from '@/config/axios'
// MES 维修工单 VO
export interface DvRepairVO {
id: number // 编号
code: string // 维修工单编码
name: string // 维修工单名称
machineryId: number // 设备编号
machineryCode?: string // 设备编码
machineryName?: string // 设备名称
machineryBrand?: string // 品牌
machinerySpec?: string // 规格型号
requireDate: Date // 报修日期
finishDate: Date // 维修完成日期
confirmDate: Date // 验收日期
result: number // 维修结果
acceptedUserId: number // 维修人用户编号
acceptedUserNickname?: string // 维修人名称
confirmUserId: number // 验收人用户编号
confirmUserNickname?: string // 验收人名称
sourceDocType: number // 来源单据类型
sourceDocId: number // 来源单据编号
sourceDocCode: string // 来源单据编码
status: number // 状态
remark: string // 备注
}
// MES 维修工单 API
export const DvRepairApi = {
// 查询维修工单分页
getRepairPage: async (params: any) => {
return await request.get({ url: `/mes/dv/repair/page`, params })
},
// 查询维修工单详情
getRepair: async (id: number) => {
return await request.get({ url: `/mes/dv/repair/get?id=` + id })
},
// 新增维修工单
createRepair: async (data: DvRepairVO) => {
return await request.post({ url: `/mes/dv/repair/create`, data })
},
// 修改维修工单
updateRepair: async (data: DvRepairVO) => {
return await request.put({ url: `/mes/dv/repair/update`, data })
},
// 删除维修工单
deleteRepair: async (id: number) => {
return await request.delete({ url: `/mes/dv/repair/delete?id=` + id })
},
// 导出维修工单 Excel
exportRepair: async (params: any) => {
return await request.download({ url: `/mes/dv/repair/export-excel`, params })
}
}

View File

@ -0,0 +1,43 @@
import request from '@/config/axios'
// MES 维修工单行 VO
export interface DvRepairLineVO {
id: number // 编号
repairId: number // 维修工单编号
subjectId: number // 项目编号
subjectName?: string // 项目名称
subjectContent?: string // 项目内容
subjectStandard?: string // 项目标准
malfunction: string // 故障描述
malfunctionUrl: string // 故障图片 URL
description: string // 维修描述
remark: string // 备注
}
// MES 维修工单行 API
export const DvRepairLineApi = {
// 查询维修工单行分页
getRepairLinePage: async (params: any) => {
return await request.get({ url: `/mes/dv/repair-line/page`, params })
},
// 查询维修工单行详情
getRepairLine: async (id: number) => {
return await request.get({ url: `/mes/dv/repair-line/get?id=` + id })
},
// 新增维修工单行
createRepairLine: async (data: DvRepairLineVO) => {
return await request.post({ url: `/mes/dv/repair-line/create`, data })
},
// 修改维修工单行
updateRepairLine: async (data: DvRepairLineVO) => {
return await request.put({ url: `/mes/dv/repair-line/update`, data })
},
// 删除维修工单行
deleteRepairLine: async (id: number) => {
return await request.delete({ url: `/mes/dv/repair-line/delete?id=` + id })
}
}

View File

@ -9,19 +9,16 @@
>
<el-row>
<el-col :span="8">
<!-- DONE @AI这里抽成一个独立的 components 组件一定要按照我说的 -->
<el-form-item label="设备" prop="machineryId">
<DvMachinerySelect v-model="formData.machineryId" />
</el-form-item>
</el-col>
<el-col :span="8">
<!-- DONE @AI这里抽成一个独立的 components 组件一定要按照我说的 -->
<el-form-item label="保养计划" prop="planId">
<DvCheckPlanSelect v-model="formData.planId" />
</el-form-item>
</el-col>
<el-col :span="8">
<!-- DONE @AIuser-select 封装一个到 views/system/user/components -->
<el-form-item label="保养人" prop="userId">
<UserSelect v-model="formData.userId" placeholder="请选择保养人" />
</el-form-item>
@ -64,7 +61,6 @@ import DvMachinerySelect from '@/views/mes/dv/machinery/components/DvMachinerySe
import DvCheckPlanSelect from '@/views/mes/dv/checkplan/components/DvCheckPlanSelect.vue'
import UserSelect from '@/views/system/user/components/UserSelect.vue'
import MaintenRecordLineList from './MaintenRecordLineList.vue'
import { MesDvMaintenRecordStatusEnum } from '@/views/mes/utils/constants'
defineOptions({ name: 'MaintenRecordForm' })
@ -81,7 +77,6 @@ const formData = ref({
machineryId: undefined,
maintenTime: undefined,
userId: undefined,
status: MesDvMaintenRecordStatusEnum.PREPARE,
remark: ''
})
const formRules = reactive({
@ -142,7 +137,6 @@ const resetForm = () => {
machineryId: undefined,
maintenTime: undefined,
userId: undefined,
status: MesDvMaintenRecordStatusEnum.PREPARE,
remark: ''
}
formRef.value?.resetFields()

View File

@ -0,0 +1,205 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
<el-form
ref="formRef"
v-loading="formLoading"
:model="formData"
:rules="formRules"
label-width="100px"
>
<el-row>
<!-- TODO @ai生成 -->
<el-col :span="8">
<el-form-item label="维修单编码" prop="code">
<el-input v-model="formData.code" placeholder="请输入工单编码" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="维修单名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入工单名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备" prop="machineryId">
<DvMachinerySelect v-model="formData.machineryId" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="报修日期" prop="requireDate">
<el-date-picker
v-model="formData.requireDate"
type="datetime"
value-format="x"
placeholder="选择报修日期"
/>
</el-form-item>
</el-col>
<!-- TODO @AI维修完成日期往前放 -->
<!-- TODO @AI验收日期往前放 -->
<!-- TODO @AI保修结果往前放 -->
<el-col :span="8">
<el-form-item label="维修人" prop="acceptedUserId">
<UserSelect v-model="formData.acceptedUserId" placeholder="请选择维修人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="验收人" prop="confirmUserId">
<UserSelect v-model="formData.confirmUserId" placeholder="请选择验收人" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="维修完成日期" prop="finishDate">
<el-date-picker
v-model="formData.finishDate"
type="datetime"
value-format="x"
placeholder="选择完成日期"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="验收日期" prop="confirmDate">
<el-date-picker
v-model="formData.confirmDate"
type="datetime"
value-format="x"
placeholder="选择验收日期"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="维修结果" prop="result">
<el-select v-model="formData.result" placeholder="请选择维修结果" clearable>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_DV_REPAIR_RESULT)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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>
<RepairLineList :repair-id="formData.id" />
</template>
<template #footer>
<el-button :disabled="formLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { DvRepairApi } from '@/api/mes/dv/repair'
import DvMachinerySelect from '@/views/mes/dv/machinery/components/DvMachinerySelect.vue'
import UserSelect from '@/views/system/user/components/UserSelect.vue'
import RepairLineList from './RepairLineList.vue'
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
defineOptions({ name: 'RepairForm' })
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
code: '',
name: '',
machineryId: undefined,
requireDate: undefined,
finishDate: undefined,
confirmDate: undefined,
result: undefined,
acceptedUserId: undefined,
confirmUserId: undefined,
status: 10, // TODO @AI status
remark: ''
})
const formRules = reactive({
code: [{ required: true, message: '工单编码不能为空', trigger: 'blur' }],
machineryId: [{ required: true, message: '设备不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
/** 打开弹窗 */
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 DvRepairApi.getRepair(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
//
formLoading.value = true
try {
const data = formData.value as any
if (formType.value === 'create') {
await DvRepairApi.createRepair(data)
message.success(t('common.createSuccess'))
} else {
await DvRepairApi.updateRepair(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
code: '',
name: '',
machineryId: undefined,
requireDate: undefined,
finishDate: undefined,
confirmDate: undefined,
result: undefined,
acceptedUserId: undefined,
confirmUserId: undefined,
status: 10,
remark: ''
}
formRef.value?.resetFields()
}
</script>

View File

@ -0,0 +1,194 @@
<!-- MES 维修工单行列表 -->
<template>
<div>
<!-- 操作栏 -->
<el-row class="mb-10px" v-if="!disabled">
<el-button type="primary" plain @click="openForm('create')">
<Icon icon="ep:plus" class="mr-5px" /> 添加明细
</el-button>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="项目名称" align="center" prop="subjectName" />
<!-- TODO @AI故障描述故障描述资源维修情况往前放 -->
<el-table-column label="项目内容" align="center" prop="subjectContent" />
<el-table-column label="标准" align="center" prop="subjectStandard" />
<el-table-column label="故障描述" align="center" prop="malfunction" />
<el-table-column label="维修描述" align="center" prop="description" />
<el-table-column label="操作" align="center" width="130" v-if="!disabled">
<template #default="scope">
<el-button link type="primary" @click="openForm('update', scope.row)">编辑</el-button>
<el-button link type="danger" @click="handleDelete(scope.row.id)"></el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 表单弹窗添加/修改 -->
<Dialog :title="formTitle" v-model="formVisible" width="500px">
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
<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="malfunction">
<el-input v-model="formData.malfunction" type="textarea" placeholder="请输入故障描述" />
</el-form-item>
<el-form-item label="故障图片" prop="malfunctionUrl">
<el-input v-model="formData.malfunctionUrl" placeholder="请输入故障图片 URL" />
</el-form-item>
<el-form-item label="维修描述" prop="description">
<el-input v-model="formData.description" 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="formVisible = false"> </el-button>
<el-button type="primary" @click="submitForm" :loading="formLoading"> </el-button>
</template>
</Dialog>
</div>
</template>
<script setup lang="ts">
import { DvRepairLineApi } from '@/api/mes/dv/repair/line'
import { DvSubjectApi } from '@/api/mes/dv/subject'
defineOptions({ name: 'RepairLineList' })
const props = defineProps<{
repairId: number
disabled?: boolean
}>()
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(false) //
const list = ref([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
repairId: props.repairId
})
//
const formVisible = ref(false) //
const formTitle = ref('') //
const formLoading = ref(false) //
const formType = ref('') // create - update -
const formRef = ref() // Ref
const formData = ref<any>({}) //
const formRules = reactive({
malfunction: [{ required: true, message: '故障描述不能为空', trigger: 'blur' }]
})
const subjectOptions = ref<any[]>([]) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await DvRepairLineApi.getRepairLinePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 添加/修改操作 */
const openForm = async (type: string, row?: any) => {
formVisible.value = true
formTitle.value = type === 'create' ? '添加明细' : '编辑明细'
formType.value = type
if (type === 'create') {
formData.value = {
repairId: props.repairId,
subjectId: undefined,
malfunction: '',
malfunctionUrl: '',
description: '',
remark: ''
}
} else {
formData.value = { ...row }
if (row.subjectId) {
const subject = await DvSubjectApi.getSubject(row.subjectId)
if (subject) subjectOptions.value = [subject]
}
}
formRef.value?.resetFields()
}
/** 提交表单 */
const submitForm = async () => {
const valid = await formRef.value.validate()
if (!valid) return
formLoading.value = true
try {
if (formType.value === 'create') {
await DvRepairLineApi.createRepairLine(formData.value)
message.success(t('common.createSuccess'))
} else {
await DvRepairLineApi.updateRepairLine(formData.value)
message.success(t('common.updateSuccess'))
}
formVisible.value = false
await getList()
} finally {
formLoading.value = false
}
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await DvRepairLineApi.deleteRepairLine(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
/** 获取项目选项 */
const getSubjectOptions = async (query: string) => {
try {
const data = await DvSubjectApi.getSubjectPage({ name: query, pageNo: 1, pageSize: 20 })
subjectOptions.value = data.list
} catch {}
}
/** 监听工单编号变化 */
watch(
() => props.repairId,
(val) => {
if (val) {
queryParams.repairId = val
getList()
}
},
{ immediate: true }
)
</script>

View File

@ -0,0 +1,211 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="90px"
>
<!-- TODO @AI维修单编号 -->
<el-form-item label="工单编码" prop="code">
<el-input
v-model="queryParams.code"
placeholder="请输入工单编码"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<!-- TODO @AI维修单名称 -->
<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="machineryId">
<DvMachinerySelect v-model="queryParams.machineryId" class="!w-240px" />
</el-form-item>
<!-- TODO @AI:维修结果 -->
<!-- TODO @AI:单据状态 -->
<!-- TODO @AI报修日期不用这个字段 -->
<el-form-item label="报修日期" prop="requireDate">
<el-date-picker
v-model="queryParams.requireDate"
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-repair:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:dv-repair: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">
<!-- TODO @AI维修单编码 -->
<!-- TODO @AI维修单名称 -->
<el-table-column label="工单编码" align="center" prop="code" />
<el-table-column label="工单名称" align="center" prop="name" />
<el-table-column label="设备编码" align="center" prop="machineryCode" />
<el-table-column label="设备名称" align="center" prop="machineryName" />
<!-- TODO @AI:保修日期 -->
<!-- TODO @AI:保修完成日期 -->
<!-- TODO @AI:验收日期 -->
<!-- TODO @AI:维修结果 -->
<el-table-column label="维修人员" align="center" prop="acceptedUserNickname" />
<el-table-column label="验收人员" align="center" prop="acceptedUserNickname" />
<el-table-column label="单据状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_DV_REPAIR_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:dv-repair:update']"
>
编辑
</el-button>
<!-- TODO @AI通过 -->
<!-- TODO @AI不通过 -->
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:dv-repair: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>
<!-- 表单弹窗 -->
<RepairForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { DvRepairApi } from '@/api/mes/dv/repair'
import RepairForm from './RepairForm.vue'
import DvMachinerySelect from '@/views/mes/dv/machinery/components/DvMachinerySelect.vue'
import { DICT_TYPE } from '@/utils/dict'
defineOptions({ name: 'MesDvRepair' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
name: undefined,
machineryId: undefined,
requireDate: []
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await DvRepairApi.getRepairPage(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 DvRepairApi.deleteRepair(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
await message.exportConfirm()
exportLoading.value = true
const data = await DvRepairApi.exportRepair(queryParams)
download.excel(data, '维修工单.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>