chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备点检记录新增

Browse Source
This commit is contained in:
jiangxh
2026-05-21 17:54:57 +08:00
parent c09ca584c3
commit 2496d05349
25 changed files with 2188 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jeecgboot-vue3/src/api/common/api.ts
View File

@@ -1,8 +1,7 @@
import { defHttp } from '/@/utils/http/axios';
import { message } from 'ant-design-vue';
import { useGlobSetting } from '/@/hooks/setting';
const globSetting = useGlobSetting();
const baseUploadUrl = globSetting.uploadUrl;
import { resolveApiBaseUrl } from '/@/utils/env/apiBaseUrl';
enum Api {
positionList = '/sys/position/list',
userList = '/sys/user/list',
@@ -25,9 +24,9 @@ enum Api {
}
/**
* 上传父路径
* 上传地址（须含 context-path；开发环境 domain 仅为 host 时需拼 apiUrl）
*/
export const uploadUrl = `${baseUploadUrl}/sys/common/upload`;
export const uploadUrl = `${resolveApiBaseUrl()}/sys/common/upload`;
/**
* 职务列表

10
jeecgboot-vue3/src/utils/common/compUtils.ts
View File

@@ -1,4 +1,3 @@
import { useGlobSetting } from '/@/hooks/setting';
import { merge, random } from 'lodash-es';
import { isArray } from '/@/utils/is';
import { FormSchema } from '/@/components/Form';
@@ -14,11 +13,10 @@ import { useI18n } from "@/hooks/web/useI18n";
import {$electron} from "@/electron";
import {router} from "@/router";
import {encryptByBase64} from "@/utils/cipher";
import { resolveApiBaseUrl } from '/@/utils/env/apiBaseUrl';
//存放部门路径的数组
const departNamePath = ref<Record<string, string>>({});
const globSetting = useGlobSetting();
const baseApiUrl = globSetting.domainUrl;
/**
* 获取文件服务访问路径
* @param fileUrl 文件路径
@@ -31,10 +29,10 @@ export const getFileAccessHttpUrl = (fileUrl, prefix = 'http') => {
//判断是否是数组格式
let isArray = fileUrl.indexOf('[') != -1;
if (!isArray) {
let prefix = `${baseApiUrl}/sys/common/static/`;
const staticPrefix = `${resolveApiBaseUrl()}/sys/common/static/`;
// 判断是否已包含前缀
if (!fileUrl.startsWith(prefix)) {
result = `${prefix}${fileUrl}`;
if (!fileUrl.startsWith(staticPrefix)) {
result = `${staticPrefix}${fileUrl}`;
}
}
}

18
jeecgboot-vue3/src/utils/env/apiBaseUrl.ts vendored Normal file
View File

@@ -0,0 +1,18 @@
import { useGlobSetting } from '/@/hooks/setting';
/**
* 后端 API 根地址（含 servlet.context-path，如 /jeecg-boot）
* 开发环境 VITE_GLOB_DOMAIN_URL 常为 http://host:port，需与 VITE_GLOB_API_URL 拼接
*/
export function resolveApiBaseUrl(): string {
const { domainUrl, apiUrl } = useGlobSetting();
const domain = (domainUrl || '').replace(/\/$/, '');
const api = apiUrl || '';
if (!domain) {
return api;
}
if (!api || domain.endsWith(api) || domain.includes(`${api}/`)) {
return domain;
}
return `${domain}${api}`;
}

65
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.api.ts Normal file
View File

@@ -0,0 +1,65 @@
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
const { createConfirm } = useMessage();
enum Api {
list = '/xslmes/mesXslEquipInspectRecord/list',
save = '/xslmes/mesXslEquipInspectRecord/add',
edit = '/xslmes/mesXslEquipInspectRecord/edit',
deleteOne = '/xslmes/mesXslEquipInspectRecord/delete',
deleteBatch = '/xslmes/mesXslEquipInspectRecord/deleteBatch',
importExcel = '/xslmes/mesXslEquipInspectRecord/importExcel',
exportXls = '/xslmes/mesXslEquipInspectRecord/exportXls',
queryById = '/xslmes/mesXslEquipInspectRecord/queryById',
queryLineList = '/xslmes/mesXslEquipInspectRecord/queryLineListByRecordId',
generateRecordNo = '/xslmes/mesXslEquipInspectRecord/generateRecordNo',
loadLinesByEquipment = '/xslmes/mesXslEquipInspectRecord/loadLinesByEquipment',
batchCreateFromEquipment = '/xslmes/mesXslEquipInspectRecord/batchCreateFromEquipment',
handleFail = '/xslmes/mesXslEquipInspectRecord/handleFail',
}
export const getExportUrl = Api.exportXls;
export const getImportUrl = Api.importExcel;
export const list = (params) => defHttp.get({ url: Api.list, params });
export const queryById = (params: { id: string }) => defHttp.get({ url: Api.queryById, params });
export const queryLineListByRecordId = (params: { id: string }) => defHttp.get({ url: Api.queryLineList, params });
export const generateRecordNo = () => defHttp.get({ url: Api.generateRecordNo });
export const loadLinesByEquipment = (params: { equipmentLedgerId: string; recordType: string }) =>
defHttp.get({ url: Api.loadLinesByEquipment, params });
export const batchCreateFromEquipment = (params: { equipmentLedgerIds: string[]; recordType: string }) =>
defHttp.post({ url: Api.batchCreateFromEquipment, params });
export const deleteOne = (params, handleSuccess) => {
return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
handleSuccess();
});
};
export const batchDelete = (params, handleSuccess) => {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
handleSuccess();
});
},
});
};
export const saveOrUpdate = (params, isUpdate) => {
const url = isUpdate ? Api.edit : Api.save;
return defHttp.post({ url, params });
};
export const handleFailRecord = (params: Recordable) => defHttp.post({ url: Api.handleFail, params });

