refactor(mes): 重构设备保养记录模块,抽取可复用 Select 组件
1. 新增 DvMachinerySelect、DvCheckPlanSelect、UserSelect 三个通用选择器组件 2. MaintenRecordForm 和 index 页面改用 Select 组件替代内联远程搜索逻辑 3. MaintenRecordLineForm 合并到 MaintenRecordLineList(参考 pro/route 风格) 4. API 文件 maintenRecordLine.ts 迁移至 line/index.ts 5. 保养记录状态枚举从 10/20 改为 0/1,与后端对齐pull/871/MERGE
parent
083c187f2f
commit
9392e32630
|
|
@ -2,94 +2,32 @@
|
||||||
<Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
|
<Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
|
||||||
<el-form
|
<el-form
|
||||||
ref="formRef"
|
ref="formRef"
|
||||||
|
v-loading="formLoading"
|
||||||
:model="formData"
|
:model="formData"
|
||||||
:rules="formRules"
|
:rules="formRules"
|
||||||
label-width="100px"
|
label-width="100px"
|
||||||
v-loading="formLoading"
|
|
||||||
>
|
>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<!-- TODO @AI:设备 select;不用 设备名称、品牌、规格型号 -->
|
<!-- DONE @AI:这里抽成一个独立的 components 组件;一定要按照我说的 -->
|
||||||
<el-form-item label="设备" prop="machineryId">
|
<el-form-item label="设备" prop="machineryId">
|
||||||
<el-select
|
<DvMachinerySelect v-model="formData.machineryId" />
|
||||||
v-model="formData.machineryId"
|
|
||||||
filterable
|
|
||||||
remote
|
|
||||||
reserve-keyword
|
|
||||||
placeholder="请输入设备名称或编码搜索"
|
|
||||||
:remote-method="getMachineryOptions"
|
|
||||||
@change="handleMachineryChange"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in machineryOptions"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="设备名称">
|
<!-- DONE @AI:这里抽成一个独立的 components 组件;一定要按照我说的 -->
|
||||||
<el-input v-model="machineryInfo.name" disabled />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item label="品牌">
|
|
||||||
<el-input v-model="machineryInfo.brand" disabled />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
|
|
||||||
<el-row>
|
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item label="规格型号">
|
|
||||||
<el-input v-model="machineryInfo.spec" disabled type="textarea" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
|
|
||||||
<el-row>
|
|
||||||
<el-col :span="8">
|
|
||||||
<!-- TODO @AI:使用包养计划的 select 组件 -->
|
|
||||||
<el-form-item label="保养计划" prop="planId">
|
<el-form-item label="保养计划" prop="planId">
|
||||||
<el-select
|
<DvCheckPlanSelect v-model="formData.planId" />
|
||||||
v-model="formData.planId"
|
|
||||||
filterable
|
|
||||||
remote
|
|
||||||
reserve-keyword
|
|
||||||
placeholder="请输入计划名称搜索"
|
|
||||||
:remote-method="getPlanOptions"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in planOptions"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<!-- TODO @AI:保养人的 select -->
|
<!-- DONE @AI:user-select 封装一个到 views/system/user/components -->
|
||||||
<el-form-item label="保养人" prop="userId">
|
<el-form-item label="保养人" prop="userId">
|
||||||
<el-select
|
<UserSelect v-model="formData.userId" placeholder="请选择保养人" />
|
||||||
v-model="formData.userId"
|
|
||||||
filterable
|
|
||||||
remote
|
|
||||||
reserve-keyword
|
|
||||||
placeholder="请输入保养人搜索"
|
|
||||||
:remote-method="getUserOptions"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in userOptions"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.nickname"
|
|
||||||
:value="item.id"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="保养时间" prop="maintenTime">
|
<el-form-item label="保养时间" prop="maintenTime">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
|
|
@ -101,7 +39,6 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item label="备注" prop="remark">
|
||||||
|
|
@ -110,69 +47,48 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
<!-- DONE @AI:编辑时展示保养项目明细 -->
|
||||||
<template v-if="formData.id">
|
<template v-if="formData.id">
|
||||||
<el-divider content-position="center">保养项目明细</el-divider>
|
<el-divider content-position="center">保养项目明细</el-divider>
|
||||||
<MaintenRecordLineList :record-id="formData.id" />
|
<MaintenRecordLineList :record-id="formData.id" />
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #footer>
|
<template #footer>
|
||||||
|
<el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
|
||||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||||
<el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
|
|
||||||
<!-- TODO @AI:提交挪到 index.vue 外面; -->
|
|
||||||
<el-button
|
|
||||||
type="success"
|
|
||||||
@click="handleFinish"
|
|
||||||
v-if="formData.id && formData.status === 10"
|
|
||||||
:disabled="formLoading"
|
|
||||||
>提 交</el-button
|
|
||||||
>
|
|
||||||
</template>
|
</template>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { DvMaintenRecordApi } from '@/api/mes/dv/maintenrecord'
|
import { DvMaintenRecordApi } from '@/api/mes/dv/maintenrecord'
|
||||||
import { DvMachineryApi } from '@/api/mes/dv/machinery'
|
import DvMachinerySelect from '@/views/mes/dv/machinery/components/DvMachinerySelect.vue'
|
||||||
import * as UserApi from '@/api/system/user'
|
import DvCheckPlanSelect from '@/views/mes/dv/checkplan/components/DvCheckPlanSelect.vue'
|
||||||
import request from '@/config/axios'
|
import UserSelect from '@/views/system/user/components/UserSelect.vue'
|
||||||
import MaintenRecordLineList from './components/MaintenRecordLineList.vue'
|
import MaintenRecordLineList from './MaintenRecordLineList.vue'
|
||||||
|
|
||||||
// TODO @AI:注释风格,参考别的 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/system/user/UserForm.vue
|
|
||||||
|
|
||||||
defineOptions({ name: 'MaintenRecordForm' })
|
defineOptions({ name: 'MaintenRecordForm' })
|
||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n() // 国际化
|
||||||
const message = useMessage()
|
const message = useMessage() // 消息弹窗
|
||||||
|
|
||||||
const dialogVisible = ref(false)
|
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||||
const dialogTitle = ref('')
|
const dialogTitle = ref('') // 弹窗的标题
|
||||||
const formLoading = ref(false)
|
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
|
||||||
const formType = ref('')
|
const formType = ref('') // 表单的类型:create - 新增;update - 修改
|
||||||
const formData = ref({
|
const formData = ref({
|
||||||
id: undefined,
|
id: undefined,
|
||||||
planId: undefined,
|
planId: undefined,
|
||||||
machineryId: undefined,
|
machineryId: undefined,
|
||||||
maintenTime: undefined,
|
maintenTime: undefined,
|
||||||
userId: undefined,
|
userId: undefined,
|
||||||
status: 10,
|
status: 0,
|
||||||
remark: ''
|
remark: ''
|
||||||
})
|
})
|
||||||
const formRules = reactive({
|
const formRules = reactive({
|
||||||
machineryId: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
|
machineryId: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
|
||||||
maintenTime: [{ required: true, message: '保养时间不能为空', trigger: 'blur' }]
|
maintenTime: [{ required: true, message: '保养时间不能为空', trigger: 'blur' }]
|
||||||
})
|
})
|
||||||
const formRef = ref()
|
const formRef = ref() // 表单 Ref
|
||||||
|
|
||||||
const machineryOptions = ref<any[]>([])
|
|
||||||
const planOptions = ref<any[]>([])
|
|
||||||
const userOptions = ref<any[]>([])
|
|
||||||
|
|
||||||
const machineryInfo = reactive({
|
|
||||||
name: '',
|
|
||||||
brand: '',
|
|
||||||
spec: ''
|
|
||||||
})
|
|
||||||
|
|
||||||
/** 打开弹窗 */
|
/** 打开弹窗 */
|
||||||
const open = async (type: string, id?: number) => {
|
const open = async (type: string, id?: number) => {
|
||||||
|
|
@ -185,36 +101,21 @@ const open = async (type: string, id?: number) => {
|
||||||
formLoading.value = true
|
formLoading.value = true
|
||||||
try {
|
try {
|
||||||
formData.value = await DvMaintenRecordApi.getMaintenRecord(id)
|
formData.value = await DvMaintenRecordApi.getMaintenRecord(id)
|
||||||
// 加载设备选项以显示名称
|
|
||||||
if (formData.value.machineryId) {
|
|
||||||
const machinery = await DvMachineryApi.getMachinery(formData.value.machineryId)
|
|
||||||
if (machinery) {
|
|
||||||
machineryOptions.value = [machinery]
|
|
||||||
handleMachineryChange(machinery.id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// TODO @芋艿:待 DvCheckPlanApi 就绪后,替换为 DvCheckPlanApi.getCheckPlan()
|
|
||||||
if (formData.value.planId) {
|
|
||||||
const plan = await request.get({
|
|
||||||
url: `/mes/dv/check-plan/get?id=${formData.value.planId}`
|
|
||||||
})
|
|
||||||
if (plan) planOptions.value = [plan]
|
|
||||||
}
|
|
||||||
if (formData.value.userId) {
|
|
||||||
const user = await UserApi.getUser(formData.value.userId)
|
|
||||||
if (user) userOptions.value = [user]
|
|
||||||
}
|
|
||||||
} finally {
|
} finally {
|
||||||
formLoading.value = false
|
formLoading.value = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
defineExpose({ open })
|
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
|
||||||
|
|
||||||
/** 提交表单 */
|
/** 提交表单 */
|
||||||
const emit = defineEmits(['success'])
|
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
|
||||||
const submitForm = async () => {
|
const submitForm = async () => {
|
||||||
await formRef.value.validate()
|
// 校验表单
|
||||||
|
if (!formRef) return
|
||||||
|
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
|
||||||
|
|
@ -226,30 +127,13 @@ const submitForm = async () => {
|
||||||
message.success(t('common.updateSuccess'))
|
message.success(t('common.updateSuccess'))
|
||||||
}
|
}
|
||||||
dialogVisible.value = false
|
dialogVisible.value = false
|
||||||
|
// 发送操作成功的事件
|
||||||
emit('success')
|
emit('success')
|
||||||
} finally {
|
} finally {
|
||||||
formLoading.value = false
|
formLoading.value = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 提交按钮(完成保养) */
|
|
||||||
const handleFinish = async () => {
|
|
||||||
if (formData.value.id && formData.value.status === 10) {
|
|
||||||
formLoading.value = true
|
|
||||||
try {
|
|
||||||
formData.value.status = 20
|
|
||||||
await DvMaintenRecordApi.updateMaintenRecord(formData.value as any)
|
|
||||||
message.success('已提交保养完成')
|
|
||||||
dialogVisible.value = false
|
|
||||||
emit('success')
|
|
||||||
} catch {
|
|
||||||
formData.value.status = 10
|
|
||||||
} finally {
|
|
||||||
formLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 重置表单 */
|
/** 重置表单 */
|
||||||
const resetForm = () => {
|
const resetForm = () => {
|
||||||
formData.value = {
|
formData.value = {
|
||||||
|
|
@ -258,48 +142,9 @@ const resetForm = () => {
|
||||||
machineryId: undefined,
|
machineryId: undefined,
|
||||||
maintenTime: undefined,
|
maintenTime: undefined,
|
||||||
userId: undefined,
|
userId: undefined,
|
||||||
status: 10,
|
status: 0,
|
||||||
remark: ''
|
remark: ''
|
||||||
}
|
}
|
||||||
machineryInfo.name = ''
|
|
||||||
machineryInfo.brand = ''
|
|
||||||
machineryInfo.spec = ''
|
|
||||||
formRef.value?.resetFields()
|
formRef.value?.resetFields()
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 获取设备选项 */
|
|
||||||
const getMachineryOptions = async (query: string) => {
|
|
||||||
const data = await DvMachineryApi.getMachineryPage({ name: query, pageNo: 1, pageSize: 20 })
|
|
||||||
machineryOptions.value = data.list
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 处理设备变化 */
|
|
||||||
const handleMachineryChange = async (val: number) => {
|
|
||||||
const selected = machineryOptions.value.find((item) => item.id === val)
|
|
||||||
if (selected) {
|
|
||||||
machineryInfo.name = selected.name
|
|
||||||
machineryInfo.brand = selected.brand
|
|
||||||
machineryInfo.spec = selected.spec
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 获取计划选项 */
|
|
||||||
// TODO @芋艿:待 DvCheckPlanApi 就绪后,替换为 DvCheckPlanApi.getCheckPlanPage()
|
|
||||||
const getPlanOptions = async (query: string) => {
|
|
||||||
try {
|
|
||||||
const data = await request.get({
|
|
||||||
url: `/mes/dv/check-plan/page`,
|
|
||||||
params: { name: query, pageNo: 1, pageSize: 20 }
|
|
||||||
})
|
|
||||||
planOptions.value = data.list
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 获取用户选项 */
|
|
||||||
const getUserOptions = async (query: string) => {
|
|
||||||
try {
|
|
||||||
const data = await UserApi.getUserPage({ nickname: query, pageNo: 1, pageSize: 20 })
|
|
||||||
userOptions.value = data.list
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,203 @@
|
||||||
|
<!-- MES 设备保养记录明细列表 -->
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<!-- 操作栏 -->
|
||||||
|
<el-row class="mb-10px" v-if="!disabled">
|
||||||
|
<el-button type="primary" plain @click="openForm('create')">
|
||||||
|
<Icon icon="ep:plus" class="mr-5px" /> 添加明细
|
||||||
|
</el-button>
|
||||||
|
</el-row>
|
||||||
|
<!-- 列表 -->
|
||||||
|
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||||
|
<el-table-column label="项目名称" align="center" prop="subjectName" />
|
||||||
|
<el-table-column label="项目内容" align="center" prop="subjectContent" />
|
||||||
|
<el-table-column label="标准" align="center" prop="subjectStandard" />
|
||||||
|
<el-table-column label="保养结果" align="center" prop="status">
|
||||||
|
<template #default="scope">
|
||||||
|
<dict-tag :type="DICT_TYPE.MES_MAINTEN_STATUS" :value="scope.row.status" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="异常描述" align="center" prop="result" />
|
||||||
|
<el-table-column label="操作" align="center" width="130" v-if="!disabled">
|
||||||
|
<template #default="scope">
|
||||||
|
<el-button link type="primary" @click="openForm('update', scope.row)">编辑</el-button>
|
||||||
|
<el-button link type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<Pagination
|
||||||
|
:total="total"
|
||||||
|
v-model:page="queryParams.pageNo"
|
||||||
|
v-model:limit="queryParams.pageSize"
|
||||||
|
@pagination="getList"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- 表单弹窗:添加/修改 -->
|
||||||
|
<Dialog :title="formTitle" v-model="formVisible" width="500px">
|
||||||
|
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
|
||||||
|
<el-form-item label="项目" prop="subjectId">
|
||||||
|
<el-select
|
||||||
|
v-model="formData.subjectId"
|
||||||
|
filterable
|
||||||
|
remote
|
||||||
|
reserve-keyword
|
||||||
|
placeholder="请输入项目名称搜索"
|
||||||
|
:remote-method="getSubjectOptions"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in subjectOptions"
|
||||||
|
:key="item.id"
|
||||||
|
:label="item.name"
|
||||||
|
:value="item.id"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="保养结果" prop="status">
|
||||||
|
<el-radio-group v-model="formData.status">
|
||||||
|
<el-radio
|
||||||
|
v-for="dict in getIntDictOptions(DICT_TYPE.MES_MAINTEN_STATUS)"
|
||||||
|
:key="dict.value"
|
||||||
|
:value="dict.value"
|
||||||
|
>
|
||||||
|
{{ dict.label }}
|
||||||
|
</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="异常描述" prop="result">
|
||||||
|
<el-input v-model="formData.result" type="textarea" placeholder="请输入异常描述" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="备注" prop="remark">
|
||||||
|
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
<template #footer>
|
||||||
|
<el-button @click="formVisible = false">取 消</el-button>
|
||||||
|
<el-button type="primary" @click="submitForm" :loading="formLoading">确 定</el-button>
|
||||||
|
</template>
|
||||||
|
</Dialog>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||||
|
import { DvMaintenRecordLineApi } from '@/api/mes/dv/maintenrecord/line'
|
||||||
|
import { DvSubjectApi } from '@/api/mes/dv/subject'
|
||||||
|
|
||||||
|
defineOptions({ name: 'MaintenRecordLineList' })
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
recordId: number
|
||||||
|
disabled?: boolean
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const message = useMessage() // 消息弹窗
|
||||||
|
const { t } = useI18n() // 国际化
|
||||||
|
|
||||||
|
const loading = ref(false) // 列表的加载中
|
||||||
|
const list = ref([]) // 列表的数据
|
||||||
|
const total = ref(0) // 列表的总页数
|
||||||
|
const queryParams = reactive({
|
||||||
|
pageNo: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
recordId: props.recordId
|
||||||
|
})
|
||||||
|
|
||||||
|
// 表单相关
|
||||||
|
const formVisible = ref(false) // 表单弹窗的是否展示
|
||||||
|
const formTitle = ref('') // 表单弹窗的标题
|
||||||
|
const formLoading = ref(false) // 表单的加载中
|
||||||
|
const formType = ref('') // 表单的类型:create - 新增;update - 修改
|
||||||
|
const formRef = ref() // 表单 Ref
|
||||||
|
const formData = ref<any>({}) // 表单数据
|
||||||
|
const formRules = reactive({
|
||||||
|
subjectId: [{ required: true, message: '项目不能为空', trigger: 'blur' }],
|
||||||
|
status: [{ required: true, message: '保养结果不能为空', trigger: 'blur' }]
|
||||||
|
})
|
||||||
|
const subjectOptions = ref<any[]>([]) // 项目选项列表
|
||||||
|
|
||||||
|
/** 查询列表 */
|
||||||
|
const getList = async () => {
|
||||||
|
loading.value = true
|
||||||
|
try {
|
||||||
|
const data = await DvMaintenRecordLineApi.getMaintenRecordLinePage(queryParams)
|
||||||
|
list.value = data.list
|
||||||
|
total.value = data.total
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 添加/修改操作 */
|
||||||
|
const openForm = async (type: string, row?: any) => {
|
||||||
|
formVisible.value = true
|
||||||
|
formTitle.value = type === 'create' ? '添加明细' : '编辑明细'
|
||||||
|
formType.value = type
|
||||||
|
if (type === 'create') {
|
||||||
|
formData.value = {
|
||||||
|
recordId: props.recordId,
|
||||||
|
subjectId: undefined,
|
||||||
|
status: 1,
|
||||||
|
result: '',
|
||||||
|
remark: ''
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
formData.value = { ...row }
|
||||||
|
if (row.subjectId) {
|
||||||
|
const subject = await DvSubjectApi.getSubject(row.subjectId)
|
||||||
|
if (subject) subjectOptions.value = [subject]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
formRef.value?.resetFields()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 提交表单 */
|
||||||
|
const submitForm = async () => {
|
||||||
|
const valid = await formRef.value.validate()
|
||||||
|
if (!valid) return
|
||||||
|
formLoading.value = true
|
||||||
|
try {
|
||||||
|
if (formType.value === 'create') {
|
||||||
|
await DvMaintenRecordLineApi.createMaintenRecordLine(formData.value)
|
||||||
|
message.success(t('common.createSuccess'))
|
||||||
|
} else {
|
||||||
|
await DvMaintenRecordLineApi.updateMaintenRecordLine(formData.value)
|
||||||
|
message.success(t('common.updateSuccess'))
|
||||||
|
}
|
||||||
|
formVisible.value = false
|
||||||
|
await getList()
|
||||||
|
} finally {
|
||||||
|
formLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 删除按钮操作 */
|
||||||
|
const handleDelete = async (id: number) => {
|
||||||
|
try {
|
||||||
|
await message.delConfirm()
|
||||||
|
await DvMaintenRecordLineApi.deleteMaintenRecordLine(id)
|
||||||
|
message.success(t('common.delSuccess'))
|
||||||
|
await getList()
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 获取项目选项 */
|
||||||
|
const getSubjectOptions = async (query: string) => {
|
||||||
|
try {
|
||||||
|
const data = await DvSubjectApi.getSubjectPage({ name: query, pageNo: 1, pageSize: 20 })
|
||||||
|
subjectOptions.value = data.list
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 监听记录编号变化 */
|
||||||
|
watch(
|
||||||
|
() => props.recordId,
|
||||||
|
(val) => {
|
||||||
|
if (val) {
|
||||||
|
queryParams.recordId = val
|
||||||
|
getList()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ immediate: true }
|
||||||
|
)
|
||||||
|
</script>
|
||||||
|
|
@ -1,149 +0,0 @@
|
||||||
<!-- TODO @AI:参考别的模块,合并到 List.vue 里; -->
|
|
||||||
<!-- TODO @AI:参考 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/pro/route -->
|
|
||||||
<template>
|
|
||||||
<Dialog :title="dialogTitle" v-model="dialogVisible" width="500px">
|
|
||||||
<el-form
|
|
||||||
ref="formRef"
|
|
||||||
:model="formData"
|
|
||||||
:rules="formRules"
|
|
||||||
label-width="80px"
|
|
||||||
v-loading="formLoading"
|
|
||||||
>
|
|
||||||
<el-form-item label="项目" prop="subjectId">
|
|
||||||
<el-select
|
|
||||||
v-model="formData.subjectId"
|
|
||||||
filterable
|
|
||||||
remote
|
|
||||||
reserve-keyword
|
|
||||||
placeholder="请输入项目名称搜索"
|
|
||||||
:remote-method="getSubjectOptions"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in subjectOptions"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="保养结果" prop="status">
|
|
||||||
<el-radio-group v-model="formData.status">
|
|
||||||
<el-radio
|
|
||||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_MAINTEN_STATUS)"
|
|
||||||
:key="dict.value"
|
|
||||||
:value="dict.value"
|
|
||||||
>
|
|
||||||
{{ dict.label }}
|
|
||||||
</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="异常描述" prop="result">
|
|
||||||
<el-input v-model="formData.result" type="textarea" placeholder="请输入异常描述" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="备注" prop="remark">
|
|
||||||
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<template #footer>
|
|
||||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
|
||||||
<el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
|
|
||||||
</template>
|
|
||||||
</Dialog>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { DvMaintenRecordLineApi } from '@/api/mes/dv/maintenrecord/maintenRecordLine'
|
|
||||||
import { DvSubjectApi } from '@/api/mes/dv/subject'
|
|
||||||
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
|
|
||||||
|
|
||||||
defineOptions({ name: 'MaintenRecordLineForm' })
|
|
||||||
|
|
||||||
const { t } = useI18n()
|
|
||||||
const message = useMessage()
|
|
||||||
|
|
||||||
const dialogVisible = ref(false)
|
|
||||||
const dialogTitle = ref('')
|
|
||||||
const formLoading = ref(false)
|
|
||||||
const formType = ref('')
|
|
||||||
const formData = ref({
|
|
||||||
id: undefined,
|
|
||||||
recordId: undefined,
|
|
||||||
subjectId: undefined,
|
|
||||||
status: 1,
|
|
||||||
result: '',
|
|
||||||
remark: ''
|
|
||||||
})
|
|
||||||
const formRules = reactive({
|
|
||||||
subjectId: [{ required: true, message: '项目不能为空', trigger: 'blur' }],
|
|
||||||
status: [{ required: true, message: '保养结果不能为空', trigger: 'blur' }]
|
|
||||||
})
|
|
||||||
const formRef = ref()
|
|
||||||
|
|
||||||
const subjectOptions = ref<any[]>([])
|
|
||||||
|
|
||||||
/** 打开弹窗 */
|
|
||||||
const open = async (type: string, id?: number, recordId?: number) => {
|
|
||||||
dialogVisible.value = true
|
|
||||||
dialogTitle.value = t('action.' + type)
|
|
||||||
formType.value = type
|
|
||||||
resetForm()
|
|
||||||
formData.value.recordId = recordId
|
|
||||||
|
|
||||||
if (id) {
|
|
||||||
formLoading.value = true
|
|
||||||
try {
|
|
||||||
formData.value = await DvMaintenRecordLineApi.getMaintenRecordLine(id)
|
|
||||||
// 加载项目选项以显示名称
|
|
||||||
if (formData.value.subjectId) {
|
|
||||||
const subject = await DvSubjectApi.getSubject(formData.value.subjectId)
|
|
||||||
if (subject) subjectOptions.value = [subject]
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
formLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
defineExpose({ open })
|
|
||||||
|
|
||||||
/** 提交表单 */
|
|
||||||
const emit = defineEmits(['success'])
|
|
||||||
const submitForm = async () => {
|
|
||||||
await formRef.value.validate()
|
|
||||||
formLoading.value = true
|
|
||||||
try {
|
|
||||||
const data = formData.value as any
|
|
||||||
if (formType.value === 'create') {
|
|
||||||
await DvMaintenRecordLineApi.createMaintenRecordLine(data)
|
|
||||||
message.success(t('common.createSuccess'))
|
|
||||||
} else {
|
|
||||||
await DvMaintenRecordLineApi.updateMaintenRecordLine(data)
|
|
||||||
message.success(t('common.updateSuccess'))
|
|
||||||
}
|
|
||||||
dialogVisible.value = false
|
|
||||||
emit('success')
|
|
||||||
} finally {
|
|
||||||
formLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 重置表单 */
|
|
||||||
const resetForm = () => {
|
|
||||||
formData.value = {
|
|
||||||
id: undefined,
|
|
||||||
recordId: undefined,
|
|
||||||
subjectId: undefined,
|
|
||||||
status: 1,
|
|
||||||
result: '',
|
|
||||||
remark: ''
|
|
||||||
}
|
|
||||||
formRef.value?.resetFields()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 获取项目选项 */
|
|
||||||
const getSubjectOptions = async (query: string) => {
|
|
||||||
try {
|
|
||||||
const data = await DvSubjectApi.getSubjectPage({ name: query, pageNo: 1, pageSize: 20 })
|
|
||||||
subjectOptions.value = data.list
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
@ -1,129 +0,0 @@
|
||||||
<!-- TODO @AI:参考 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/pro/route -->
|
|
||||||
<template>
|
|
||||||
<div class="app-container">
|
|
||||||
<el-row :gutter="10" class="mb8" v-if="!disabled">
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button
|
|
||||||
type="primary"
|
|
||||||
plain
|
|
||||||
@click="openForm('create')"
|
|
||||||
v-hasPermi="['mes:dv-mainten-record:update']"
|
|
||||||
>
|
|
||||||
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
|
||||||
</el-button>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
|
|
||||||
<el-table v-loading="loading" :data="list">
|
|
||||||
<el-table-column label="项目名称" align="center" prop="subjectName" />
|
|
||||||
<el-table-column label="项目内容" align="center" prop="subjectContent" />
|
|
||||||
<el-table-column label="标准" align="center" prop="subjectStandard" />
|
|
||||||
<el-table-column label="保养结果" align="center" prop="status">
|
|
||||||
<template #default="scope">
|
|
||||||
<dict-tag :type="DICT_TYPE.MES_MAINTEN_STATUS" :value="scope.row.status" />
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="异常描述" align="center" prop="result" />
|
|
||||||
<el-table-column
|
|
||||||
label="操作"
|
|
||||||
align="center"
|
|
||||||
class-name="small-padding fixed-width"
|
|
||||||
v-if="!disabled"
|
|
||||||
>
|
|
||||||
<template #default="scope">
|
|
||||||
<el-button
|
|
||||||
link
|
|
||||||
type="primary"
|
|
||||||
@click="openForm('update', scope.row.id)"
|
|
||||||
v-hasPermi="['mes:dv-mainten-record:update']"
|
|
||||||
>
|
|
||||||
编辑
|
|
||||||
</el-button>
|
|
||||||
<el-button
|
|
||||||
link
|
|
||||||
type="danger"
|
|
||||||
@click="handleDelete(scope.row.id)"
|
|
||||||
v-hasPermi="['mes:dv-mainten-record:update']"
|
|
||||||
>
|
|
||||||
删除
|
|
||||||
</el-button>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
|
|
||||||
<Pagination
|
|
||||||
:total="total"
|
|
||||||
v-model:page="queryParams.pageNo"
|
|
||||||
v-model:limit="queryParams.pageSize"
|
|
||||||
@pagination="getList"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<MaintenRecordLineForm ref="formRef" @success="getList" />
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { DvMaintenRecordLineApi } from '@/api/mes/dv/maintenrecord/maintenRecordLine'
|
|
||||||
import MaintenRecordLineForm from './MaintenRecordLineForm.vue'
|
|
||||||
import { DICT_TYPE } from '@/utils/dict'
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
recordId: {
|
|
||||||
type: Number,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
disabled: {
|
|
||||||
type: Boolean,
|
|
||||||
default: false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
const { t } = useI18n()
|
|
||||||
const message = useMessage()
|
|
||||||
|
|
||||||
const loading = ref(true)
|
|
||||||
const list = ref([])
|
|
||||||
const total = ref(0)
|
|
||||||
const queryParams = reactive({
|
|
||||||
pageNo: 1,
|
|
||||||
pageSize: 10,
|
|
||||||
recordId: props.recordId
|
|
||||||
})
|
|
||||||
|
|
||||||
/** 查询列表 */
|
|
||||||
const getList = async () => {
|
|
||||||
loading.value = true
|
|
||||||
try {
|
|
||||||
const data = await DvMaintenRecordLineApi.getMaintenRecordLinePage(queryParams)
|
|
||||||
list.value = data.list
|
|
||||||
total.value = data.total
|
|
||||||
} finally {
|
|
||||||
loading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 添加/修改操作 */
|
|
||||||
const formRef = ref()
|
|
||||||
const openForm = (type: string, id?: number) => {
|
|
||||||
formRef.value.open(type, id, props.recordId)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 删除按钮操作 */
|
|
||||||
const handleDelete = async (id: number) => {
|
|
||||||
try {
|
|
||||||
await message.delConfirm()
|
|
||||||
await DvMaintenRecordLineApi.deleteMaintenRecordLine(id)
|
|
||||||
message.success(t('common.delSuccess'))
|
|
||||||
await getList()
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => props.recordId,
|
|
||||||
() => {
|
|
||||||
queryParams.recordId = props.recordId
|
|
||||||
getList()
|
|
||||||
},
|
|
||||||
{ immediate: true }
|
|
||||||
)
|
|
||||||
</script>
|
|
||||||
|
|
@ -8,44 +8,17 @@
|
||||||
:inline="true"
|
:inline="true"
|
||||||
label-width="90px"
|
label-width="90px"
|
||||||
>
|
>
|
||||||
<!-- TODO @AI:计划 select;如果没组件,就封装一个; -->
|
<!-- DONE @AI:计划 select;如果没组件,就封装一个; -->
|
||||||
<el-form-item label="计划名称" prop="planName">
|
<el-form-item label="保养计划" prop="planId">
|
||||||
<el-input
|
<DvCheckPlanSelect v-model="queryParams.planId" class="!w-240px" />
|
||||||
v-model="queryParams.planName"
|
|
||||||
placeholder="请输入计划名称"
|
|
||||||
clearable
|
|
||||||
@keyup.enter="handleQuery"
|
|
||||||
class="!w-240px"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- TODO @AI:设备 select;如果没组件,就封装一个; -->
|
<!-- DONE @AI:设备 select;如果没组件,就封装一个; -->
|
||||||
<el-form-item label="设备编码" prop="machineryCode">
|
<el-form-item label="设备" prop="machineryId">
|
||||||
<el-input
|
<DvMachinerySelect v-model="queryParams.machineryId" class="!w-240px" />
|
||||||
v-model="queryParams.machineryCode"
|
|
||||||
placeholder="请输入设备编码"
|
|
||||||
clearable
|
|
||||||
@keyup.enter="handleQuery"
|
|
||||||
class="!w-240px"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="设备名称" prop="machineryName">
|
<!-- DONE @AI:用户 select;如果没组件,就封装一个 -->
|
||||||
<el-input
|
<el-form-item label="保养人" prop="userId">
|
||||||
v-model="queryParams.machineryName"
|
<UserSelect v-model="queryParams.userId" placeholder="请选择保养人" class="!w-240px" />
|
||||||
placeholder="请输入设备名称"
|
|
||||||
clearable
|
|
||||||
@keyup.enter="handleQuery"
|
|
||||||
class="!w-240px"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<!-- TODO @AI:用户 select;如果没组件,就封装一个 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/system/user/components -->
|
|
||||||
<el-form-item label="保养人" prop="nickname">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.nickname"
|
|
||||||
placeholder="请输入保养人名称"
|
|
||||||
clearable
|
|
||||||
@keyup.enter="handleQuery"
|
|
||||||
class="!w-240px"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="保养时间" prop="maintenTime">
|
<el-form-item label="保养时间" prop="maintenTime">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
|
|
@ -105,7 +78,6 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<!-- TODO @AI:这里加个【提交】操作 -->
|
|
||||||
<el-button
|
<el-button
|
||||||
link
|
link
|
||||||
type="primary"
|
type="primary"
|
||||||
|
|
@ -114,6 +86,15 @@
|
||||||
>
|
>
|
||||||
编辑
|
编辑
|
||||||
</el-button>
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
link
|
||||||
|
type="success"
|
||||||
|
@click="handleSubmit(scope.row)"
|
||||||
|
v-if="scope.row.status === 0"
|
||||||
|
v-hasPermi="['mes:dv-mainten-record:update']"
|
||||||
|
>
|
||||||
|
提交
|
||||||
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
link
|
link
|
||||||
type="danger"
|
type="danger"
|
||||||
|
|
@ -143,27 +124,29 @@ import { dateFormatter } from '@/utils/formatTime'
|
||||||
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 MaintenRecordForm from './MaintenRecordForm.vue'
|
||||||
|
import DvMachinerySelect from '@/views/mes/dv/machinery/components/DvMachinerySelect.vue'
|
||||||
|
import DvCheckPlanSelect from '@/views/mes/dv/checkplan/components/DvCheckPlanSelect.vue'
|
||||||
|
import UserSelect from '@/views/system/user/components/UserSelect.vue'
|
||||||
import { DICT_TYPE } from '@/utils/dict'
|
import { DICT_TYPE } from '@/utils/dict'
|
||||||
|
|
||||||
defineOptions({ name: 'MesDvMaintenRecord' })
|
defineOptions({ name: 'MesDvMaintenRecord' })
|
||||||
|
|
||||||
const message = useMessage()
|
const message = useMessage() // 消息弹窗
|
||||||
const { t } = useI18n()
|
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 queryParams = reactive({
|
const queryParams = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
planName: undefined,
|
planId: undefined,
|
||||||
machineryCode: undefined,
|
machineryId: undefined,
|
||||||
machineryName: undefined,
|
userId: undefined,
|
||||||
nickname: undefined,
|
|
||||||
maintenTime: []
|
maintenTime: []
|
||||||
})
|
})
|
||||||
const queryFormRef = ref()
|
const queryFormRef = ref() // 搜索的表单
|
||||||
const exportLoading = ref(false)
|
const exportLoading = ref(false) // 导出的加载中
|
||||||
|
|
||||||
/** 查询列表 */
|
/** 查询列表 */
|
||||||
const getList = async () => {
|
const getList = async () => {
|
||||||
|
|
@ -195,6 +178,16 @@ 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.updateMaintenRecord({ ...row, status: 1 })
|
||||||
|
message.success('提交成功')
|
||||||
|
await getList()
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
const handleDelete = async (id: number) => {
|
const handleDelete = async (id: number) => {
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue