diff --git a/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js b/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js index bb852cb..ff9e840 100644 --- a/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js +++ b/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js @@ -844,6 +844,13 @@ const ProcessCardPackTableTreeNewEvent = props => { dispatchFunc(name, "onDataChange", ["name", "sFieldName", "changeValue", "sId", "dropDownData"], args); }; returnProps.onDataChange = handleTableChange; + // 行选择事件 + const handleTableSelectRowChange = (...args) => { + const [name0] = args; + const name = name0.includes("materials") ? "materials" : name0; + dispatchFunc(name, "onTableSelectRowChange", ["name", "selectedRowKeys"], args); + }; + returnProps.onTableSelectRowChange = handleTableSelectRowChange; // 各种超链接点击 const handleViewChoose = (...args) => { @@ -2746,6 +2753,10 @@ const controlProps = props => { packData, }); }; + returnProps.onTableSelectRowChange = async ({ name, selectedRowKeys }) => { + const addState = await props.onTableSelectRowChange(name, selectedRowKeys, true); + props.onSaveState({ addState, processSelectedRowKeys: []}); + } returnProps.onViewChoose = ({ sName, record }) => { const { sId } = record; /* 控制表主键 */ const { enabled, slaveData } = props; diff --git a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js index 870d683..78f103a 100644 --- a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js +++ b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js @@ -1294,6 +1294,13 @@ const WorkOrderPackTableTreeNewEvent = props => { }; returnProps.onDataChange = handleTableChange; + const handleTableSelectRowChange = (...args) => { + const [name0] = args; + const name = name0.includes("materials") ? "materials" : name0; + dispatchFunc(name, "onTableSelectRowChange", ["name", "selectedRowKeys"], args); + }; + returnProps.onTableSelectRowChange = handleTableSelectRowChange; + // 各种超链接点击 const handleViewChoose = (...args) => { const [name0] = args; @@ -3419,6 +3426,10 @@ const controlProps = props => { packData, }); }; + returnProps.onTableSelectRowChange = async ({ name, selectedRowKeys }) => { + const addState = await props.onTableSelectRowChange(name, selectedRowKeys, true); + props.onSaveState({ addState, processSelectedRowKeys: []}); + } returnProps.onViewChoose = ({ name, sName, record }) => { const { sId } = record; /* 控制表主键 */ const { enabled, slaveData } = props; diff --git a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js index 82bd364..79e590c 100644 --- a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js +++ b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js @@ -1806,6 +1806,7 @@ class QuotationPackTableTree extends Component { treeSelectedKeys = selectedRowKeys; /* 把树形选中节点赋值给表格部件选中节点 */ addState.treeSelectedKeys = treeSelectedKeys; } + addState.processSelectedRowKeys = []; /* 部件选中时 清空工序的选中 */ } this.props.onSaveState(addState); } else if (name === 'materials' || name === 'process') {