222
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecord.data.ts Normal file
View File

@@ -0,0 +1,222 @@
import { BasicColumn, FormSchema } from '/@/components/Table';
import { JVxeColumn, JVxeTypes } from '/@/components/jeecg/JVxeTable/types';
import { uploadUrl } from '/@/api/common/api';
export const columns: BasicColumn[] = [
{ title: '记录编号', align: 'center', dataIndex: 'recordNo', width: 150 },
{ title: '计划单号', align: 'center', dataIndex: 'planNo', width: 130 },
{ title: '设备名称', align: 'center', dataIndex: 'equipmentName', width: 150 },
{ title: '设备编码', align: 'center', dataIndex: 'equipmentCode', width: 130 },
{ title: '类型', align: 'center', dataIndex: 'recordType_dictText', width: 80 },
{ title: '点检日期', align: 'center', dataIndex: 'inspectDate', width: 110 },
{ title: '点检人', align: 'center', dataIndex: 'inspectorRealname', width: 100 },
{ title: '点检结果', align: 'center', dataIndex: 'inspectResult_dictText', width: 90 },
{ title: '是否已处理', align: 'center', dataIndex: 'handledFlag_dictText', width: 90 },
{ title: '状态', align: 'center', dataIndex: 'recordStatus_dictText', width: 90 },
{
title: '创建时间',
align: 'center',
dataIndex: 'createTime',
width: 165,
customRender: ({ text }) => (!text ? '' : String(text).length > 19 ? String(text).substring(0, 19) : text),
},
];
export const searchFormSchema: FormSchema[] = [
{ label: '记录编号', field: 'recordNo', component: 'Input', colProps: { span: 6 } },
{ label: '计划单号', field: 'planNo', component: 'Input', colProps: { span: 6 } },
{ label: '设备名称', field: 'equipmentName', component: 'Input', colProps: { span: 6 } },
{
label: '类型',
field: 'recordType',
component: 'JDictSelectTag',
componentProps: { dictCode: 'xslmes_im_item_category' },
colProps: { span: 6 },
},
{
label: '状态',
field: 'recordStatus',
component: 'JDictSelectTag',
componentProps: { dictCode: 'xslmes_im_record_status' },
colProps: { span: 6 },
},
];
export const formSchema: FormSchema[] = [
{ label: '', field: 'id', component: 'Input', show: false },
{ label: '', field: 'equipmentLedgerId', component: 'Input', show: false },
{ label: '', field: 'planId', component: 'Input', show: false },
{ label: '', field: 'equipInspectConfigId', component: 'Input', show: false },
{ label: '', field: 'inspectorUserId', component: 'Input', show: false },
{ label: '', field: 'inspectorUsername', component: 'Input', show: false },
{
label: '记录编号',
field: 'recordNo',
component: 'Input',
componentProps: { readonly: true, placeholder: '保存时自动生成' },
dynamicRules: () => [{ required: true, message: '记录编号不能为空' }],
},
{ label: '计划单号', field: 'planNo', component: 'Input' },
{
label: '设备名称',
field: 'equipmentName',
component: 'Input',
componentProps: { readonly: true },
},
{
label: '设备编码',
field: 'equipmentCode',
component: 'Input',
componentProps: { readonly: true },
},
{
label: '类型',
field: 'recordType',
component: 'JDictSelectTag',
componentProps: { dictCode: 'xslmes_im_item_category', disabled: true },
},
{
label: '点检日期',
field: 'inspectDate',
component: 'DatePicker',
required: true,
componentProps: { valueFormat: 'YYYY-MM-DD', style: { width: '100%' } },
},
{
label: '点检人',
field: 'inspectorRealname',
component: 'Input',
componentProps: { readonly: true, placeholder: '当前登录用户' },
dynamicRules: () => [{ required: true, message: '点检人不能为空' }],
},
{
label: '点检结果',
field: 'inspectResult',
component: 'JDictSelectTag',
required: true,
componentProps: { dictCode: 'xslmes_im_inspect_result', placeholder: '合格/不合格' },
},
{
label: '状态',
field: 'recordStatus',
component: 'JDictSelectTag',
componentProps: { dictCode: 'xslmes_im_record_status', disabled: true },
},
];
/** 详情页：仅不合格记录展示的处理信息（只读） */
export const processDisplayFormSchema: FormSchema[] = [
{
label: '是否已处理',
field: 'handledFlag',
component: 'JDictSelectTag',
componentProps: { dictCode: 'yn', disabled: true },
},
{
label: '处理人',
field: 'handlerRealname',
component: 'Input',
componentProps: { readonly: true },
},
{
label: '处理时间',
field: 'handleTime',
component: 'DatePicker',
componentProps: {
showTime: true,
valueFormat: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
disabled: true,
},
},
];
/** 不合格记录处理弹窗 */
export const handleFormSchema: FormSchema[] = [
{ label: '', field: 'id', component: 'Input', show: false },
{ label: '', field: 'handlerUsername', component: 'Input', show: false },
{ label: '', field: 'handlerRealname', component: 'Input', show: false },
{
label: '处理人',
field: 'handlerUserId',
component: 'JSelectUser',
required: true,
componentProps: ({ formActionType }) => ({
rowKey: 'id',
labelKey: 'realname',
isRadioSelection: true,
maxSelectCount: 1,
onOptionsChange: (options) => {
const row = options?.[0];
if (row && formActionType) {
formActionType.setFieldsValue({
handlerUsername: row.username,
handlerRealname: row.realname,
});
}
},
}),
},
{
label: '处理时间',
field: 'handleTime',
component: 'DatePicker',
required: true,
componentProps: {
showTime: true,
valueFormat: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
},
},
];
export const lineJVxeColumns: JVxeColumn[] = [
{ title: '', key: 'equipInspectConfigLineId', type: JVxeTypes.hidden },
{ title: '', key: 'inspectMaintainItemId', type: JVxeTypes.hidden },
{ title: '点检项目编号', key: 'itemCode', type: JVxeTypes.normal, width: 120, disabled: true },
{ title: '点检项目', key: 'itemName', type: JVxeTypes.normal, width: 130, disabled: true },
{
title: '项目类别',
key: 'itemCategory',
type: JVxeTypes.select,
width: 90,
disabled: true,
dictCode: 'xslmes_im_item_category',
filters: false,
sortable: false,
},
{
title: '项目类型',
key: 'itemType',
type: JVxeTypes.select,
width: 90,
disabled: true,
dictCode: 'xslmes_im_item_type',
filters: false,
sortable: false,
},
{ title: '设备部位', key: 'equipmentPartName', type: JVxeTypes.normal, width: 100, disabled: true },
{ title: '设备小部位', key: 'equipmentSubPartName', type: JVxeTypes.normal, width: 100, disabled: true },
{
title: '点检方式',
key: 'inspectMethod',
type: JVxeTypes.select,
width: 90,
disabled: true,
dictCode: 'xslmes_im_inspect_method',
filters: false,
sortable: false,
},
{ title: '判断基准', key: 'judgmentCriteria', type: JVxeTypes.normal, width: 150, disabled: true },
{ title: '点检描述', key: 'lineInspectResult', type: JVxeTypes.input, width: 140 },
{
title: '图片',
key: 'pictureFiles',
type: JVxeTypes.image,
width: 160,
maxCount: 3,
token: true,
action: uploadUrl,
responseName: 'message',
},
];

