diff --git a/src/components/Common/CommonInstructSet.js b/src/components/Common/CommonInstructSet.js index 9428d56..587c836 100644 --- a/src/components/Common/CommonInstructSet.js +++ b/src/components/Common/CommonInstructSet.js @@ -147,7 +147,7 @@ const addExtraData = props => { } }); } - + const globalData = commonUtils.convertStrToObj( localStorage.xlybusinessglobalData ); @@ -226,7 +226,6 @@ const instructSetInit = async props => { // 基础校验 const sInstruct = instructCheck(props); - if (!sInstruct) return; // 添加额外数据 @@ -337,6 +336,7 @@ const instructSetInit = async props => { props.callback && props.callback(); }); }); + props.inscallback && props.inscallback({ ...props, ...addStateNew }); }; diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js index 06ef866..55f7714 100644 --- a/src/mes/common/commonModelComponent/index.js +++ b/src/mes/common/commonModelComponent/index.js @@ -1306,6 +1306,7 @@ const CommonModelComponent = props => { tableBtnsConfig, // 表格按钮配置 bFirstComponent: level === 0 && index === -1 }; + console.log("🚀 ~ getComponent ~ componentProps:", componentProps) const commonDivHeight = useComputedCommonDivHeight(componentProps); return (
{ sName }; if (tableProps.data && tableProps.data.length === 0) { - console.log("🚀 ~ CommonTableComponent ~ tableProps:", tableProps) - props.onMesTableLineAdd({ tableName: tableProps.name, // tableClassName: state.tableClassName diff --git a/src/mes/common/commonOperationBarComponent/MesToolbar.js b/src/mes/common/commonOperationBarComponent/MesToolbar.js index 9412d12..30c1b70 100644 --- a/src/mes/common/commonOperationBarComponent/MesToolbar.js +++ b/src/mes/common/commonOperationBarComponent/MesToolbar.js @@ -132,7 +132,6 @@ const handleScanFace = (props) => { onSuccess: (_, dataset) => { const { proData = [] } = dataset.rows[0].dataSet; const { [`${addData}Data`]: tableData = [], [`${addData}Config`]: config = {} } = props; - const { btnConfig = {}, copyToConfig = [], record = {} } = props?.parentProps || {} const copyConfig = config?.gdsconfigformslave?.find(item => item.sControlName.toLowerCase().includes('btnscanface')) proData.forEach(item => { const data = commonFunc.getAssignFieldValue(copyConfig?.sAssignField, item) diff --git a/src/mes/productionExec/productionExecMain/index.js b/src/mes/productionExec/productionExecMain/index.js index 16f1a1a..9741f0d 100644 --- a/src/mes/productionExec/productionExecMain/index.js +++ b/src/mes/productionExec/productionExecMain/index.js @@ -37,7 +37,7 @@ const list = [ const useProductionExecMainEvent = props => { const { formData = [] } = props; - const noProduction= commonFunc.showLocalMessage(props, 'noProduction', '暂无生产执行数据，请先开工一条任务!'); + const noProduction = commonFunc.showLocalMessage(props, 'noProduction', '暂无生产执行数据，请先开工一条任务!'); const waitWorkLoading = commonFunc.showLocalMessage(props, 'waitWorkLoading', '等待工单数据加载中...'); @@ -452,9 +452,8 @@ const ProductionExecMain = baseProps => {
{props.pageloading ? (
{ onClick={() => { setCollapsed(!collapsed); }} - className={`btns ${styles.expandCutBtn} ${ - collapsed ? "collapsed" : "" - }`} + className={`btns ${styles.expandCutBtn} ${collapsed ? "collapsed" : "" + }`} style={{ display: !props.bFinish1 ? "none" : "" }} > + + + {[""].map(() => { + const sControlName = "BtnRight1.BtnPrint4"; + const btnConfig = config.gdsconfigformslave.find( + item => item.sControlName === sControlName + ); + if (!btnConfig) return ""; + return ( + + ); + })} + + + +
+ {/* + + + */} + {/* + + */} +
+
+
+
+ {/*
+
- {/* */}
@@ -1129,7 +1220,6 @@ const ProductionExecContent0 = props => { > 异常③ - {/* */}
@@ -1161,7 +1251,7 @@ const ProductionExecContent0 = props => { ); })}
-
+ */}
@@ -1323,8 +1413,8 @@ const ProductionExecContent1 = props => { onSuccess: () => { props.onRefresh && props.onRefresh(); }, - onConfirm: () => {}, - onError: () => {} + onConfirm: () => { }, + onError: () => { } }); return; } @@ -1589,8 +1679,8 @@ const ProductionExecContent2 = props => { onSuccess: () => { props.onRefresh && props.onRefresh(); }, - onConfirm: () => {}, - onError: () => {} + onConfirm: () => { }, + onError: () => { } }); return; } @@ -1777,17 +1867,15 @@ const ProductionExecContent3 = props => { const bXialiao = filterData?.[0]?.iJobStatus === 3; return (
{ if (index <= currentStep - 1) { setCurrentSelectedStep(index + 1); @@ -1996,8 +2084,8 @@ const ProductionExecContent8 = props => { onSuccess: () => { props.onRefresh && props.onRefresh(); }, - onConfirm: () => {}, - onError: () => {} + onConfirm: () => { }, + onError: () => { } }); return; } @@ -2252,8 +2340,8 @@ const ProductionExecContent10 = props => { onSuccess: () => { props.onRefresh && props.onRefresh(); }, - onConfirm: () => {}, - onError: () => {} + onConfirm: () => { }, + onError: () => { } }); return; } @@ -2379,7 +2467,7 @@ const ProductionExecContent10 = props => { {...btnProps} {...getBtnConfigByControlName(sControlName)} className={`${styles.print4} print4`} - // style={{display: 'none'}} + // style={{display: 'none'}} > 打印标条 {/* {btnConfig.showName} */} diff --git a/src/mes/productionExec/productionExecMain/index.less b/src/mes/productionExec/productionExecMain/index.less index a292a34..0ddac2a 100644 --- a/src/mes/productionExec/productionExecMain/index.less +++ b/src/mes/productionExec/productionExecMain/index.less @@ -133,7 +133,13 @@ .flex(center); justify-content: space-between; padding: 0 5px; - + width: 100%; + .rightFormBtnFloorBtnBox{ + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + } .abnormalBtn { border-color: #faad14; background: #faad14; diff --git a/src/mes/teamInfo/index.js b/src/mes/teamInfo/index.js index ccfc274..51d11bd 100644 --- a/src/mes/teamInfo/index.js +++ b/src/mes/teamInfo/index.js @@ -484,7 +484,6 @@ const TeamInfo = baseProps => { const { sForemanName = "", sIpqcName = "", sEmployeeName = "" } = props.slaveData && props.slaveData.length !== 0 ? props.slaveData[0] : {}; - const { sTeamEmployeeNo = "" } = props.slave0Data?.[0] || {}; const foremanConfig = props.slaveConfig?.gdsconfigformslave.find(item => item.sName === 'sForemanName') || {}; diff --git a/src/oee/common/oeeKeyBoard.js b/src/oee/common/oeeKeyBoard.js index 6d46dc3..12fd98e 100644 --- a/src/oee/common/oeeKeyBoard.js +++ b/src/oee/common/oeeKeyBoard.js @@ -308,8 +308,8 @@ class VK extends React.Component { borderRadius: 8, userSelect: 'none', }} - onMouseDown={this.F_MouseDown} - onTouchStart={this.F_TouchStart} + // onMouseDown={this.F_MouseDown} + // onTouchStart={this.F_TouchStart} // onBlur={this.F_Close} >
可以拖动移开或