Commit ec3a8ddd24ef745ee3b9fabec6312013e1547b55

Authored by chenxt
1 parent c47d5520

产量上报上传

src/mes/common/commonModelComponent/index.js
@@ -478,7 +478,9 @@ const useCommonModelEvent = props => { @@ -478,7 +478,9 @@ const useCommonModelEvent = props => {
478 if (commonUtils.isNotEmptyObject(returnData)) { 478 if (commonUtils.isNotEmptyObject(returnData)) {
479 for (const key of Object.keys(returnData)) { 479 for (const key of Object.keys(returnData)) {
480 const data = returnData[key].map(x => { 480 const data = returnData[key].map(x => {
481 - x.sParentId = props.masterData.sId 481 + x.sParentId = props.masterData.sId
  482 + x.sId = x.sId ? x.sId : commonUtils.createSid()
  483 + x.handleType = "add"
482 return x 484 return x
483 }) 485 })
484 addState[`${key}Data`] = data; 486 addState[`${key}Data`] = data;
@@ -1582,7 +1584,6 @@ const useGetSelectedDataGroup = props => { @@ -1582,7 +1584,6 @@ const useGetSelectedDataGroup = props => {
1582 }, 1584 },
1583 [tableList.length] 1585 [tableList.length]
1584 ); 1586 );
1585 -  
1586 const selectedDataGroup = Object.keys(sSqlConditionGroup).reduce( 1587 const selectedDataGroup = Object.keys(sSqlConditionGroup).reduce(
1587 (result, tableName) => { 1588 (result, tableName) => {
1588 const { 1589 const {
@@ -1800,8 +1801,6 @@ const CommonModelComponent = props => { @@ -1800,8 +1801,6 @@ const CommonModelComponent = props => {
1800 }); 1801 });
1801 window.refreshTableList = null; 1802 window.refreshTableList = null;
1802 } 1803 }
1803 - props.onSaveState({slaveSelectedRowKeys:[]})  
1804 -  
1805 }} 1804 }}
1806 > 1805 >
1807 {configList 1806 {configList
@@ -2267,7 +2266,6 @@ const CommonTableComponent = props => { @@ -2267,7 +2266,6 @@ const CommonTableComponent = props => {
2267 } 2266 }
2268 } 2267 }
2269 }, [props.masterData]) 2268 }, [props.masterData])
2270 -  
2271 return ( 2269 return (
2272 <> 2270 <>
2273 <TabTitleComponent {...props} sTabName={sTabName} /> 2271 <TabTitleComponent {...props} sTabName={sTabName} />