153
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList.vue Normal file
View File

@@ -0,0 +1,153 @@
<template>
<div>
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<template #tableTitle>
<a-button
type="primary"
v-auth="'mes:mes_xsl_equip_inspect_record:exportXls'"
preIcon="ant-design:export-outlined"
@click="onExportXls"
>
导出
</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined" />
删除
</a-menu-item>
</a-menu>
</template>
<a-button v-auth="'mes:mes_xsl_equip_inspect_record:deleteBatch'">
批量操作
<Icon icon="mdi:chevron-down" />
</a-button>
</a-dropdown>
</template>
<template #action="{ record }">
<TableAction :actions="getTableActions(record)" :dropDownActions="getDropDownAction(record)" />
</template>
</BasicTable>
<MesXslEquipInspectRecordModal @register="registerModal" @success="handleSuccess" />
<MesXslEquipInspectRecordHandleModal @register="registerHandleModal" @success="handleSuccess" />
</div>
</template>
<script lang="ts" name="xslmes-mesXslEquipInspectRecord" setup>
import { BasicTable, TableAction } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage';
import { useMessage } from '/@/hooks/web/useMessage';
import Icon from '/@/components/Icon';
import MesXslEquipInspectRecordModal from './components/MesXslEquipInspectRecordModal.vue';
import MesXslEquipInspectRecordHandleModal from './components/MesXslEquipInspectRecordHandleModal.vue';
import { columns, searchFormSchema } from './MesXslEquipInspectRecord.data';
import { list, deleteOne, batchDelete, getExportUrl } from './MesXslEquipInspectRecord.api';
const { createMessage } = useMessage();
const [registerModal, { openModal }] = useModal();
const [registerHandleModal, { openModal: openHandleModal }] = useModal();
const { tableContext, onExportXls } = useListPage({
tableProps: {
title: '点检保养记录',
api: list,
columns,
canResize: true,
formConfig: {
schemas: searchFormSchema,
labelWidth: 100,
autoSubmitOnEnter: true,
showAdvancedButton: true,
},
actionColumn: {
width: 240,
fixed: 'right',
},
},
exportConfig: {
name: '点检保养记录',
url: getExportUrl,
},
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
function handleEnterResult(record: Recordable) {
if (record.recordStatus !== 'pending') {
createMessage.warning('仅待点检记录可录入点检结果');
return;
}
openModal(true, { record, showFooter: true });
}
function handleDetail(record: Recordable) {
openModal(true, { record, showFooter: false });
}
function canHandleFail(record: Recordable) {
return (
record.inspectResult === 'fail' &&
record.recordStatus === 'done' &&
record.handledFlag !== '1'
);
}
function handleProcess(record: Recordable) {
if (!canHandleFail(record)) {
createMessage.warning('仅未处理的不合格记录可登记处理');
return;
}
openHandleModal(true, { record });
}
function getTableActions(record: Recordable) {
if (record.recordStatus === 'pending') {
return [
{
label: '录入点检结果',
onClick: handleEnterResult.bind(null, record),
auth: 'mes:mes_xsl_equip_inspect_record:edit',
},
];
}
const actions: Recordable[] = [{ label: '详情', onClick: handleDetail.bind(null, record) }];
if (canHandleFail(record)) {
actions.push({
label: '处理',
onClick: handleProcess.bind(null, record),
auth: 'mes:mes_xsl_equip_inspect_record:edit',
});
}
return actions;
}
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
function handleSuccess() {
selectedRowKeys.value = [];
reload();
}
function getDropDownAction(record: Recordable) {
if (record.recordStatus === 'pending') {
return [
{ label: '详情', onClick: handleDetail.bind(null, record) },
{
label: '删除',
popConfirm: { title: '是否确认删除', confirm: handleDelete.bind(null, record) },
auth: 'mes:mes_xsl_equip_inspect_record:delete',
},
];
}
return [];
}
</script>

63
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordHandleModal.vue Normal file
View File

@@ -0,0 +1,63 @@
<template>
<BasicModal v-bind="$attrs" destroyOnClose title="不合格记录处理" width="520px" @register="registerModal" @ok="handleSubmit">
<BasicForm @register="registerForm" />
</BasicModal>
</template>
<script lang="ts" setup>
import dayjs from 'dayjs';
import { BasicModal, useModalInner } from '/@/components/Modal';
import { BasicForm, useForm } from '/@/components/Form/index';
import { useMessage } from '/@/hooks/web/useMessage';
import { useUserStore } from '/@/store/modules/user';
import { handleFormSchema } from '../MesXslEquipInspectRecord.data';
import { handleFailRecord } from '../MesXslEquipInspectRecord.api';
const emit = defineEmits(['register', 'success']);
const { createMessage } = useMessage();
const userStore = useUserStore();
const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
labelWidth: 100,
schemas: handleFormSchema,
showActionButtonGroup: false,
baseColProps: { span: 24 },
});
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
await resetFields();
setModalProps({ confirmLoading: false });
const record = data?.record;
if (!record?.id) {
return;
}
const user = userStore.getUserInfo || {};
await setFieldsValue({
id: record.id,
handlerUserId: user.id,
handlerUsername: user.username,
handlerRealname: user.realname,
handleTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
});
});
async function handleSubmit() {
try {
const values = await validate();
if (!values.handlerUserId) {
createMessage.warning('请选择处理人');
return;
}
if (!values.handleTime) {
createMessage.warning('请选择处理时间');
return;
}
setModalProps({ confirmLoading: true });
await handleFailRecord(values);
closeModal();
emit('success');
} finally {
setModalProps({ confirmLoading: false });
}
}
</script>

