feat(mes): 添加安灯呼叫配置和记录相关功能,包括请求和响应 VO、枚举及服务接口

pull/871/MERGE
YunaiV 2026-02-21 08:07:15 +08:00
parent 5ddc53bce9
commit 99b983f00f
5 changed files with 834 additions and 0 deletions

View File

@ -0,0 +1,102 @@
import request from '@/config/axios'
// TODO @AI拆分成 andon/config/index.ts 和 andon/record/index.ts 两个文件
// MES 安灯配置 VO
export interface ProAndonConfigVO {
id: number // 编号
reason: string // 呼叫原因
level: number // 级别
handlerRoleId: number // 处置人角色编号
handlerUserId: number // 处置人编号
handlerUserNickname: string // 处置人昵称
remark: string // 备注
}
// MES 安灯记录 VO
export interface ProAndonRecordVO {
id: number // 编号
workstationId: number // 工作站编号
workstationCode: string // 工作站编码
workstationName: string // 工作站名称
userId: number // 发起用户编号
userNickname: string // 发起人昵称
workOrderId: number // 工单编号
workOrderCode: string // 工单编码
processId: number // 工序编号
processName: string // 工序名称
reason: string // 呼叫原因
level: number // 级别
status: number // 处置状态
handleTime: Date // 处置时间
handlerUserId: number // 处置人编号
handlerUserNickname: string // 处置人昵称
remark: string // 备注
createTime: Date // 发起时间
}
// MES 安灯配置 API
export const ProAndonConfigApi = {
// 查询安灯配置分页
getAndonConfigPage: async (params: any) => {
return await request.get({ url: `/mes/pro/andon-config/page`, params })
},
// 查询安灯配置列表
getAndonConfigList: async () => {
return await request.get({ url: `/mes/pro/andon-config/list` })
},
// 查询安灯配置详情
getAndonConfig: async (id: number) => {
return await request.get({ url: `/mes/pro/andon-config/get?id=` + id })
},
// 新增安灯配置
createAndonConfig: async (data: ProAndonConfigVO) => {
return await request.post({ url: `/mes/pro/andon-config/create`, data })
},
// 修改安灯配置
updateAndonConfig: async (data: ProAndonConfigVO) => {
return await request.put({ url: `/mes/pro/andon-config/update`, data })
},
// 删除安灯配置
deleteAndonConfig: async (id: number) => {
return await request.delete({ url: `/mes/pro/andon-config/delete?id=` + id })
}
}
// MES 安灯记录 API
export const ProAndonRecordApi = {
// 查询安灯记录分页
getAndonRecordPage: async (params: any) => {
return await request.get({ url: `/mes/pro/andon-record/page`, params })
},
// 查询安灯记录详情
getAndonRecord: async (id: number) => {
return await request.get({ url: `/mes/pro/andon-record/get?id=` + id })
},
// 新增安灯记录
createAndonRecord: async (data: ProAndonRecordVO) => {
return await request.post({ url: `/mes/pro/andon-record/create`, data })
},
// 删除安灯记录
deleteAndonRecord: async (id: number) => {
return await request.delete({ url: `/mes/pro/andon-record/delete?id=` + id })
},
// 处置安灯记录
handleAndonRecord: async (data: any) => {
return await request.put({ url: `/mes/pro/andon-record/handle`, data })
},
// 导出安灯记录 Excel
exportAndonRecord: async (params: any) => {
return await request.download({ url: `/mes/pro/andon-record/export-excel`, params })
}
}

View File

