✨ feat(mes): 更新保养记录相关字段及新增功能
调整保养记录请求对象,新增保养计划编号、设备编号和保养人编号字段。更新查询逻辑以支持新字段,并新增获取保养记录明细列表和根据记录编号删除明细的功能。优化表单组件以支持详情模式。pull/871/MERGE
parent
b5063758e5
commit
7b98e87849
|
|
@ -6,6 +6,7 @@
|
|||
:model="formData"
|
||||
:rules="formRules"
|
||||
label-width="100px"
|
||||
:disabled="isDetail"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
|
|
@ -46,11 +47,11 @@
|
|||
</el-form>
|
||||
<template v-if="formData.id">
|
||||
<el-divider content-position="center">保养项目明细</el-divider>
|
||||
<MaintenRecordLineList :record-id="formData.id" />
|
||||
<MaintenRecordLineList :record-id="formData.id" :disabled="isDetail" />
|
||||
</template>
|
||||
<template #footer>
|
||||
<el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
<el-button v-if="!isDetail" :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="dialogVisible = false">{{ isDetail ? '关 闭' : '取 消' }}</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
</template>
|
||||
|
|
@ -61,16 +62,19 @@ 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 { useUserStore } from '@/store/modules/user'
|
||||
|
||||
defineOptions({ name: 'MaintenRecordForm' })
|
||||
|
||||
const { t } = useI18n() // 国际化
|
||||
const message = useMessage() // 消息弹窗
|
||||
const userStore = useUserStore()
|
||||
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const dialogTitle = ref('') // 弹窗的标题
|
||||
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
|
||||
const formType = ref('') // 表单的类型:create - 新增;update - 修改
|
||||
const formType = ref('') // 表单的类型:create - 新增;update - 修改;detail - 详情
|
||||
const isDetail = computed(() => formType.value === 'detail') // 是否为详情模式
|
||||
const formData = ref({
|
||||
id: undefined,
|
||||
planId: undefined,
|
||||
|
|
@ -88,10 +92,10 @@ const formRef = ref() // 表单 Ref
|
|||
/** 打开弹窗 */
|
||||
const open = async (type: string, id?: number) => {
|
||||
dialogVisible.value = true
|
||||
dialogTitle.value = t('action.' + type)
|
||||
dialogTitle.value = type === 'detail' ? '保养记录详情' : t('action.' + type)
|
||||
formType.value = type
|
||||
resetForm()
|
||||
// 修改时,设置数据
|
||||
// 修改/详情时,设置数据
|
||||
if (id) {
|
||||
formLoading.value = true
|
||||
try {
|
||||
|
|
@ -100,6 +104,10 @@ const open = async (type: string, id?: number) => {
|
|||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
// 新增时,自动填充当前登录用户
|
||||
if (type === 'create') {
|
||||
formData.value.userId = userStore.getUser.id
|
||||
}
|
||||
}
|
||||
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
|
||||
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
<!-- 列表 -->
|
||||
<ContentWrap>
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||
<!-- TODO @AI:增加一个【查看】操作,设备编码; -->
|
||||
<el-table-column label="设备编码" align="center" prop="machineryCode" />
|
||||
<el-table-column label="设备名称" align="center" prop="machineryName" />
|
||||
<el-table-column label="品牌" align="center" prop="machineryBrand" />
|
||||
|
|
@ -67,18 +68,22 @@
|
|||
:formatter="dateFormatter"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column label="保养人" align="center" prop="nickname" />
|
||||
<el-table-column label="状态" align="center" prop="status">
|
||||
<el-table-column label="保养人" align="center" prop="nickname" width="120px" />
|
||||
<el-table-column label="状态" align="center" prop="status" width="100px">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.MES_MAINTEN_RECORD_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('detail', scope.row.id)">
|
||||
查看
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="openForm('update', scope.row.id)"
|
||||
v-if="scope.row.status === MesDvMaintenRecordStatusEnum.PREPARE"
|
||||
v-hasPermi="['mes:dv-mainten-record:update']"
|
||||
>
|
||||
编辑
|
||||
|
|
|
|||
Loading…
Reference in New Issue