173
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordModal.vue Normal file
View File

@@ -0,0 +1,173 @@
<template>
<BasicModal
v-bind="$attrs"
destroyOnClose
:title="title"
width="1150px"
@register="registerModal"
@ok="handleSubmit"
>
<BasicForm @register="registerForm" />
<a-divider orientation="left">点检项目明细（来自设备点检配置，只读）</a-divider>
<JVxeTable
v-if="tableReady"
ref="lineTableRef"
row-number
keep-source
:insert-row="false"
:toolbar="false"
:row-selection="false"
:max-height="400"
:loading="lineLoading"
:columns="lineColumns"
:dataSource="lineDataSource"
/>
</BasicModal>
</template>
<script lang="ts" setup>
import { computed, ref, unref } from 'vue';
import dayjs from 'dayjs';
import { BasicModal, useModalInner } from '/@/components/Modal';
import { BasicForm, useForm } from '/@/components/Form/index';
import type { JVxeColumn, JVxeTableInstance } from '/@/components/jeecg/JVxeTable/types';
import { useMessage } from '/@/hooks/web/useMessage';
import { useUserStore } from '/@/store/modules/user';
import { formSchema, lineJVxeColumns, processDisplayFormSchema } from '../MesXslEquipInspectRecord.data';
import { saveOrUpdate, queryById, queryLineListByRecordId } from '../MesXslEquipInspectRecord.api';
const emit = defineEmits(['register', 'success']);
const { createMessage } = useMessage();
const userStore = useUserStore();
const isDetail = ref(false);
const showFooterFlag = ref(true);
const tableReady = ref(false);
const lineLoading = ref(false);
const lineDataSource = ref<Recordable[]>([]);
const lineTableRef = ref<JVxeTableInstance>();
const lineColumns = computed<JVxeColumn[]>(() =>
lineJVxeColumns.map((col) => {
const editable = col.key === 'lineInspectResult' || col.key === 'pictureFiles';
if (editable) {
return { ...col, disabled: !showFooterFlag.value };
}
return { ...col, disabled: true };
}),
);
const showProcessFields = ref(false);
const [registerForm, { resetFields, setFieldsValue, validate, setProps, resetSchema }] = useForm({
labelWidth: 110,
schemas: formSchema,
showActionButtonGroup: false,
baseColProps: { span: 12 },
});
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
tableReady.value = false;
lineDataSource.value = [];
await resetFields();
const editable = !!data?.showFooter;
setModalProps({ confirmLoading: false, showCancelBtn: editable, showOkBtn: editable });
isDetail.value = !editable;
showFooterFlag.value = editable;
setProps({ disabled: !editable });
showProcessFields.value = false;
await resetSchema(formSchema);
if (data?.record?.id) {
lineLoading.value = true;
try {
const mainRaw = await queryById({ id: data.record.id });
const m = (mainRaw as any)?.id != null ? mainRaw : (mainRaw as any)?.result ?? mainRaw;
if (editable && m.recordStatus !== 'pending') {
createMessage.warning('仅待点检记录可录入点检结果');
setModalProps({ showOkBtn: false, showCancelBtn: true });
isDetail.value = true;
showFooterFlag.value = false;
setProps({ disabled: true });
}
const linesRaw = await queryLineListByRecordId({ id: data.record.id });
const list = Array.isArray(linesRaw) ? linesRaw : (linesRaw as any)?.result ?? [];
const user = userStore.getUserInfo || {};
const patch: Recordable = { ...m };
if (editable && showFooterFlag.value) {
if (!patch.inspectDate) {
patch.inspectDate = dayjs().format('YYYY-MM-DD');
}
if (!patch.inspectorRealname) {
patch.inspectorUserId = user.id;
patch.inspectorUsername = user.username;
patch.inspectorRealname = user.realname;
}
}
await setFieldsValue(patch);
if (!editable && m.inspectResult === 'fail') {
showProcessFields.value = true;
await resetSchema([...formSchema, ...processDisplayFormSchema]);
await setFieldsValue(patch);
}
lineDataSource.value = [...(list || [])];
} finally {
lineLoading.value = false;
}
}
tableReady.value = true;
});
const title = computed(() =>
unref(isDetail) ? '点检保养记录详情' : '录入点检结果',
);
async function handleSubmit() {
if (!showFooterFlag.value) {
return;
}
try {
const values = await validate();
const lineRef = lineTableRef.value as any;
const tableData = (lineRef?.getTableData?.() || lineDataSource.value || []) as Recordable[];
const lineList = tableData
.filter((r) => r && r.equipInspectConfigLineId)
.map((r) => ({
id: r.id,
equipInspectConfigLineId: r.equipInspectConfigLineId,
inspectMaintainItemId: r.inspectMaintainItemId,
itemCode: r.itemCode,
itemName: r.itemName,
itemCategory: r.itemCategory,
itemType: r.itemType,
equipmentPartName: r.equipmentPartName,
equipmentSubPartName: r.equipmentSubPartName,
inspectMethod: r.inspectMethod,
judgmentCriteria: r.judgmentCriteria,
lineInspectResult: r.lineInspectResult,
pictureFiles: r.pictureFiles,
}));
if (!lineList.length) {
createMessage.warning('点检明细不能为空');
return;
}
if (!values.inspectResult) {
createMessage.warning('请选择点检结果');
return;
}
if (!values.inspectDate) {
createMessage.warning('请选择点检日期');
return;
}
if (!values.inspectorRealname) {
createMessage.warning('点检人不能为空');
return;
}
setModalProps({ confirmLoading: true });
await saveOrUpdate({ ...values, recordStatus: 'done', lineList }, true);
closeModal();
emit('success');
} finally {
setModalProps({ confirmLoading: false });
}
}
</script>

