✨ feat(mes): 新增维修工单状态流转功能
实现维修工单的状态流转，包括提交、完成维修和验收功能。新增相关接口和状态枚举，优化了维修工单的管理流程，确保状态的准确性和一致性。pull/871/MERGE
YunaiV
parent
7999232771
commit
1005ec0eb6
|
|
@ -57,12 +57,22 @@ export const DvRepairApi = {
|
|||
return await request.download({ url: `/mes/dv/repair/export-excel`, params })
|
||||
},
|
||||
|
||||
// 通过维修工单
|
||||
// 提交维修工单（草稿→维修中）
|
||||
submitRepair: async (id: number) => {
|
||||
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 })
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,18 +49,18 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-col :span="8" v-if="showFinishFields">
|
||||
<el-form-item label="维修完成日期" prop="finishDate">
|
||||
<el-date-picker
|
||||
v-model="formData.finishDate"
|
||||
type="datetime"
|
||||
value-format="x"
|
||||
placeholder="选择完成日期"
|
||||
:disabled="isHeaderReadonly"
|
||||
disabled
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-col :span="8" v-if="showConfirmFields">
|
||||
<el-form-item label="验收日期" prop="confirmDate">
|
||||
<el-date-picker
|
||||
v-model="formData.confirmDate"
|
||||
|
|
@ -73,7 +73,8 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<!-- 维修结果：维修中及之后显示 -->
|
||||
<el-col :span="8" v-if="showFinishFields">
|
||||
<el-form-item label="维修结果" prop="result">
|
||||
<el-select v-model="formData.result" placeholder="请选择维修结果" clearable disabled>
|
||||
<el-option
|
||||
|
|
@ -85,21 +86,23 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<!-- 维修人：维修中及之后显示（自动设置，只读） -->
|
||||
<el-col :span="8" v-if="showFinishFields">
|
||||
<el-form-item label="维修人" prop="acceptedUserId">
|
||||
<UserSelect
|
||||
v-model="formData.acceptedUserId"
|
||||
placeholder="请选择维修人"
|
||||
:disabled="isHeaderReadonly"
|
||||
disabled
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<!-- 验收人：待验收及之后显示（自动设置，只读） -->
|
||||
<el-col :span="8" v-if="showConfirmFields">
|
||||
<el-form-item label="验收人" prop="confirmUserId">
|
||||
<UserSelect
|
||||
v-model="formData.confirmUserId"
|
||||
placeholder="请选择验收人"
|
||||
:disabled="isHeaderReadonly"
|
||||
disabled
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -126,12 +129,6 @@
|
|||
<el-button v-if="isEditable" @click="submitForm" type="primary" :disabled="formLoading">
|
||||
保 存
|
||||
</el-button>
|
||||
<el-button v-if="isConfirm" @click="handleConfirm" type="success" :disabled="formLoading">
|
||||
通 过
|
||||
</el-button>
|
||||
<el-button v-if="isReject" @click="handleReject" type="warning" :disabled="formLoading">
|
||||
不通过
|
||||
</el-button>
|
||||
<el-button @click="dialogVisible = false">关 闭</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
|
|
@ -152,18 +149,31 @@ const emit = defineEmits(['success'])
|
|||
const message = useMessage() // 消息弹窗
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const formLoading = ref(false) // 表单的加载中
|
||||
const formType = ref<string>('create') // 表单类型：create / update / confirm / reject / detail
|
||||
const formType = ref<string>('create') // 表单类型：create / update / detail
|
||||
const isEditable = computed(() => ['create', 'update'].includes(formType.value)) // 是否为编辑模式
|
||||
const isConfirm = computed(() => formType.value === 'confirm') // 是否为通过模式
|
||||
const isReject = computed(() => formType.value === 'reject') // 是否为不通过模式
|
||||
const isDetail = computed(() => ['detail', 'confirm', 'reject'].includes(formType.value)) // 是否为详情模式
|
||||
const isHeaderReadonly = computed(() => ['confirm', 'reject', 'detail'].includes(formType.value)) // 是否只读
|
||||
const isDetail = computed(() => formType.value === 'detail') // 是否为详情模式
|
||||
const isHeaderReadonly = computed(() => formType.value === 'detail') // 是否只读
|
||||
|
||||
// 根据状态控制 4 状态字段显隐 TODO @AI；注释在字段后面，对齐上面的标准
|
||||
const showFinishFields = computed(() => {
|
||||
const status = formData.value.status
|
||||
if (status == null) {
|
||||
return false
|
||||
}
|
||||
return status >= MesDvRepairStatusEnum.CONFIRMED
|
||||
})
|
||||
const showConfirmFields = computed(() => {
|
||||
const status = formData.value.status
|
||||
if (status == null) {
|
||||
return false
|
||||
}
|
||||
return status >= MesDvRepairStatusEnum.APPROVING
|
||||
})
|
||||
|
||||
const dialogTitle = computed(() => {
|
||||
const titles: Record<string, string> = {
|
||||
create: '新增维修工单',
|
||||
update: '编辑维修工单',
|
||||
confirm: '通过维修工单',
|
||||
reject: '不通过维修工单',
|
||||
detail: '维修工单详情'
|
||||
}
|
||||
return titles[formType.value] || formType.value
|
||||
|
|
@ -200,7 +210,7 @@ const open = async (type: string, id?: number) => {
|
|||
dialogVisible.value = true
|
||||
formType.value = type
|
||||
resetForm()
|
||||
// 修改/通过/不通过/详情时，加载数据
|
||||
// 修改/详情时，加载数据
|
||||
if (id) {
|
||||
formLoading.value = true
|
||||
try {
|
||||
|
|
@ -221,8 +231,9 @@ const submitForm = async () => {
|
|||
const res = await DvRepairApi.createRepair(data)
|
||||
message.success('新增成功')
|
||||
// 创建成功后，更新表单数据和状态为编辑模式
|
||||
// TODO @AI：对齐，是不是应该直接 close 的？
|
||||
formData.value.id = res
|
||||
formData.value.status = MesDvRepairStatusEnum.DRAFT
|
||||
formData.value.status = MesDvRepairStatusEnum.PREPARE
|
||||
formType.value = 'update'
|
||||
} else {
|
||||
await DvRepairApi.updateRepair(data)
|
||||
|
|
@ -234,36 +245,6 @@ const submitForm = async () => {
|
|||
}
|
||||
}
|
||||
|
||||
/** 通过操作 */
|
||||
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 handleReject = async () => {
|
||||
try {
|
||||
await message.confirm('确认不通过该维修工单吗？')
|
||||
formLoading.value = true
|
||||
await DvRepairApi.rejectRepair(formData.value.id!)
|
||||
message.success('操作成功')
|
||||
dialogVisible.value = false
|
||||
emit('success')
|
||||
} catch {
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
|
|
|
|||
|
|
@ -117,7 +117,12 @@
|
|||
<dict-tag :type="DICT_TYPE.MES_DV_REPAIR_RESULT" :value="scope.row.result" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="维修人员" align="center" prop="acceptedUserNickname" min-width="100" />
|
||||
<el-table-column
|
||||
label="维修人员"
|
||||
align="center"
|
||||
prop="acceptedUserNickname"
|
||||
min-width="100"
|
||||
/>
|
||||
<el-table-column label="验收人员" align="center" prop="confirmUserNickname" min-width="100" />
|
||||
<el-table-column label="单据状态" align="center" prop="status" min-width="100">
|
||||
<template #default="scope">
|
||||
|
|
@ -126,43 +131,67 @@
|
|||
</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"
|
||||
@click="openForm('update', scope.row.id)"
|
||||
v-hasPermi="['mes:dv-repair:update']"
|
||||
v-if="scope.row.status === MesDvRepairStatusEnum.DRAFT"
|
||||
v-if="scope.row.status === MesDvRepairStatusEnum.PREPARE"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<!-- TODO @AI：提交融合到【编辑】弹窗里？ -->
|
||||
<el-button
|
||||
link
|
||||
type="success"
|
||||
@click="openForm('confirm', scope.row.id)"
|
||||
@click="handleSubmit(scope.row.id)"
|
||||
v-hasPermi="['mes:dv-repair:update']"
|
||||
v-if="scope.row.status === MesDvRepairStatusEnum.DRAFT"
|
||||
v-if="scope.row.status === MesDvRepairStatusEnum.PREPARE"
|
||||
>
|
||||
通过
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="warning"
|
||||
@click="openForm('reject', scope.row.id)"
|
||||
v-hasPermi="['mes:dv-repair:update']"
|
||||
v-if="scope.row.status === MesDvRepairStatusEnum.DRAFT"
|
||||
>
|
||||
不通过
|
||||
提交
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
@click="handleDelete(scope.row.id)"
|
||||
v-hasPermi="['mes:dv-repair:delete']"
|
||||
v-if="scope.row.status === MesDvRepairStatusEnum.DRAFT"
|
||||
v-if="scope.row.status === MesDvRepairStatusEnum.PREPARE"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
<!-- 维修中：完成维修 -->
|
||||
<!-- TODO @AI：提交融合到【编辑】弹窗里？ -->
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="handleFinish(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)"
|
||||
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>
|
||||
</el-table>
|
||||
|
|
@ -233,11 +262,51 @@ 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,10 +106,13 @@ export const MesDvMaintenStatusEnum = {
|
|||
ABNORMAL: 2 // 异常
|
||||
}
|
||||
|
||||
/** MES 维修工单状态枚举 */
|
||||
/** MES 维修工单状态枚举（值对应 MesOrderStatusConstants） */
|
||||
export const MesDvRepairStatusEnum = {
|
||||
DRAFT: 10, // 草稿
|
||||
CONFIRMED: 20 // 已确认
|
||||
// TODO @AI：是不是应该对齐 MesOrderStatusConstants
|
||||
PREPARE: 0, // 草稿
|
||||
CONFIRMED: 1, // 维修中
|
||||
APPROVING: 2, // 待验收
|
||||
FINISHED: 4 // 已确认（终态）
|
||||
}
|
||||
|
||||
/** MES 维修结果枚举（对应字典 mes_dv_repair_result） */
|
||||
|
|
|
|||
Loading…
Reference in New Issue