实现密炼物料种类配置关联解析功能,新增种类查找表加载与解析接口,优化选料弹窗层级与刷新功能,增强用户体验与系统稳定性。

This commit is contained in:
geht
2026-05-25 20:29:07 +08:00
parent dc3f305303
commit 441c19e87a
13 changed files with 556 additions and 170 deletions

View File

@@ -6,6 +6,7 @@
:defaultFullscreen="true"
wrapClassName="mixing-spec-modal-wrap"
@register="registerModal"
@cancel="closeNestedPickers"
@ok="handleSubmit"
>
<template #title>{{ title }}</template>
@@ -882,9 +883,18 @@ const [registerForm, { resetFields, setFieldsValue, validate, setProps }] = useF
});
//update-begin---author:cursor ---date:20260522 for【XSLMES-20260522-A33】混炼示方主表选择弹窗-----------
const [registerMachineModal, { openModal: openMachineModalInner }] = useModal();
const [registerIssueNumberModal, { openModal: openIssueNumberModalInner }] = useModal();
const [registerMixingMaterialModal, { openModal: openMixingMaterialModalInner }] = useModal();
const [registerMachineModal, { openModal: openMachineModalInner, closeModal: closeMachineModal }] = useModal();
const [registerIssueNumberModal, { openModal: openIssueNumberModalInner, closeModal: closeIssueNumberModal }] = useModal();
const [registerMixingMaterialModal, { openModal: openMixingMaterialModalInner, closeModal: closeMixingMaterialModal, setModalProps: setMixingMaterialModalProps }] = useModal();
//update-begin---author:cursor ---date:20260525 for【XSLMES-20260525-A52】关闭混炼示方弹窗时同步关闭嵌套选料弹窗-----------
function closeNestedPickers() {
closeMixingMaterialModal();
closeMachineModal();
closeIssueNumberModal();
materialPickerRow.value = null;
}
//update-end---author:cursor ---date:20260525 for【XSLMES-20260525-A52】关闭混炼示方弹窗时同步关闭嵌套选料弹窗-----------
function openMachinePicker() {
if (!showFooter.value) {
@@ -924,7 +934,10 @@ function openMixingMaterialPicker(row: Recordable) {
return;
}
materialPickerRow.value = row;
//update-begin---author:cursor ---date:20260525 for【XSLMES-20260525-A52】选料弹窗层级高于全屏父弹窗-----------
setMixingMaterialModalProps({ zIndex: 1500 });
openMixingMaterialModalInner(true, { picker: true, ts: Date.now() });
//update-end---author:cursor ---date:20260525 for【XSLMES-20260525-A52】选料弹窗层级高于全屏父弹窗-----------
}
function onMixingMaterialSelect(payload: Recordable | null) {