Commit 9509a46cc5631df6b596e45d922ee070a6dbb3ac
1 parent
08357ad9
调整产量上班按钮名
Showing
6 changed files
with
25 additions
and
25 deletions
src/components/Common/CommonListEvent.js
| ... | ... | @@ -49,7 +49,7 @@ export default (ChildComponent) => { |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | async componentWillReceiveProps(nextProps) { |
| 52 | - | |
| 52 | + | |
| 53 | 53 | const { app, formData, currentId, searchSolution, masterData, sGroupByList, formRoute, sModelsType, } = nextProps; |
| 54 | 54 | let { slaveConfig: slaveConfigOld } = nextProps; |
| 55 | 55 | // nextProps.onSaveState({ realizeHeight: nextProps.realizeHeight }); |
| ... | ... | @@ -139,7 +139,7 @@ export default (ChildComponent) => { |
| 139 | 139 | bFilterValue: app.sMachineNameSId, |
| 140 | 140 | }); |
| 141 | 141 | const pageNum = 1; |
| 142 | - | |
| 142 | + | |
| 143 | 143 | addState = (await this.props.handleGetDataSet({ |
| 144 | 144 | name: 'slave', |
| 145 | 145 | configData: slaveConfig, |
| ... | ... | @@ -344,7 +344,7 @@ export default (ChildComponent) => { |
| 344 | 344 | if (commonUtils.isNotEmptyNumber(formData[0].iPageSize) && formData[0].iPageSize !== 0) { |
| 345 | 345 | iPageSize = formData[0].iPageSize; |
| 346 | 346 | } |
| 347 | - | |
| 347 | + | |
| 348 | 348 | await this.handleGetData(slaveConfig, filterCondition, 1, commonUtils.isNotEmptyNumber(iPageSize) && iPageSize !== 0 ? iPageSize : commonConfig.pageSize, '', false, sGroupByList); |
| 349 | 349 | slaveInfoConfig = formData[1]; |
| 350 | 350 | slaveInfoColumn = {}; |
| ... | ... | @@ -422,7 +422,7 @@ export default (ChildComponent) => { |
| 422 | 422 | }); |
| 423 | 423 | } else if (JSON.stringify(app.currentPane.conditonValues) !== JSON.stringify(this.props.app.currentPane.conditonValues)) { |
| 424 | 424 | const { slaveConfig, slaveFilterCondition } = nextProps; |
| 425 | - | |
| 425 | + | |
| 426 | 426 | this.handleGetData(slaveConfig, slaveFilterCondition, 1, commonUtils.isNotEmptyNumber(iPageSize) && iPageSize !== 0 ? iPageSize : commonConfig.pageSize, undefined, undefined, undefined, nextProps); |
| 427 | 427 | } else if (JSON.stringify(nextProps.id) !== JSON.stringify(this.props.id)) { |
| 428 | 428 | this.props.onSaveState({ slaveSelectedRowKeys: [] }); |
| ... | ... | @@ -442,7 +442,7 @@ export default (ChildComponent) => { |
| 442 | 442 | |
| 443 | 443 | const slaveConfig = formData.filter(item => item.bGrd && item.sTbName === 'elemachine')[0]; |
| 444 | 444 | const slaveColumn = commonFunc.getHeaderConfig(slaveConfig); |
| 445 | - | |
| 445 | + | |
| 446 | 446 | this.handleGetData(slaveConfig, undefined, undefined, undefined, undefined, undefined, undefined, nextProps); |
| 447 | 447 | this.props.onSaveState({ |
| 448 | 448 | masterConfig: currConfig, masterData, slaveConfig, slaveColumn, enabled: true, pageLoading: false, |
| ... | ... | @@ -452,10 +452,10 @@ export default (ChildComponent) => { |
| 452 | 452 | if (this.props.pageNum >= Math.ceil(slavePagination.total / slavePagination.pageSize)) { |
| 453 | 453 | this.props.onToFirst(); |
| 454 | 454 | } else if (commonUtils.isNotEmptyArr(treeFilterCondition)) { /* 判断是否有树过滤条件 */ |
| 455 | - | |
| 455 | + | |
| 456 | 456 | this.handleGetData(slaveConfig, slaveFilterCondition, nextProps.pageNum, slavePagination.pageSize, slaveOrderBy, '', sGroupByList, '', treeFilterCondition); |
| 457 | 457 | } else { |
| 458 | - | |
| 458 | + | |
| 459 | 459 | this.handleGetData(slaveConfig, slaveFilterCondition, nextProps.pageNum, slavePagination.pageSize, slaveOrderBy, '', sGroupByList); |
| 460 | 460 | } |
| 461 | 461 | } |
| ... | ... | @@ -693,7 +693,7 @@ export default (ChildComponent) => { |
| 693 | 693 | if (formRoute === '/indexPage/materialRequirementsPlanning' && clearSelectData) { |
| 694 | 694 | const { slaveFilterCondition, slaveInfoConfig } = this.props; |
| 695 | 695 | if (commonUtils.isNotEmptyObject(slaveInfoConfig)) { |
| 696 | - | |
| 696 | + | |
| 697 | 697 | this.handleGetDataInfo(slaveInfoConfig, slaveFilterCondition, 1); |
| 698 | 698 | } |
| 699 | 699 | } |
| ... | ... | @@ -1540,7 +1540,7 @@ export default (ChildComponent) => { |
| 1540 | 1540 | message.warn('未配置！不能生成！'); |
| 1541 | 1541 | return; |
| 1542 | 1542 | } |
| 1543 | - } else if (name === 'BtnCopyTo.ActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ | |
| 1543 | + } else if (name === 'BtnCopyTo.tmpInfoBySqlActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ | |
| 1544 | 1544 | if (commonUtils.isNotEmptyArr(copyToData) && copyToData[0].sState === '3') { |
| 1545 | 1545 | message.warn('工序已暂停，无法开工！'); |
| 1546 | 1546 | return; |
| ... | ... | @@ -1774,7 +1774,7 @@ export default (ChildComponent) => { |
| 1774 | 1774 | }); |
| 1775 | 1775 | copyToData = copyToDataNew; |
| 1776 | 1776 | } |
| 1777 | - } else if (name === 'BtnCopyTo.ActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ | |
| 1777 | + } else if (name === 'BtnCopyTo.tmpInfoBySqlActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ | |
| 1778 | 1778 | if (commonUtils.isNotEmptyArr(copyToData) && copyToData[0].sState === '3') { |
| 1779 | 1779 | message.warn('工序已暂停，无法开工！'); |
| 1780 | 1780 | return; | ... | ... |
src/components/Common/CommonListTabEvent.js
| ... | ... | @@ -1262,7 +1262,7 @@ export default (ChildComponent) => { |
| 1262 | 1262 | conditionValues = this.props.getSqlCondition(slaveConfig, tableType, record); |
| 1263 | 1263 | } else if(commonUtils.isNotEmptyObject(currentPane) && !commonUtils.isEmpty(currentPane.conditonValues)) { |
| 1264 | 1264 | conditionValues = currentPane.conditonValues; |
| 1265 | - } | |
| 1265 | + } | |
| 1266 | 1266 | |
| 1267 | 1267 | /* 导出使用Post提交 */ |
| 1268 | 1268 | 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) => { |
| 1614 | 1614 | }); |
| 1615 | 1615 | copyToData = copyToDataNew; |
| 1616 | 1616 | } |
| 1617 | - } else if (name === 'BtnCopyTo.ActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ | |
| 1617 | + } else if (name === 'BtnCopyTo.tmpInfoBySqlActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ | |
| 1618 | 1618 | if (commonUtils.isNotEmptyArr(copyToData) && copyToData[0].sState === '3') { |
| 1619 | 1619 | message.warn('工序已暂停，无法开工！'); |
| 1620 | 1620 | return; |
| ... | ... | @@ -1798,7 +1798,7 @@ export default (ChildComponent) => { |
| 1798 | 1798 | }); |
| 1799 | 1799 | copyToData = copyToDataNew; |
| 1800 | 1800 | } |
| 1801 | - } else if (name === 'BtnCopyTo.ActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ | |
| 1801 | + } else if (name === 'BtnCopyTo.tmpInfoBySqlActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ | |
| 1802 | 1802 | if (commonUtils.isNotEmptyArr(copyToData) && copyToData[0].sState === '3') { |
| 1803 | 1803 | message.warn('工序已暂停，无法开工！'); |
| 1804 | 1804 | return; | ... | ... |
src/components/Common/CommonListTreeEvent.js
| ... | ... | @@ -1087,7 +1087,7 @@ export default (ChildComponent) => { |
| 1087 | 1087 | detailCopy.data = sChildData; |
| 1088 | 1088 | } |
| 1089 | 1089 | addcopyOther.push(detailCopy); |
| 1090 | - } else if (name === 'BtnCopyTo.ActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ | |
| 1090 | + } else if (name === 'BtnCopyTo.tmpInfoBySqlActProduceReport') { /* 若机台中点击暂停 则待产量上报中点击上报提示”工序已暂停，无法上报 */ | |
| 1091 | 1091 | if (commonUtils.isNotEmptyArr(copyToData) && copyToData[0].sState === '3') { |
| 1092 | 1092 | message.warn('工序已暂停，无法开工！'); |
| 1093 | 1093 | return; | ... | ... |
src/components/Common/CommonTable/index.js
| ... | ... | @@ -4859,8 +4859,8 @@ class CommonTableRc extends React.Component { |
| 4859 | 4859 | |
| 4860 | 4860 | const { [this.rowKey]: rowKeyId } = record; |
| 4861 | 4861 | const { selectedRowKeys = [] } = props; |
| 4862 | - if (sControlName?.includes('BtnTableCopyTo.ActProduceReport')) { | |
| 4863 | - const copyToConfig = props?.config?.gdsconfigformslave.filter(x=>x.sControlName.includes('BtnTableCopyTo.ActProduceReport')) | |
| 4862 | + if (sControlName?.includes('BtnTableCopyTo.tmpInfoBySqlActProduceReport')) { | |
| 4863 | + const copyToConfig = props?.config?.gdsconfigformslave.filter(x=>x.sControlName.includes('BtnTableCopyTo.tmpInfoBySqlActProduceReport')) | |
| 4864 | 4864 | props.onCopyTo(props.name, config.sActiveId, config, copyToConfig, record) |
| 4865 | 4865 | return |
| 4866 | 4866 | } | ... | ... |
src/mes/common/commonOperationBarComponent/MesToolbar.js
| ... | ... | @@ -1059,9 +1059,9 @@ const handleScanFace = (props) => { |
| 1059 | 1059 | proData.forEach(item => { |
| 1060 | 1060 | const data = commonFunc.getAssignFieldValue(copyConfig?.sAssignField, item) |
| 1061 | 1061 | const index = tableData.findIndex(x => x.sEmployeeNo === item.sEmployeeNo) |
| 1062 | - if (index !== -1) { | |
| 1063 | - message.error('人员重复，请重新添加', 5) | |
| 1064 | - } else { | |
| 1062 | + // if (index !== -1) { | |
| 1063 | + // message.error('人员重复，请重新添加', 5) | |
| 1064 | + // } else { | |
| 1065 | 1065 | tableData.push({ |
| 1066 | 1066 | ...item, |
| 1067 | 1067 | ...data, |
| ... | ... | @@ -1070,7 +1070,7 @@ const handleScanFace = (props) => { |
| 1070 | 1070 | sParentId: props.masterData.sId, |
| 1071 | 1071 | slaveId: props?.slaveData ? props?.slaveData[0].sId : '' |
| 1072 | 1072 | }) |
| 1073 | - } | |
| 1073 | + // } | |
| 1074 | 1074 | |
| 1075 | 1075 | }); |
| 1076 | 1076 | ... | ... |
src/mes/scheduledTasks/machineTasks/index.js
| ... | ... | @@ -524,7 +524,7 @@ const MachineTasks = baseProps => { |
| 524 | 524 | ) || {}; |
| 525 | 525 | // 产量上报按钮 |
| 526 | 526 | const actProduceReportConfig = slave0Config?.gdsconfigformslave?.find( |
| 527 | - item => item.sControlName === 'BtnTableCopyTo.ActProduceReport' | |
| 527 | + item => item.sControlName === 'BtnTableCopyTo.tmpInfoBySqlActProduceReport' | |
| 528 | 528 | ) || {}; |
| 529 | 529 | const copytoConfig = slave0Config?.gdsconfigformslave?.find( |
| 530 | 530 | item => item.sControlName === "BtnTableCopyTo" |
| ... | ... | @@ -586,7 +586,7 @@ const MachineTasks = baseProps => { |
| 586 | 586 | sDefault = "${false}"; |
| 587 | 587 | } |
| 588 | 588 | |
| 589 | - const outPut = bManual ? [actProduceReportConfig, { showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig }, | |
| 589 | + const outPut = bManual ? [actProduceReportConfig, | |
| 590 | 590 | { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] : [{ showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig }, |
| 591 | 591 | { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] |
| 592 | 592 | return [ |
| ... | ... | @@ -604,9 +604,9 @@ const MachineTasks = baseProps => { |
| 604 | 604 | }; |
| 605 | 605 | const record = tableProps?.data?.[0] || {} |
| 606 | 606 | // 如果bManual为true的时候 操作栏加长 |
| 607 | - if (record && record.bManual) { | |
| 608 | - tableProps.tableBtnsWidth = '300px' | |
| 609 | - } | |
| 607 | + // if (record && record.bManual) { | |
| 608 | + // tableProps.tableBtnsWidth = '300px' | |
| 609 | + // } | |
| 610 | 610 | // 全部按钮事件 |
| 611 | 611 | const tableAll = () => { |
| 612 | 612 | setSSrcNo(""); | ... | ... |