64
jeecgboot-vue3/src/views/xslmes/mesXslEquipmentLedger/MesXslEquipmentLedgerList.vue
View File

@@ -5,6 +5,24 @@
<a-button type="primary" v-auth="'mes:mes_xsl_equipment_ledger:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">
新增
</a-button>
<a-button
type="primary"
v-auth="'mes:mes_xsl_equip_inspect_record:add'"
:disabled="selectedRowKeys.length === 0"
preIcon="ant-design:audit-outlined"
@click="handleBatchCreateRecord('inspect')"
>
点检
</a-button>
<a-button
type="primary"
v-auth="'mes:mes_xsl_equip_inspect_record:add'"
:disabled="selectedRowKeys.length === 0"
preIcon="ant-design:tool-outlined"
@click="handleBatchCreateRecord('maintain')"
>
保养
</a-button>
<a-button
type="primary"
v-auth="'mes:mes_xsl_equipment_ledger:exportXls'"
@@ -53,10 +71,14 @@
import { BasicTable, TableAction } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage';
import { useMessage } from '/@/hooks/web/useMessage';
import Icon from '/@/components/Icon';
import MesXslEquipmentLedgerModal from './components/MesXslEquipmentLedgerModal.vue';
import { columns, searchFormSchema } from './MesXslEquipmentLedger.data';
import { list, deleteOne, batchDelete, getExportUrl, getImportUrl } from './MesXslEquipmentLedger.api';
import { batchCreateFromEquipment } from '../mesXslEquipInspectRecord/MesXslEquipInspectRecord.api';
const { createMessage, createConfirm } = useMessage();
const [registerModal, { openModal }] = useModal();
@@ -87,7 +109,7 @@
},
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
const [registerTable, { reload, getSelectRows }, { rowSelection, selectedRowKeys }] = tableContext;
function handleAdd() {
openModal(true, { isUpdate: false, showFooter: true });
@@ -114,6 +136,46 @@
selectedRowKeys.value = [];
}
function handleBatchCreateRecord(recordType: 'inspect' | 'maintain') {
const rows = (getSelectRows?.() || []) as Recordable[];
if (!rows.length) {
createMessage.warning('请先勾选设备');
return;
}
const ids = rows.map((r) => r.id).filter(Boolean);
const typeLabel = recordType === 'inspect' ? '点检' : '保养';
createConfirm({
iconType: 'info',
title: `生成${typeLabel}记录`,
content: `确定为选中的 ${ids.length} 台设备各生成一条${typeLabel}记录？`,
okText: '确定',
cancelText: '取消',
onOk: async () => {
try {
const res = await batchCreateFromEquipment({ equipmentLedgerIds: ids, recordType });
const data = (res as any)?.result ?? res;
const failList: string[] = data?.failMessages || [];
const successCount = data?.successCount ?? 0;
if (successCount > 0 && !failList.length) {
createMessage.success(`成功生成 ${successCount} 条${typeLabel}记录`);
handleSuccess();
} else if (successCount > 0 && failList.length) {
createMessage.warning(`成功生成 ${successCount} 条；未生成：${failList.join('；')}`);
handleSuccess();
} else if (failList.length) {
createMessage.warning(failList.join('；'));
} else {
createMessage.warning((res as any)?.message || `未生成任何${typeLabel}记录`);
}
} catch (e: any) {
const errMsg =
e?.response?.data?.message || e?.message || `生成${typeLabel}记录失败`;
createMessage.warning(errMsg);
}
},
});
}
function getDropDownAction(record: Recordable) {
return [
{ label: '详情', onClick: handleDetail.bind(null, record) },