@ -0,0 +1,193 @@
<!-- 安灯呼叫配置弹窗内联编辑表格 -->
<template>
<Dialog title="安灯呼叫设置" v-model="dialogVisible" width="900px">
<div class="mb-10px">
<el-button
type="primary"
plain
@click="handleAdd"
v-hasPermi="['mes:pro-andon-config:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增配置
</el-button>
</div>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="呼叫原因" align="center" min-width="200">
<template #default="scope">
<el-input
v-if="scope.row.editing"
v-model="scope.row.reason"
type="textarea"
:autosize="{ minRows: 1, maxRows: 3 }"
placeholder="请输入呼叫原因"
/>
<span v-else>{{ scope.row.reason }}</span>
</template>
</el-table-column>
<el-table-column label="级别" align="center" width="120">
<template #default="scope">
<el-select v-if="scope.row.editing" v-model="scope.row.level" placeholder="请选择级别">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_ANDON_LEVEL)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
<dict-tag v-else :type="DICT_TYPE.MES_PRO_ANDON_LEVEL" :value="scope.row.level" />
</template>
</el-table-column>
<el-table-column label="处置人" align="center" width="150">
<template #default="scope">
<el-input
v-if="scope.row.editing"
v-model="scope.row.handlerUserId"
placeholder="请输入用户编号"
type="number"
/>
<span v-else>{{ scope.row.handlerUserNickname || scope.row.handlerUserId || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="150">
<template #default="scope">
<el-input
v-if="scope.row.editing"
v-model="scope.row.remark"
placeholder="请输入备注"
/>
<span v-else>{{ scope.row.remark || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="200" fixed="right">
<template #default="scope">
<template v-if="scope.row.editing">
<el-button link type="success" @click="handleSave(scope.row)"></el-button>
<el-button link type="info" @click="handleCancel(scope.row, scope.$index)">
取消
</el-button>
</template>
<template v-else>
<el-button
link
type="primary"
@click="handleEdit(scope.row)"
v-hasPermi="['mes:pro-andon-config:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:pro-andon-config:delete']"
>
删除
</el-button>
</template>
</template>
</el-table-column>
</el-table>
</Dialog>
</template>
<script setup lang="ts">
import { ProAndonConfigApi, ProAndonConfigVO } from '@/api/mes/pro/andon'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
defineOptions({ name: 'AndonConfigDialog' })
const message = useMessage()
const { t } = useI18n()
const dialogVisible = ref(false)
const loading = ref(false)
const list = ref<any[]>([])
/** 打开弹窗 */
const open = async () => {
dialogVisible.value = true
await getList()
}
defineExpose({ open })
/** 加载列表 */
const getList = async () => {
loading.value = true
try {
const data = await ProAndonConfigApi.getAndonConfigList()
list.value = data.map((item: ProAndonConfigVO) => ({ ...item, editing: false }))
} finally {
loading.value = false
}
}
/** 新增行 */
const handleAdd = () => {
list.value.unshift({
id: undefined,
reason: '',
level: 3,
handlerRoleId: undefined,
handlerUserId: undefined,
remark: '',
editing: true,
isNew: true
})
}
/** 编辑行 */
const handleEdit = (row: any) => {
row._backup = { ...row }
row.editing = true
}
/** 保存行 */
const handleSave = async (row: any) => {
if (!row.reason) {
message.warning('呼叫原因不能为空')
return
}
if (!row.level) {
message.warning('级别不能为空')
return
}
try {
const data = {
id: row.id,
reason: row.reason,
level: row.level,
handlerRoleId: row.handlerRoleId,
handlerUserId: row.handlerUserId,
remark: row.remark
}
if (row.isNew) {
await ProAndonConfigApi.createAndonConfig(data as any)
message.success(t('common.createSuccess'))
} else {
await ProAndonConfigApi.updateAndonConfig(data as any)
message.success(t('common.updateSuccess'))
}
await getList()
} catch {}
}
/** 取消编辑 */
const handleCancel = (row: any, index: number) => {
if (row.isNew) {
list.value.splice(index, 1)
} else {
Object.assign(row, row._backup)
row.editing = false
}
}
/** 删除行 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await ProAndonConfigApi.deleteAndonConfig(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
</script>

View File

@ -0,0 +1,105 @@
<!-- 安灯呼叫记录 处置弹窗 -->
<template>
<Dialog title="处置安灯呼叫" v-model="dialogVisible" width="600px">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<!-- 只读展示呼叫信息 -->
<el-form-item label="工作站">
<el-input :model-value="recordInfo.workstationName" disabled />
</el-form-item>
<el-form-item label="发起人">
<el-input :model-value="recordInfo.userNickname" disabled />
</el-form-item>
<el-form-item label="呼叫原因">
<el-input :model-value="recordInfo.reason" disabled />
</el-form-item>
<el-form-item label="级别">
<dict-tag :type="DICT_TYPE.MES_PRO_ANDON_LEVEL" :value="recordInfo.level" />
</el-form-item>
<!-- 可编辑字段 -->
<el-form-item label="处置时间" prop="handleTime">
<el-date-picker
v-model="formData.handleTime"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择处置时间"
style="width: 100%"
/>
</el-form-item>
<el-form-item label="处置人" prop="handlerUserId">
<el-input :model-value="handlerNickname" disabled 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="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { ProAndonRecordApi } from '@/api/mes/pro/andon'
import { DICT_TYPE } from '@/utils/dict'
import { useUserStoreWithOut } from '@/store/modules/user'
import { formatDate } from '@/utils/formatTime'
defineOptions({ name: 'AndonHandleForm' })
const message = useMessage()
const dialogVisible = ref(false)
const formLoading = ref(false)
const formData = ref<any>({})
const recordInfo = ref<any>({})
const handlerNickname = ref('')
const formRules = reactive({
handleTime: [{ required: true, message: '处置时间不能为空', trigger: 'change' }],
handlerUserId: [{ required: true, message: '处置人不能为空', trigger: 'change' }]
})
const formRef = ref()
/** 打开弹窗 */
const open = async (id: number) => {
dialogVisible.value = true
formLoading.value = true
try {
//
recordInfo.value = await ProAndonRecordApi.getAndonRecord(id)
//
const userStore = useUserStoreWithOut()
formData.value = {
id: id,
handleTime: formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss'),
handlerUserId: userStore.getUser?.id,
remark: undefined
}
handlerNickname.value = userStore.getUser?.nickname || ''
} finally {
formLoading.value = false
}
}
defineExpose({ open })
/** 提交处置 */
const emit = defineEmits(['success'])
const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
await ProAndonRecordApi.handleAndonRecord(formData.value)
message.success('处置成功')
dialogVisible.value = false
emit('success')
} finally {
formLoading.value = false
}
}
</script>

View File

@ -0,0 +1,163 @@
<!-- 安灯呼叫记录 新增/详情弹窗 -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
:disabled="formType === 'detail'"
v-loading="formLoading"
>
<el-form-item label="工作站" prop="workstationId">
<MdWorkstationSelect v-model="formData.workstationId" placeholder="请选择工作站" />
</el-form-item>
<el-form-item label="发起人" prop="userId">
<el-input v-model="formData.userNickname" disabled placeholder="当前用户" />
</el-form-item>
<el-form-item label="生产工单" prop="workOrderId">
<el-input v-model="formData.workOrderId" placeholder="请输入工单编号(可选)" type="number" />
</el-form-item>
<el-form-item label="工序" prop="processId">
<el-input v-model="formData.processId" placeholder="请输入工序编号(可选)" type="number" />
</el-form-item>
<el-form-item label="呼叫原因" prop="reason">
<el-select
v-model="selectedConfigId"
placeholder="请选择呼叫原因"
clearable
style="width: 100%"
@change="handleConfigChange"
>
<el-option
v-for="config in configList"
:key="config.id"
:label="config.reason"
:value="config.id"
/>
</el-select>
</el-form-item>
<el-form-item label="级别" prop="level">
<dict-tag :type="DICT_TYPE.MES_PRO_ANDON_LEVEL" :value="formData.level" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
<!-- 详情模式额外展示 -->
<template v-if="formType === 'detail'">
<el-form-item label="状态">
<dict-tag :type="DICT_TYPE.MES_PRO_ANDON_STATUS" :value="formData.status" />
</el-form-item>
<el-form-item label="处置时间" v-if="formData.handleTime">
<el-input :model-value="formData.handleTime" disabled />
</el-form-item>
<el-form-item label="处置人" v-if="formData.handlerUserNickname">
<el-input :model-value="formData.handlerUserNickname" disabled />
</el-form-item>
</template>
</el-form>
<template #footer v-if="formType !== 'detail'">
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { ProAndonRecordApi, ProAndonConfigApi, ProAndonConfigVO } from '@/api/mes/pro/andon'
import { DICT_TYPE } from '@/utils/dict'
import MdWorkstationSelect from '@/views/mes/md/workstation/components/MdWorkstationSelect.vue'
import { useUserStoreWithOut } from '@/store/modules/user'
defineOptions({ name: 'AndonRecordForm' })
const { t } = useI18n()
const message = useMessage()
const dialogVisible = ref(false)
const dialogTitle = ref('')
const formLoading = ref(false)
const formType = ref('')
const formData = ref<any>({})
const formRules = reactive({
workstationId: [{ required: true, message: '工作站不能为空', trigger: 'change' }],
reason: [{ required: true, message: '呼叫原因不能为空', trigger: 'change' }],
level: [{ required: true, message: '级别不能为空', trigger: 'change' }]
})
const formRef = ref()
const configList = ref<ProAndonConfigVO[]>([])
const selectedConfigId = ref<number>()
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
formType.value = type
resetForm()
//
configList.value = await ProAndonConfigApi.getAndonConfigList()
if (type === 'create') {
dialogTitle.value = '新增安灯呼叫'
//
const userStore = useUserStoreWithOut()
formData.value.userId = userStore.getUser?.id
formData.value.userNickname = userStore.getUser?.nickname
} else if (type === 'detail') {
dialogTitle.value = '安灯呼叫详情'
formLoading.value = true
try {
formData.value = await ProAndonRecordApi.getAndonRecord(id!)
//
const config = configList.value.find((c) => c.reason === formData.value.reason)
if (config) {
selectedConfigId.value = config.id
}
} finally {
formLoading.value = false
}
}
}
defineExpose({ open })
/** 选择配置后自动填充原因和级别 */
const handleConfigChange = (configId: number) => {
const config = configList.value.find((c) => c.id === configId)
if (config) {
formData.value.reason = config.reason
formData.value.level = config.level
} else {
formData.value.reason = undefined
formData.value.level = undefined
}
}
/** 提交表单 */
const emit = defineEmits(['success'])
const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
await ProAndonRecordApi.createAndonRecord(formData.value)
message.success(t('common.createSuccess'))
dialogVisible.value = false
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
workstationId: undefined,
userId: undefined,
userNickname: undefined,
workOrderId: undefined,
processId: undefined,
reason: undefined,
level: undefined,
remark: undefined
}
selectedConfigId.value = undefined
formRef.value?.resetFields()
}
</script>

