feat(mes): 更新保养记录状态值及表单操作逻辑

调整保养记录状态值,确保状态与操作逻辑一致。新增表单提交功能,允许在编辑模式下提交保养记录,优化用户体验。
pull/871/MERGE
YunaiV 2026-04-03 22:54:27 +08:00
parent efdb18c05b
commit a8e68c155a
2 changed files with 81 additions and 51 deletions

View File

@ -50,11 +50,18 @@
<MaintenRecordLineList :record-id="formData.id" :disabled="isDetail" /> <MaintenRecordLineList :record-id="formData.id" :disabled="isDetail" />
</template> </template>
<template #footer> <template #footer>
<el-button v-if="!isDetail" :disabled="formLoading" type="primary" @click="submitForm"> <el-button v-if="isEditable" :disabled="formLoading" type="primary" @click="submitForm">
</el-button> </el-button>
<!-- TODO @AI所有 isDetail ? '关 闭' : '取 消'这种都改成 --> <el-button
<el-button @click="dialogVisible = false">{{ isDetail ? '关 闭' : '取 消' }}</el-button> v-if="isEditable && formData.status === MesDvMaintenRecordStatusEnum.PREPARE"
:disabled="formLoading"
type="warning"
@click="handleSubmit"
>
</el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template> </template>
</Dialog> </Dialog>
</template> </template>
@ -66,24 +73,35 @@ import DvCheckPlanSelect from '@/views/mes/dv/checkplan/components/DvCheckPlanSe
import UserSelect from '@/views/system/user/components/UserSelect.vue' import UserSelect from '@/views/system/user/components/UserSelect.vue'
import MaintenRecordLineList from './MaintenRecordLineList.vue' import MaintenRecordLineList from './MaintenRecordLineList.vue'
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import { MesDvMaintenRecordStatusEnum } from '@/views/mes/utils/constants'
defineOptions({ name: 'MaintenRecordForm' }) defineOptions({ name: 'MaintenRecordForm' })
const emit = defineEmits(['success'])
const { t } = useI18n() //
const message = useMessage() // const message = useMessage() //
const { t } = useI18n() //
const userStore = useUserStore() const userStore = useUserStore()
const dialogVisible = ref(false) // const dialogVisible = ref(false) //
const dialogTitle = ref('') // const formLoading = ref(false) //
const formLoading = ref(false) // 12 const formType = ref<string>('create') // 表单的类型create / update / detail
const formType = ref('') // create - update - detail - const isEditable = computed(() => ['create', 'update'].includes(formType.value)) //
const isDetail = computed(() => formType.value === 'detail') // const isDetail = computed(() => formType.value === 'detail') //
const dialogTitle = computed(() => {
const titles: Record<string, string> = {
create: '新增保养记录',
update: '编辑保养记录',
detail: '保养记录详情'
}
return titles[formType.value] || formType.value
})
const formData = ref({ const formData = ref({
id: undefined, id: undefined as number | undefined,
planId: undefined, planId: undefined,
machineryId: undefined, machineryId: undefined,
maintenTime: undefined, maintenTime: undefined,
userId: undefined, userId: undefined,
status: undefined as number | undefined,
remark: '' remark: ''
}) })
const formRules = reactive({ const formRules = reactive({
@ -91,11 +109,11 @@ const formRules = reactive({
maintenTime: [{ required: true, message: '保养时间不能为空', trigger: 'blur' }] maintenTime: [{ required: true, message: '保养时间不能为空', trigger: 'blur' }]
}) })
const formRef = ref() // Ref const formRef = ref() // Ref
const originalFormData = ref<string>('') //
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number) => { const open = async (type: string, id?: number) => {
dialogVisible.value = true dialogVisible.value = true
dialogTitle.value = type === 'detail' ? '保养记录详情' : t('action.' + type)
formType.value = type formType.value = type
resetForm() resetForm()
// / // /
@ -111,28 +129,31 @@ const open = async (type: string, id?: number) => {
if (type === 'create') { if (type === 'create') {
formData.value.userId = userStore.getUser.id formData.value.userId = userStore.getUser.id
} }
//
originalFormData.value = JSON.stringify(formData.value)
} }
defineExpose({ open }) // open
/** 提交表单 */ /** 提交表单create/update 模式) */
const emit = defineEmits(['success']) // success
const submitForm = async () => { const submitForm = async () => {
// //
if (!formRef) return await formRef.value.validate()
const valid = await formRef.value.validate()
if (!valid) return
// //
formLoading.value = true formLoading.value = true
try { try {
const data = formData.value as any const data = formData.value as any
if (formType.value === 'create') { if (formType.value === 'create') {
await DvMaintenRecordApi.createMaintenRecord(data) const res = await DvMaintenRecordApi.createMaintenRecord(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
//
formData.value.id = res
formData.value.status = MesDvMaintenRecordStatusEnum.PREPARE
formType.value = 'update'
} else { } else {
await DvMaintenRecordApi.updateMaintenRecord(data) await DvMaintenRecordApi.updateMaintenRecord(data)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }
dialogVisible.value = false //
originalFormData.value = JSON.stringify(formData.value)
// //
emit('success') emit('success')
} finally { } finally {
@ -140,6 +161,29 @@ const submitForm = async () => {
} }
} }
/** 提交操作:表单修改过则先保存,再提交 */
const handleSubmit = async () => {
//
await formRef.value.validate()
try {
await message.confirm('确认提交该保养记录?【提交后将不能修改】')
formLoading.value = true
// 1.
if (JSON.stringify(formData.value) !== originalFormData.value) {
const data = formData.value as any
await DvMaintenRecordApi.updateMaintenRecord(data)
}
// 2.
await DvMaintenRecordApi.submitMaintenRecord(formData.value.id!)
message.success('提交成功')
dialogVisible.value = false
emit('success')
} catch {
} finally {
formLoading.value = false
}
}
/** 重置表单 */ /** 重置表单 */
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
@ -148,8 +192,11 @@ const resetForm = () => {
machineryId: undefined, machineryId: undefined,
maintenTime: undefined, maintenTime: undefined,
userId: undefined, userId: undefined,
status: undefined,
remark: '' remark: ''
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
defineExpose({ open })
</script> </script>

View File

@ -55,8 +55,13 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<!-- TODO @AI增加一个查看操作设备编码 --> <el-table-column label="设备编码" align="center" prop="machineryCode" min-width="160">
<el-table-column label="设备编码" align="center" prop="machineryCode" /> <template #default="scope">
<el-button link type="primary" @click="openForm('detail', scope.row.id)">
{{ scope.row.machineryCode }}
</el-button>
</template>
</el-table-column>
<el-table-column label="设备名称" align="center" prop="machineryName" /> <el-table-column label="设备名称" align="center" prop="machineryName" />
<el-table-column label="品牌" align="center" prop="machineryBrand" /> <el-table-column label="品牌" align="center" prop="machineryBrand" />
<el-table-column label="规格型号" align="center" prop="machinerySpec" /> <el-table-column label="规格型号" align="center" prop="machinerySpec" />
@ -74,36 +79,24 @@
<dict-tag :type="DICT_TYPE.MES_MAINTEN_RECORD_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.MES_MAINTEN_RECORD_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="160" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="openForm('detail', scope.row.id)"> <!-- 草稿编辑删除 -->
查看
</el-button>
<el-button <el-button
link link
type="primary" type="primary"
@click="openForm('update', scope.row.id)" @click="openForm('update', scope.row.id)"
v-if="scope.row.status === MesDvMaintenRecordStatusEnum.PREPARE"
v-hasPermi="['mes:dv-mainten-record:update']" v-hasPermi="['mes:dv-mainten-record:update']"
v-if="scope.row.status === MesDvMaintenRecordStatusEnum.PREPARE"
> >
编辑 编辑
</el-button> </el-button>
<!-- TODO @AI提交融合到编辑弹窗里 -->
<el-button
link
type="success"
@click="handleSubmit(scope.row)"
v-if="scope.row.status === MesDvMaintenRecordStatusEnum.PREPARE"
v-hasPermi="['mes:dv-mainten-record:update']"
>
提交
</el-button>
<el-button <el-button
link link
type="danger" type="danger"
@click="handleDelete(scope.row.id)" @click="handleDelete(scope.row.id)"
v-if="scope.row.status === MesDvMaintenRecordStatusEnum.PREPARE"
v-hasPermi="['mes:dv-mainten-record:delete']" v-hasPermi="['mes:dv-mainten-record:delete']"
v-if="scope.row.status === MesDvMaintenRecordStatusEnum.PREPARE"
> >
删除 删除
</el-button> </el-button>
@ -125,13 +118,13 @@
<script setup lang="ts"> <script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import { DICT_TYPE } from '@/utils/dict'
import download from '@/utils/download' import download from '@/utils/download'
import { DvMaintenRecordApi } from '@/api/mes/dv/maintenrecord' import { DvMaintenRecordApi } from '@/api/mes/dv/maintenrecord'
import MaintenRecordForm from './MaintenRecordForm.vue'
import DvMachinerySelect from '@/views/mes/dv/machinery/components/DvMachinerySelect.vue' import DvMachinerySelect from '@/views/mes/dv/machinery/components/DvMachinerySelect.vue'
import DvCheckPlanSelect from '@/views/mes/dv/checkplan/components/DvCheckPlanSelect.vue' import DvCheckPlanSelect from '@/views/mes/dv/checkplan/components/DvCheckPlanSelect.vue'
import UserSelect from '@/views/system/user/components/UserSelect.vue' import UserSelect from '@/views/system/user/components/UserSelect.vue'
import { DICT_TYPE } from '@/utils/dict' import MaintenRecordForm from './MaintenRecordForm.vue'
import { MesDvMaintenRecordStatusEnum } from '@/views/mes/utils/constants' import { MesDvMaintenRecordStatusEnum } from '@/views/mes/utils/constants'
defineOptions({ name: 'MesDvMaintenRecord' }) defineOptions({ name: 'MesDvMaintenRecord' })
@ -142,6 +135,7 @@ const { t } = useI18n() // 国际化
const loading = ref(true) // const loading = ref(true) //
const list = ref([]) // const list = ref([]) //
const total = ref(0) // const total = ref(0) //
const exportLoading = ref(false) //
const queryParams = reactive({ const queryParams = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
@ -151,7 +145,7 @@ const queryParams = reactive({
maintenTime: [] maintenTime: []
}) })
const queryFormRef = ref() // const queryFormRef = ref() //
const exportLoading = ref(false) // const formRef = ref() //
/** 查询列表 */ /** 查询列表 */
const getList = async () => { const getList = async () => {
@ -178,21 +172,10 @@ const resetQuery = () => {
} }
/** 添加/修改操作 */ /** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => { const openForm = (type: string, id?: number) => {
formRef.value.open(type, id) formRef.value.open(type, id)
} }
/** 提交按钮操作 */
const handleSubmit = async (row: any) => {
try {
await message.confirm('确认提交该保养记录吗?')
await DvMaintenRecordApi.submitMaintenRecord(row.id)
message.success('提交成功')
await getList()
} catch {}
}
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (id: number) => { const handleDelete = async (id: number) => {
try { try {
@ -216,7 +199,7 @@ const handleExport = async () => {
} }
} }
/** 初始化 **/ /** 初始化 */
onMounted(() => { onMounted(() => {
getList() getList()
}) })