1.修改下料表格的产量字段的时，调用指令集必须等指令集执行成功才将下料，打印按钮回置

Min
1 parent 1c7d254d
Showing 2 changed files with 10 additions and 4 deletions
src/components/Common/CommonComponent/index.js
src/components/Common/CommonTable/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);
@@ -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 (
                   <Button
                     disabled={disabled}
                     size="large"