View File

@ -0,0 +1,271 @@
<!-- MES 安灯呼叫记录列表 -->
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="100px"
>
<el-form-item label="工作站" prop="workstationId">
<MdWorkstationSelect
v-model="queryParams.workstationId"
placeholder="请选择工作站"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="级别" prop="level">
<el-select
v-model="queryParams.level"
placeholder="请选择级别"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_ANDON_LEVEL)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_ANDON_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="发起时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openRecordForm('create')"
v-hasPermi="['mes:pro-andon-record:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="warning"
plain
@click="openConfigDialog"
v-hasPermi="['mes:pro-andon-config:query']"
>
<Icon icon="ep:setting" class="mr-5px" /> 安灯设置
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:pro-andon-record:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="工作站编码" align="center" prop="workstationCode" width="120" />
<el-table-column label="工作站名称" align="center" prop="workstationName" min-width="120" />
<el-table-column label="发起人" align="center" prop="userNickname" width="100" />
<el-table-column
label="发起时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180"
/>
<el-table-column label="工单编码" align="center" prop="workOrderCode" width="140" />
<el-table-column label="工序名称" align="center" prop="processName" width="120" />
<el-table-column label="呼叫原因" align="center" prop="reason" min-width="150" />
<el-table-column label="级别" align="center" prop="level" width="80">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_PRO_ANDON_LEVEL" :value="scope.row.level" />
</template>
</el-table-column>
<el-table-column
label="处置时间"
align="center"
prop="handleTime"
:formatter="dateFormatter"
width="180"
/>
<el-table-column label="处置人" align="center" prop="handlerUserNickname" width="100" />
<el-table-column label="状态" align="center" prop="status" width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_PRO_ANDON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="200" fixed="right">
<template #default="scope">
<el-button
v-if="scope.row.status === MesProAndonStatusEnum.ACTIVE"
link
type="success"
@click="openHandleForm(scope.row.id)"
v-hasPermi="['mes:pro-andon-record:update']"
>
处置
</el-button>
<el-button
link
type="primary"
@click="openRecordForm('detail', scope.row.id)"
v-hasPermi="['mes:pro-andon-record:query']"
>
详情
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:pro-andon-record:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 弹窗新增/详情 -->
<AndonRecordForm ref="recordFormRef" @success="getList" />
<!-- 弹窗处置 -->
<AndonHandleForm ref="handleFormRef" @success="getList" />
<!-- 弹窗安灯设置 -->
<AndonConfigDialog ref="configDialogRef" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { ProAndonRecordApi, ProAndonRecordVO } from '@/api/mes/pro/andon'
import AndonRecordForm from './AndonRecordForm.vue'
import AndonHandleForm from './AndonHandleForm.vue'
import AndonConfigDialog from './AndonConfigDialog.vue'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { MesProAndonStatusEnum } from '@/views/mes/utils/constants'
import MdWorkstationSelect from '@/views/mes/md/workstation/components/MdWorkstationSelect.vue'
defineOptions({ name: 'MesProAndon' })
const message = useMessage()
const { t } = useI18n()
const loading = ref(true)
const list = ref<ProAndonRecordVO[]>([])
const total = ref(0)
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
workstationId: undefined,
level: undefined,
status: undefined,
createTime: undefined
})
const queryFormRef = ref()
const exportLoading = ref(false)
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await ProAndonRecordApi.getAndonRecordPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 新增/详情弹窗 */
const recordFormRef = ref()
const openRecordForm = (type: string, id?: number) => {
recordFormRef.value.open(type, id)
}
/** 处置弹窗 */
const handleFormRef = ref()
const openHandleForm = (id: number) => {
handleFormRef.value.open(id)
}
/** 安灯设置弹窗 */
const configDialogRef = ref()
const openConfigDialog = () => {
configDialogRef.value.open()
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await ProAndonRecordApi.deleteAndonRecord(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
await message.exportConfirm()
exportLoading.value = true
const data = await ProAndonRecordApi.exportAndonRecord(queryParams)
download.excel(data, '安灯呼叫记录.xls')
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(async () => {
await getList()
})
</script>