yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

✨ feat(mes): 新增维修工单编码唯一性校验及设备编号字段 

新增维修工单编码的唯一性校验逻辑，确保在创建和更新维修工单时编码不重复。同时，新增设备编号字段以便于关联设备信息，提升维修工单管理的准确性和完整性。
pull/871/MERGE
YunaiV 2026-04-03 23:30:40 +08:00
parent a8e68c155a
commit 7999232771
3 changed files with 150 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
src/views/mes/dv/repair/RepairForm.vue
View File

@ -6,22 +6,34 @@
:model="formData"
:rules="formRules"
label-width="100px"
:disabled="isDetail"
>
<el-row>
<!-- TODO @ai：生成 -->
<el-col :span="8">
<el-form-item label="维修单编码" prop="code">
<el-input v-model="formData.code" placeholder="请输入维修单编码" />
<el-input
v-model="formData.code"
placeholder="请输入维修单编码"
:disabled="isHeaderReadonly"
>
<template #append>
<el-button @click="generateCode" :disabled="isHeaderReadonly"> 生成 </el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="维修单名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入维修单名称" />
<el-input
v-model="formData.name"
placeholder="请输入维修单名称"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备" prop="machineryId">
<DvMachinerySelect v-model="formData.machineryId" />
<DvMachinerySelect v-model="formData.machineryId" :disabled="isHeaderReadonly" />
</el-form-item>
</el-col>
</el-row>
@ -33,6 +45,7 @@
type="datetime"
value-format="x"
placeholder="选择报修日期"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
@ -43,6 +56,7 @@
type="datetime"
value-format="x"
placeholder="选择完成日期"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
@ -53,6 +67,7 @@
type="datetime"
value-format="x"
placeholder="选择验收日期"
disabled
/>
</el-form-item>
</el-col>
@ -60,7 +75,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="维修结果" prop="result">
<el-select v-model="formData.result" placeholder="请选择维修结果" clearable>
<el-select v-model="formData.result" placeholder="请选择维修结果" clearable disabled>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_DV_REPAIR_RESULT)"
:key="dict.value"
@ -72,53 +87,89 @@
</el-col>
<el-col :span="8">
<el-form-item label="维修人" prop="acceptedUserId">
<UserSelect v-model="formData.acceptedUserId" placeholder="请选择维修人" />
<UserSelect
v-model="formData.acceptedUserId"
placeholder="请选择维修人"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="验收人" prop="confirmUserId">
<UserSelect v-model="formData.confirmUserId" placeholder="请选择验收人" />
<UserSelect
v-model="formData.confirmUserId"
placeholder="请选择验收人"
:disabled="isHeaderReadonly"
/>
</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-input
v-model="formData.remark"
type="textarea"
placeholder="请输入备注"
:disabled="isHeaderReadonly"
/>
</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" />
<RepairLineList :repair-id="formData.id" :disabled="isHeaderReadonly" />
</template>
<template #footer>
<el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
<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>
</template>
<script setup lang="ts">
import { DvRepairApi } from '@/api/mes/dv/repair'
import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
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'
import { MesAutoCodeRuleCode, MesDvRepairStatusEnum } from '@/views/mes/utils/constants'
defineOptions({ name: 'RepairForm' })
const emit = defineEmits(['success'])
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formLoading = ref(false) // 表单的加载中
const formType = ref<string>('create') // 表单类型：create / update / confirm / reject / 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 dialogTitle = computed(() => {
const titles: Record<string, string> = {
create: '新增维修工单',
update: '编辑维修工单',
confirm: '通过维修工单',
reject: '不通过维修工单',
detail: '维修工单详情'
}
return titles[formType.value] || formType.value
})
const formData = ref({
id: undefined,
id: undefined as number | undefined,
code: '',
name: '',
machineryId: undefined,
@ -128,6 +179,7 @@ const formData = ref({
result: undefined,
acceptedUserId: undefined,
confirmUserId: undefined,
status: undefined as number | undefined,
remark: ''
})
const formRules = reactive({
@ -136,13 +188,19 @@ const formRules = reactive({
})
const formRef = ref() // 表单 Ref
/** 生成维修单编码 */
const generateCode = async () => {
formData.value.code = await AutoCodeRecordApi.generateAutoCode(
MesAutoCodeRuleCode.DV_REPAIR_CODE
)
}
/** 打开弹窗 */
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 {
@ -152,34 +210,60 @@ const open = async (type: string, id?: number) => {
}
}
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
/** 提交表单（create/update 模式） */
const submitForm = async () => {
// 校验表单
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
// 提交请求
await formRef.value.validate()
formLoading.value = true
try {
const data = formData.value as any
if (formType.value === 'create') {
await DvRepairApi.createRepair(data)
message.success(t('common.createSuccess'))
const res = await DvRepairApi.createRepair(data)
message.success('新增成功')
// 创建成功后，更新表单数据和状态为编辑模式
formData.value.id = res
formData.value.status = MesDvRepairStatusEnum.DRAFT
formType.value = 'update'
} else {
await DvRepairApi.updateRepair(data)
message.success(t('common.updateSuccess'))
message.success('修改成功')
}
dialogVisible.value = false
// 发送操作成功的事件
emit('success')
} 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 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 = {
@ -193,8 +277,11 @@ const resetForm = () => {
result: undefined,
acceptedUserId: undefined,
confirmUserId: undefined,
status: undefined,
remark: ''
}
formRef.value?.resetFields()
}
defineExpose({ open })
</script>

74
src/views/mes/dv/repair/index.vue
View File

@ -81,10 +81,16 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<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" />
<el-table-column label="维修单编号" align="center" prop="code" min-width="160">
<template #default="scope">
<el-button link type="primary" @click="openForm('detail', scope.row.id)">
{{ scope.row.code }}
</el-button>
</template>
</el-table-column>
<el-table-column label="维修单名称" align="center" prop="name" min-width="150" />
<el-table-column label="设备编码" align="center" prop="machineryCode" min-width="120" />
<el-table-column label="设备名称" align="center" prop="machineryName" min-width="120" />
<el-table-column
label="报修日期"
align="center"
@ -106,49 +112,45 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="维修结果" align="center" prop="result">
<el-table-column label="维修结果" align="center" prop="result" min-width="100">
<template #default="scope">
<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" />
<el-table-column label="验收人员" align="center" prop="confirmUserNickname" />
<el-table-column label="单据状态" align="center" prop="status" 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">
<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"
width="220"
>
<el-table-column label="操作" align="center" width="220" fixed="right">
<template #default="scope">
<!-- 草稿：编辑、通过、不通过、删除 -->
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-if="scope.row.status === MesDvRepairStatusEnum.DRAFT"
v-hasPermi="['mes:dv-repair:update']"
v-if="scope.row.status === MesDvRepairStatusEnum.DRAFT"
>
编辑
</el-button>
<el-button
link
type="success"
@click="handleConfirm(scope.row.id)"
v-if="scope.row.status === MesDvRepairStatusEnum.DRAFT"
@click="openForm('confirm', scope.row.id)"
v-hasPermi="['mes:dv-repair:update']"
v-if="scope.row.status === MesDvRepairStatusEnum.DRAFT"
>
通过
</el-button>
<el-button
link
type="warning"
@click="handleReject(scope.row.id)"
v-if="scope.row.status === MesDvRepairStatusEnum.DRAFT"
@click="openForm('reject', scope.row.id)"
v-hasPermi="['mes:dv-repair:update']"
v-if="scope.row.status === MesDvRepairStatusEnum.DRAFT"
>
不通过
</el-button>
@ -156,8 +158,8 @@
link
type="danger"
@click="handleDelete(scope.row.id)"
v-if="scope.row.status === MesDvRepairStatusEnum.DRAFT"
v-hasPermi="['mes:dv-repair:delete']"
v-if="scope.row.status === MesDvRepairStatusEnum.DRAFT"
>
删除
</el-button>
@ -179,11 +181,11 @@
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
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 { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import RepairForm from './RepairForm.vue'
import { MesDvRepairStatusEnum } from '@/views/mes/utils/constants'
defineOptions({ name: 'MesDvRepair' })
@ -194,6 +196,7 @@ const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
const list = ref([]) // 列表的数据
const total = ref(0) // 列表的总页数
const exportLoading = ref(false) // 导出的加载中
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
@ -204,7 +207,7 @@ const queryParams = reactive({
status: undefined
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
const formRef = ref() // 表单弹窗
/** 查询列表 */
const getList = async () => {
@ -230,32 +233,11 @@ const resetQuery = () => {
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
/** 添加/修改/通过/不通过/详情操作 */
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 通过按钮操作 */
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 {
@ -279,7 +261,7 @@ const handleExport = async () => {
}
}
/** 初始化 **/
/** 初始化 */
onMounted(() => {
getList()
})

3
src/views/mes/utils/constants.ts
View File

@ -450,7 +450,8 @@ export const MesAutoCodeRuleCode = {
DV_MACHINERY_CODE: 'DV_MACHINERY_CODE', // 设备编码
DV_MACHINERY_TYPE_CODE: 'DV_MACHINERY_TYPE_CODE', // 设备类型编码
DV_CHECK_PLAN_CODE: 'DV_CHECK_PLAN_CODE', // 点检保养方案编码
DV_SUBJECT_CODE: 'DV_SUBJECT_CODE' // 点检保养项目编码
DV_SUBJECT_CODE: 'DV_SUBJECT_CODE', // 点检保养项目编码
DV_REPAIR_CODE: 'DV_REPAIR_CODE' // 维修单编码
} as const
/** 获取物料/产品标识的标签 */