diff --git a/src/mes/teamInfo/index.js b/src/mes/teamInfo/index.js index c8df332..8fa091b 100644 --- a/src/mes/teamInfo/index.js +++ b/src/mes/teamInfo/index.js @@ -579,7 +579,7 @@ const TeamInfo = baseProps => { } }); } - const {sMachineNameStr} = props?.app || {} + const { sMachineNameStr } = props?.app || {} const isSMachineNameStr = sMachineNameStr && sMachineNameStr.includes('礼盒') return (
@@ -632,7 +632,20 @@ const TeamInfo = baseProps => { if (props.masterData && !props.masterData.length) { return message.warning('请先添加一条班组信息!') } - setFaceModal(true); + // setFaceModal(true); + const btnsConfig = + bManualSlaveTableProps?.config?.gdsconfigformslave.find( + item => item.sControlName?.toLowerCase().includes("btnenventinsertwork") + ) || {}; + props.onExecInstructSet({ + btnConfig: { + ...btnsConfig, + sInstruct: btnsConfig.sInstruct + }, + nextProps: { + ...props, + } + }); }} > @@ -776,7 +789,7 @@ const TeamInfo = baseProps => {
- +
@@ -873,7 +886,7 @@ const TeamJoinInfo = props => { }) ) ?.filter(item => item.tableName !== "slave3"); - const {sMachineNameStr} = props?.app || {} + const { sMachineNameStr } = props?.app || {} const isSMachineNameStr = sMachineNameStr && sMachineNameStr.includes('礼盒') const tableProps = tableName => { const result = { @@ -882,7 +895,7 @@ const TeamJoinInfo = props => { onChange: () => { } }, onTableBtnClick: props.onTableBtnClick, - fixedHeight: isSMachineNameStr? (tableName === "slave4" ? "100px" : "80px") : tableName === "slave4" ? "230px" : "160px" + fixedHeight: isSMachineNameStr ? (tableName === "slave4" ? "100px" : "80px") : tableName === "slave4" ? "230px" : "160px" }; result.tableBtnsConfig = result.config?.gdsconfigformslave