diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index e4028e4..03396e8 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -3051,7 +3051,7 @@ export default class CommonComponent extends Component { /* 页面输出 */ const className = iColValue === 24 ? 'input24' : iColValue === 18 ? 'input18' : iColValue === 12 ? 'input12' : 'changeClassName'; const mesInputBlue = enabled && !this.props.bNoMesBlue && this.firstDataIndex !== 'b'; - const {bManual = false} = this.props?.app?.userinfo + const {bManual = false} = this.props?.app?.userinfo || {} return (
{mesInputBlue ?
: ''} diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index 1959084..23d9bc8 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -12283,7 +12283,7 @@ const useGetTableBtnOprSetting = props => { props.parentProps.onExecInstructSet({ btnConfig: { ...btnsConfig, - sInstruct: btnsConfig.sButtonParam + sInstruct: btnsConfig.sInstruct }, nextProps: { ...props @@ -12307,7 +12307,7 @@ const useGetTableBtnOprSetting = props => { } else if (btnType.includes("del")) { if (bManual) { resultTemp.mesDel = params => { - const { record } = params; + const { record, tableName } = params; const { sDefault: str } = btnTableDelConfig; let disabled = props.getBtnDisabled({ str, @@ -12328,14 +12328,18 @@ const useGetTableBtnOprSetting = props => { const btnsConfig = gdsconfigformslave.find( item => item.sControlName?.toLowerCase().includes("btnenventdel") - ) || {}; + ) || {}; props.parentProps.onExecInstructSet({ btnConfig: { ...btnsConfig, - sInstruct: btnsConfig.sButtonParam + sInstruct: btnsConfig.sInstruct + }, + tableLineParams: { + ...params }, nextProps: { - ...props + ...props, + [`${tableName}SelectedRowKeys`]: [record.sId] } }); }} @@ -12404,7 +12408,7 @@ const useGetTableBtnOprSetting = props => { props.parentProps.onExecInstructSet({ btnConfig: { ...btnsConfig, - sInstruct: btnsConfig.sButtonParam + sInstruct: btnsConfig.sInstruct }, nextProps: { ...props diff --git a/src/mes/teamInfo/index.js b/src/mes/teamInfo/index.js index a5ea733..3b6e67c 100644 --- a/src/mes/teamInfo/index.js +++ b/src/mes/teamInfo/index.js @@ -33,7 +33,7 @@ const teamInfoSid = "17086669370007136849817837261000"; let loginInfo = {}; // 业务层 const useTeamInfoEvent = props => { - const { formData, mesRefresh = true} = props; + const { formData, mesRefresh = true } = props; useEffect( async () => { if (commonUtils.isNotEmptyArr(formData) && mesRefresh) { @@ -494,11 +494,7 @@ const TeamInfo = baseProps => { const foremanConfig = props.slaveConfig?.gdsconfigformslave.find(item => item.sName === 'sForemanName') || {}; const ipqcConfig = props.slaveConfig?.gdsconfigformslave.find(item => item.sName === "sIpqcName") || {}; - let faceProps = { - ...props, - faceModal, - setFaceModal - }; + const operationBarProps = { ...props, @@ -508,6 +504,12 @@ const TeamInfo = baseProps => { const tableHeight = bManual ? "calc(88vh - 80px)" : "calc(25vh - 80px)"; let bManualTableProps let bManualSlaveTableProps + let faceProps = { + ...props, + faceModal, + setFaceModal, + + }; if (bManual) { const tableBaseProps = commonBusiness.getTableTypes("slave", props); const slaveTableBaseProps = commonBusiness.getTableTypes("slave1", props); @@ -519,12 +521,15 @@ const TeamInfo = baseProps => { } bManualSlaveTableProps = { ...slaveTableBaseProps, - data: slaveTableBaseProps?.data?.filter(item=>item.sParentId === bManualTableProps.selectedRowKeys?.[0]), + data: slaveTableBaseProps?.data?.filter(item => item.sParentId === bManualTableProps.selectedRowKeys?.[0]), fixedHeight: "calc(50vh - 126px)" - + } + faceProps = { + ...faceProps, + gdsconfigformslave: slaveTableBaseProps?.config?.gdsconfigformslave, } } - + const handleSave = (props) => { props.onExecInstructSet({ btnConfig: { @@ -592,7 +597,7 @@ const TeamInfo = baseProps => {