From 9509a46cc5631df6b596e45d922ee070a6dbb3ac Mon Sep 17 00:00:00 2001 From: qmj <37242163+qmj666@users.noreply.github.com> Date: Sat, 24 Jan 2026 11:38:49 +0800 Subject: [PATCH] 调整产量上班按钮名 --- src/components/Common/CommonListEvent.js | 20 ++++++++++---------- src/components/Common/CommonListTabEvent.js | 6 +++--- src/components/Common/CommonListTreeEvent.js | 2 +- src/components/Common/CommonTable/index.js | 4 ++-- src/mes/common/commonOperationBarComponent/MesToolbar.js | 8 ++++---- src/mes/scheduledTasks/machineTasks/index.js | 10 +++++----- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/components/Common/CommonListEvent.js b/src/components/Common/CommonListEvent.js index 3624942..3fe0149 100644 --- a/src/components/Common/CommonListEvent.js +++ b/src/components/Common/CommonListEvent.js @@ -49,7 +49,7 @@ export default (ChildComponent) => { } async componentWillReceiveProps(nextProps) { - + const { app, formData, currentId, searchSolution, masterData, sGroupByList, formRoute, sModelsType, } = nextProps; let { slaveConfig: slaveConfigOld } = nextProps; // nextProps.onSaveState({ realizeHeight: nextProps.realizeHeight }); @@ -139,7 +139,7 @@ export default (ChildComponent) => { bFilterValue: app.sMachineNameSId, }); const pageNum = 1; - + addState = (await this.props.handleGetDataSet({ name: 'slave', configData: slaveConfig, @@ -344,7 +344,7 @@ export default (ChildComponent) => { if (commonUtils.isNotEmptyNumber(formData[0].iPageSize) && formData[0].iPageSize !== 0) { iPageSize = formData[0].iPageSize; } - + await this.handleGetData(slaveConfig, filterCondition, 1, commonUtils.isNotEmptyNumber(iPageSize) && iPageSize !== 0 ? iPageSize : commonConfig.pageSize, '', false, sGroupByList); slaveInfoConfig = formData[1]; slaveInfoColumn = {}; @@ -422,7 +422,7 @@ export default (ChildComponent) => { }); } else if (JSON.stringify(app.currentPane.conditonValues) !== JSON.stringify(this.props.app.currentPane.conditonValues)) { const { slaveConfig, slaveFilterCondition } = nextProps; - + this.handleGetData(slaveConfig, slaveFilterCondition, 1, commonUtils.isNotEmptyNumber(iPageSize) && iPageSize !== 0 ? iPageSize : commonConfig.pageSize, undefined, undefined, undefined, nextProps); } else if (JSON.stringify(nextProps.id) !== JSON.stringify(this.props.id)) { this.props.onSaveState({ slaveSelectedRowKeys: [] }); @@ -442,7 +442,7 @@ export default (ChildComponent) => { const slaveConfig = formData.filter(item => item.bGrd && item.sTbName === 'elemachine')[0]; const slaveColumn = commonFunc.getHeaderConfig(slaveConfig); - + this.handleGetData(slaveConfig, undefined, undefined, undefined, undefined, undefined, undefined, nextProps); this.props.onSaveState({ masterConfig: currConfig, masterData, slaveConfig, slaveColumn, enabled: true, pageLoading: false, @@ -452,10 +452,10 @@ export default (ChildComponent) => { if (this.props.pageNum >= Math.ceil(slavePagination.total / slavePagination.pageSize)) { this.props.onToFirst(); } else if (commonUtils.isNotEmptyArr(treeFilterCondition)) { /* 判断是否有树过滤条件 */ - + this.handleGetData(slaveConfig, slaveFilterCondition, nextProps.pageNum, slavePagination.pageSize, slaveOrderBy, '', sGroupByList, '', treeFilterCondition); } else { - + this.handleGetData(slaveConfig, slaveFilterCondition, nextProps.pageNum, slavePagination.pageSize, slaveOrderBy, '', sGroupByList); } } @@ -693,7 +693,7 @@ export default (ChildComponent) => { if (formRoute === '/indexPage/materialRequirementsPlanning' && clearSelectData) { const { slaveFilterCondition, slaveInfoConfig } = this.props; if (commonUtils.isNotEmptyObject(slaveInfoConfig)) { - + this.handleGetDataInfo(slaveInfoConfig, slaveFilterCondition, 1); } } @@ -1540,7 +1540,7 @@ export default (ChildComponent) => { message.warn('未配置！不能生成！'); return; } - } else if (name === 'BtnCopyTo.ActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ + } else if (name === 'BtnCopyTo.tmpInfoBySqlActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ if (commonUtils.isNotEmptyArr(copyToData) && copyToData[0].sState === '3') { message.warn('工序已暂停，无法开工！'); return; @@ -1774,7 +1774,7 @@ export default (ChildComponent) => { }); copyToData = copyToDataNew; } - } else if (name === 'BtnCopyTo.ActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ + } else if (name === 'BtnCopyTo.tmpInfoBySqlActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ if (commonUtils.isNotEmptyArr(copyToData) && copyToData[0].sState === '3') { message.warn('工序已暂停，无法开工！'); return; diff --git a/src/components/Common/CommonListTabEvent.js b/src/components/Common/CommonListTabEvent.js index 3df57be..24821f4 100644 --- a/src/components/Common/CommonListTabEvent.js +++ b/src/components/Common/CommonListTabEvent.js @@ -1262,7 +1262,7 @@ export default (ChildComponent) => { conditionValues = this.props.getSqlCondition(slaveConfig, tableType, record); } else if(commonUtils.isNotEmptyObject(currentPane) && !commonUtils.isEmpty(currentPane.conditonValues)) { conditionValues = currentPane.conditonValues; - } + } /* 导出使用Post提交 */ const url = `${commonConfig.server_host}excel/export/${slaveConfig.sId}?sModelsId=${slaveConfig.sParentId}&sName=${formRoute}&token=${encodeURIComponent(this.props.app.token)}`; @@ -1614,7 +1614,7 @@ export default (ChildComponent) => { }); copyToData = copyToDataNew; } - } else if (name === 'BtnCopyTo.ActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ + } else if (name === 'BtnCopyTo.tmpInfoBySqlActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ if (commonUtils.isNotEmptyArr(copyToData) && copyToData[0].sState === '3') { message.warn('工序已暂停，无法开工！'); return; @@ -1798,7 +1798,7 @@ export default (ChildComponent) => { }); copyToData = copyToDataNew; } - } else if (name === 'BtnCopyTo.ActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ + } else if (name === 'BtnCopyTo.tmpInfoBySqlActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ if (commonUtils.isNotEmptyArr(copyToData) && copyToData[0].sState === '3') { message.warn('工序已暂停，无法开工！'); return; diff --git a/src/components/Common/CommonListTreeEvent.js b/src/components/Common/CommonListTreeEvent.js index 654cf69..50a14f4 100644 --- a/src/components/Common/CommonListTreeEvent.js +++ b/src/components/Common/CommonListTreeEvent.js @@ -1087,7 +1087,7 @@ export default (ChildComponent) => { detailCopy.data = sChildData; } addcopyOther.push(detailCopy); - } else if (name === 'BtnCopyTo.ActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ + } else if (name === 'BtnCopyTo.tmpInfoBySqlActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ if (commonUtils.isNotEmptyArr(copyToData) && copyToData[0].sState === '3') { message.warn('工序已暂停，无法开工！'); return; diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index 7a40c15..d982dba 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -4859,8 +4859,8 @@ class CommonTableRc extends React.Component { const { [this.rowKey]: rowKeyId } = record; const { selectedRowKeys = [] } = props; - if (sControlName?.includes('BtnTableCopyTo.ActProduceReport')) { - const copyToConfig = props?.config?.gdsconfigformslave.filter(x=>x.sControlName.includes('BtnTableCopyTo.ActProduceReport')) + if (sControlName?.includes('BtnTableCopyTo.tmpInfoBySqlActProduceReport')) { + const copyToConfig = props?.config?.gdsconfigformslave.filter(x=>x.sControlName.includes('BtnTableCopyTo.tmpInfoBySqlActProduceReport')) props.onCopyTo(props.name, config.sActiveId, config, copyToConfig, record) return } diff --git a/src/mes/common/commonOperationBarComponent/MesToolbar.js b/src/mes/common/commonOperationBarComponent/MesToolbar.js index beb733b..87e5fb4 100644 --- a/src/mes/common/commonOperationBarComponent/MesToolbar.js +++ b/src/mes/common/commonOperationBarComponent/MesToolbar.js @@ -1059,9 +1059,9 @@ const handleScanFace = (props) => { proData.forEach(item => { const data = commonFunc.getAssignFieldValue(copyConfig?.sAssignField, item) const index = tableData.findIndex(x => x.sEmployeeNo === item.sEmployeeNo) - if (index !== -1) { - message.error('人员重复，请重新添加', 5) - } else { + // if (index !== -1) { + // message.error('人员重复，请重新添加', 5) + // } else { tableData.push({ ...item, ...data, @@ -1070,7 +1070,7 @@ const handleScanFace = (props) => { sParentId: props.masterData.sId, slaveId: props?.slaveData ? props?.slaveData[0].sId : '' }) - } + // } }); diff --git a/src/mes/scheduledTasks/machineTasks/index.js b/src/mes/scheduledTasks/machineTasks/index.js index 62bfb76..c61887e 100644 --- a/src/mes/scheduledTasks/machineTasks/index.js +++ b/src/mes/scheduledTasks/machineTasks/index.js @@ -524,7 +524,7 @@ const MachineTasks = baseProps => { ) || {}; // 产量上报按钮 const actProduceReportConfig = slave0Config?.gdsconfigformslave?.find( - item => item.sControlName === 'BtnTableCopyTo.ActProduceReport' + item => item.sControlName === 'BtnTableCopyTo.tmpInfoBySqlActProduceReport' ) || {}; const copytoConfig = slave0Config?.gdsconfigformslave?.find( item => item.sControlName === "BtnTableCopyTo" @@ -586,7 +586,7 @@ const MachineTasks = baseProps => { sDefault = "${false}"; } - const outPut = bManual ? [actProduceReportConfig, { showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig }, + const outPut = bManual ? [actProduceReportConfig, { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] : [{ showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig }, { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] return [ @@ -604,9 +604,9 @@ const MachineTasks = baseProps => { }; const record = tableProps?.data?.[0] || {} // 如果bManual为true的时候 操作栏加长 - if (record && record.bManual) { - tableProps.tableBtnsWidth = '300px' - } + // if (record && record.bManual) { + // tableProps.tableBtnsWidth = '300px' + // } // 全部按钮事件 const tableAll = () => { setSSrcNo(""); -- libgit2 0.22.2