✨ feat(mes): 更新维修工单流程及状态管理
新增维修工单提交、确认和完成验收功能，优化状态流转逻辑。 - 提交维修工单时记录当前用户 - 完成维修后更新状态为待验收 - 完成验收时支持通过与不通过的结果记录 确保维修工单的状态管理更加清晰，提升用户体验pull/871/MERGE
YunaiV
parent
1005ec0eb6
commit
86e8d62213
|
|
@ -62,18 +62,13 @@ export const DvRepairApi = {
|
|||
return await request.put({ url: `/mes/dv/repair/submit?id=` + id })
|
||||
},
|
||||
|
||||
// 完成维修（维修中→待验收）
|
||||
finishRepair: async (id: number) => {
|
||||
return await request.put({ url: `/mes/dv/repair/finish?id=` + id })
|
||||
},
|
||||
|
||||
// 验收通过（待验收→已确认）
|
||||
// 确认维修完成（维修中→待验收）
|
||||
confirmRepair: async (id: number) => {
|
||||
return await request.put({ url: `/mes/dv/repair/confirm?id=` + id })
|
||||
},
|
||||
|
||||
// 验收不通过（待验收→已确认）
|
||||
rejectRepair: async (id: number) => {
|
||||
return await request.put({ url: `/mes/dv/repair/reject?id=` + id })
|
||||
// 完成验收（待验收→已确认）
|
||||
finishRepair: async (id: number, result: number) => {
|
||||
return await request.put({ url: `/mes/dv/repair/finish?id=` + id + `&result=` + result })
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,7 +73,6 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<!-- 维修结果：维修中及之后显示 -->
|
||||
<el-col :span="8" v-if="showFinishFields">
|
||||
<el-form-item label="维修结果" prop="result">
|
||||
<el-select v-model="formData.result" placeholder="请选择维修结果" clearable disabled>
|
||||
|
|
@ -86,7 +85,6 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- 维修人：维修中及之后显示（自动设置，只读） -->
|
||||
<el-col :span="8" v-if="showFinishFields">
|
||||
<el-form-item label="维修人" prop="acceptedUserId">
|
||||
<UserSelect
|
||||
|
|
@ -96,7 +94,6 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- 验收人：待验收及之后显示（自动设置，只读） -->
|
||||
<el-col :span="8" v-if="showConfirmFields">
|
||||
<el-form-item label="验收人" prop="confirmUserId">
|
||||
<UserSelect
|
||||
|
|
@ -129,6 +126,38 @@
|
|||
<el-button v-if="isEditable" @click="submitForm" type="primary" :disabled="formLoading">
|
||||
保 存
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="formType === 'update'"
|
||||
@click="handleSubmit"
|
||||
type="success"
|
||||
:disabled="formLoading"
|
||||
>
|
||||
提 交
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="formType === 'confirm'"
|
||||
@click="handleConfirm"
|
||||
type="primary"
|
||||
:disabled="formLoading"
|
||||
>
|
||||
完成维修
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="formType === 'finish'"
|
||||
@click="handleFinish(MesDvRepairResultEnum.PASS)"
|
||||
type="success"
|
||||
:disabled="formLoading"
|
||||
>
|
||||
通 过
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="formType === 'finish'"
|
||||
@click="handleFinish(MesDvRepairResultEnum.FAIL)"
|
||||
type="warning"
|
||||
:disabled="formLoading"
|
||||
>
|
||||
不通过
|
||||
</el-button>
|
||||
<el-button @click="dialogVisible = false">关 闭</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
|
|
@ -141,7 +170,11 @@ import DvMachinerySelect from '@/views/mes/dv/machinery/components/DvMachinerySe
|
|||
import UserSelect from '@/views/system/user/components/UserSelect.vue'
|
||||
import RepairLineList from './RepairLineList.vue'
|
||||
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||
import { MesAutoCodeRuleCode, MesDvRepairStatusEnum } from '@/views/mes/utils/constants'
|
||||
import {
|
||||
MesAutoCodeRuleCode,
|
||||
MesDvRepairStatusEnum,
|
||||
MesDvRepairResultEnum
|
||||
} from '@/views/mes/utils/constants'
|
||||
|
||||
defineOptions({ name: 'RepairForm' })
|
||||
const emit = defineEmits(['success'])
|
||||
|
|
@ -149,20 +182,20 @@ const emit = defineEmits(['success'])
|
|||
const message = useMessage() // 消息弹窗
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const formLoading = ref(false) // 表单的加载中
|
||||
const formType = ref<string>('create') // 表单类型：create / update / detail
|
||||
const formType = ref<string>('create') // 表单类型：create / update / confirm / finish / detail
|
||||
const isEditable = computed(() => ['create', 'update'].includes(formType.value)) // 是否为编辑模式
|
||||
const isDetail = computed(() => formType.value === 'detail') // 是否为详情模式
|
||||
const isHeaderReadonly = computed(() => formType.value === 'detail') // 是否只读
|
||||
const isDetail = computed(() => !isEditable.value) // 是否为详情模式（confirm/finish/detail 均只读）
|
||||
const isHeaderReadonly = computed(() => !isEditable.value) // 是否只读
|
||||
|
||||
// 根据状态控制 4 状态字段显隐 TODO @AI；注释在字段后面，对齐上面的标准
|
||||
const showFinishFields = computed(() => {
|
||||
// DONE @AI；注释在字段后面，对齐上面的标准
|
||||
const showFinishFields = computed(() => { // 维修中(1)及之后显示
|
||||
const status = formData.value.status
|
||||
if (status == null) {
|
||||
return false
|
||||
}
|
||||
return status >= MesDvRepairStatusEnum.CONFIRMED
|
||||
})
|
||||
const showConfirmFields = computed(() => {
|
||||
const showConfirmFields = computed(() => { // 待验收(2)及之后显示
|
||||
const status = formData.value.status
|
||||
if (status == null) {
|
||||
return false
|
||||
|
|
@ -174,6 +207,8 @@ const dialogTitle = computed(() => {
|
|||
const titles: Record<string, string> = {
|
||||
create: '新增维修工单',
|
||||
update: '编辑维修工单',
|
||||
confirm: '完成维修',
|
||||
finish: '验收',
|
||||
detail: '维修工单详情'
|
||||
}
|
||||
return titles[formType.value] || formType.value
|
||||
|
|
@ -194,7 +229,8 @@ const formData = ref({
|
|||
})
|
||||
const formRules = reactive({
|
||||
code: [{ required: true, message: '维修单编码不能为空', trigger: 'blur' }],
|
||||
machineryId: [{ required: true, message: '设备不能为空', trigger: 'blur' }]
|
||||
machineryId: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
|
||||
requireDate: [{ required: true, message: '报修日期不能为空', trigger: 'blur' }]
|
||||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
|
||||
|
|
@ -210,7 +246,7 @@ const open = async (type: string, id?: number) => {
|
|||
dialogVisible.value = true
|
||||
formType.value = type
|
||||
resetForm()
|
||||
// 修改/详情时，加载数据
|
||||
// 修改/完成维修/验收/详情时，加载数据
|
||||
if (id) {
|
||||
formLoading.value = true
|
||||
try {
|
||||
|
|
@ -221,6 +257,7 @@ const open = async (type: string, id?: number) => {
|
|||
}
|
||||
}
|
||||
|
||||
// DONE @AI：对齐，是不是应该直接 close 的？
|
||||
/** 提交表单（create/update 模式） */
|
||||
const submitForm = async () => {
|
||||
await formRef.value.validate()
|
||||
|
|
@ -228,23 +265,65 @@ const submitForm = async () => {
|
|||
try {
|
||||
const data = formData.value as any
|
||||
if (formType.value === 'create') {
|
||||
const res = await DvRepairApi.createRepair(data)
|
||||
await DvRepairApi.createRepair(data)
|
||||
message.success('新增成功')
|
||||
// 创建成功后，更新表单数据和状态为编辑模式
|
||||
// TODO @AI：对齐，是不是应该直接 close 的？
|
||||
formData.value.id = res
|
||||
formData.value.status = MesDvRepairStatusEnum.PREPARE
|
||||
formType.value = 'update'
|
||||
} else {
|
||||
await DvRepairApi.updateRepair(data)
|
||||
message.success('修改成功')
|
||||
}
|
||||
dialogVisible.value = false
|
||||
emit('success')
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 提交维修工单（草稿→维修中） */
|
||||
const handleSubmit = async () => {
|
||||
try {
|
||||
await message.confirm('确认提交该维修工单？提交后将进入维修中状态')
|
||||
formLoading.value = true
|
||||
await DvRepairApi.submitRepair(formData.value.id!)
|
||||
message.success('提交成功')
|
||||
dialogVisible.value = false
|
||||
emit('success')
|
||||
} catch {
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 确认维修完成（维修中→待验收） */
|
||||
const handleConfirm = async () => {
|
||||
try {
|
||||
await message.confirm('确认完成维修？完成后将进入待验收状态')
|
||||
formLoading.value = true
|
||||
await DvRepairApi.confirmRepair(formData.value.id!)
|
||||
message.success('操作成功')
|
||||
dialogVisible.value = false
|
||||
emit('success')
|
||||
} catch {
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 完成验收（待验收→已确认） */
|
||||
const handleFinish = async (result: number) => {
|
||||
const label = result === MesDvRepairResultEnum.PASS ? '通过' : '不通过'
|
||||
try {
|
||||
await message.confirm(`确认验收${label}该维修工单？`)
|
||||
formLoading.value = true
|
||||
await DvRepairApi.finishRepair(formData.value.id!, result)
|
||||
message.success(`验收${label}`)
|
||||
dialogVisible.value = false
|
||||
emit('success')
|
||||
} catch {
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
|
|
|
|||
|
|
@ -131,8 +131,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="220" fixed="right">
|
||||
<template #default="scope">
|
||||
<!-- 草稿：编辑、提交、删除 -->
|
||||
<!-- TODO @AI：MesDvRepairStatusEnum 枚举缺失；在 mes constant 里； -->
|
||||
<!-- 草稿：编辑、删除 -->
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
|
|
@ -142,16 +141,6 @@
|
|||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<!-- TODO @AI：提交融合到【编辑】弹窗里？ -->
|
||||
<el-button
|
||||
link
|
||||
type="success"
|
||||
@click="handleSubmit(scope.row.id)"
|
||||
v-hasPermi="['mes:dv-repair:update']"
|
||||
v-if="scope.row.status === MesDvRepairStatusEnum.PREPARE"
|
||||
>
|
||||
提交
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
|
|
@ -162,35 +151,24 @@
|
|||
删除
|
||||
</el-button>
|
||||
<!-- 维修中：完成维修 -->
|
||||
<!-- TODO @AI：提交融合到【编辑】弹窗里？ -->
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="handleFinish(scope.row.id)"
|
||||
@click="openForm('confirm', scope.row.id)"
|
||||
v-hasPermi="['mes:dv-repair:update']"
|
||||
v-if="scope.row.status === MesDvRepairStatusEnum.CONFIRMED"
|
||||
>
|
||||
完成维修
|
||||
</el-button>
|
||||
<!-- 待验收：通过、不通过 -->
|
||||
<!-- TODO @AI：提交融合到【编辑】弹窗里？改成叫“验收”，然后里面是通过、不通过？ -->
|
||||
<!-- 待验收：验收 -->
|
||||
<el-button
|
||||
link
|
||||
type="success"
|
||||
@click="handleConfirm(scope.row.id)"
|
||||
@click="openForm('finish', scope.row.id)"
|
||||
v-hasPermi="['mes:dv-repair:update']"
|
||||
v-if="scope.row.status === MesDvRepairStatusEnum.APPROVING"
|
||||
>
|
||||
验收通过
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="warning"
|
||||
@click="handleReject(scope.row.id)"
|
||||
v-hasPermi="['mes:dv-repair:update']"
|
||||
v-if="scope.row.status === MesDvRepairStatusEnum.APPROVING"
|
||||
>
|
||||
不通过
|
||||
验收
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -262,51 +240,11 @@ const resetQuery = () => {
|
|||
handleQuery()
|
||||
}
|
||||
|
||||
/** 添加/修改/详情操作 */
|
||||
/** 添加/修改/详情/完成维修/验收操作 */
|
||||
const openForm = (type: string, id?: number) => {
|
||||
formRef.value.open(type, id)
|
||||
}
|
||||
|
||||
/** 提交按钮操作 */
|
||||
const handleSubmit = async (id: number) => {
|
||||
try {
|
||||
await message.confirm('确认提交该维修工单？提交后将进入维修中状态')
|
||||
await DvRepairApi.submitRepair(id)
|
||||
message.success('提交成功')
|
||||
await getList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
/** 完成维修按钮操作 */
|
||||
const handleFinish = async (id: number) => {
|
||||
try {
|
||||
await message.confirm('确认完成维修？完成后将进入待验收状态')
|
||||
await DvRepairApi.finishRepair(id)
|
||||
message.success('操作成功')
|
||||
await getList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
/** 验收通过按钮操作 */
|
||||
const handleConfirm = async (id: number) => {
|
||||
try {
|
||||
await message.confirm('确认验收通过该维修工单？')
|
||||
await DvRepairApi.confirmRepair(id)
|
||||
message.success('验收通过')
|
||||
await getList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
/** 验收不通过按钮操作 */
|
||||
const handleReject = async (id: number) => {
|
||||
try {
|
||||
await message.confirm('确认验收不通过该维修工单？')
|
||||
await DvRepairApi.rejectRepair(id)
|
||||
message.success('操作成功')
|
||||
await getList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
/** 删除按钮操作 */
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -106,21 +106,6 @@ export const MesDvMaintenStatusEnum = {
|
|||
ABNORMAL: 2 // 异常
|
||||
}
|
||||
|
||||
/** MES 维修工单状态枚举（值对应 MesOrderStatusConstants） */
|
||||
export const MesDvRepairStatusEnum = {
|
||||
// TODO @AI：是不是应该对齐 MesOrderStatusConstants
|
||||
PREPARE: 0, // 草稿
|
||||
CONFIRMED: 1, // 维修中
|
||||
APPROVING: 2, // 待验收
|
||||
FINISHED: 4 // 已确认（终态）
|
||||
}
|
||||
|
||||
/** MES 维修结果枚举（对应字典 mes_dv_repair_result） */
|
||||
export const MesDvRepairResultEnum = {
|
||||
PASS: 1, // 通过
|
||||
FAIL: 2 // 不通过
|
||||
}
|
||||
|
||||
/** MES 设备点检记录状态枚举 */
|
||||
export const MesDvCheckRecordStatusEnum = {
|
||||
DRAFT: 10, // 草稿
|
||||
|
|
@ -187,6 +172,20 @@ export const MesOrderStatusConstants = {
|
|||
CANCELLED: 5
|
||||
} as const
|
||||
|
||||
/** MES 维修工单状态枚举 */
|
||||
export const MesDvRepairStatusEnum = {
|
||||
PREPARE: MesOrderStatusConstants.DRAFT, // 草稿
|
||||
CONFIRMED: MesOrderStatusConstants.CONFIRMED, // 维修中
|
||||
APPROVING: MesOrderStatusConstants.APPROVING, // 待验收
|
||||
FINISHED: MesOrderStatusConstants.FINISHED // 已确认（终态）
|
||||
}
|
||||
|
||||
/** MES 维修结果枚举（对应字典 mes_dv_repair_result） */
|
||||
export const MesDvRepairResultEnum = {
|
||||
PASS: 1, // 通过
|
||||
FAIL: 2 // 不通过
|
||||
}
|
||||
|
||||
/** MES 质检单状态枚举 */
|
||||
export const MesQcStatusEnum = {
|
||||
DRAFT: MesOrderStatusConstants.DRAFT,
|
||||
|
|
|
|||
Loading…
Reference in New Issue