From 6b68e3b581df1e042e31707d7a8c6c8e5e69764b Mon Sep 17 00:00:00 2001 From: pengm <674192343@qq.com> Date: Mon, 27 Apr 2026 15:48:38 +0800 Subject: [PATCH] 1.修改下料表格的产量字段的时，调用指令集必须等指令集执行成功才将下料，打印按钮回置 --- src/components/Common/CommonComponent/index.js | 4 ++-- src/components/Common/CommonTable/index.js | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index 95e5668..9d66076 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -326,7 +326,7 @@ export default class CommonComponent extends Component { } const { name, record, onQuickFieldUpdate, showConfig } = this.props; - + // 定义需要在弹窗中特殊处理的字段列表 const modalFields = [ 'dAdvanceReportQty', @@ -334,7 +334,7 @@ export default class CommonComponent extends Component { 'dAdvanceMadeUpFei', 'iAdvanceLaminatingPaper' ]; - + // 判断是否是特定字段并且在模态框中，如果是，就不调用 onQuickFieldUpdate const isInModal = event?.target ? this.bInModal(event.target) : false; console.log('字段:', showConfig?.sName, '是否在弹窗中:', isInModal); diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index 0cee77a..e6bb612 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -4742,7 +4742,7 @@ class CommonTableRc extends React.Component { > {tableBtnsConfig.map(config => { const { showName, btnBgColor, sDefault: str } = config; - const disabled = props.getBtnDisabled({ + let disabled = props.getBtnDisabled({ str, defaultValue: false, record @@ -4755,7 +4755,13 @@ class CommonTableRc extends React.Component { ) { bLoading = true; } - return ( + if( !disabled && window.instructSetLock && + ((config.sControlName === 'BtnEventBlanking' && config.showName === '下料') || + (config.sControlName === 'BtnPrint1' && config.showName === '标条') ) + ) { + disabled = true; + } + return (