diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js index a5f1f41..0fe6dd8 100644 --- a/src/mes/common/commonModelComponent/index.js +++ b/src/mes/common/commonModelComponent/index.js @@ -920,7 +920,7 @@ const useCommonModelEvent = props => { configData: config, condition: { ...masterState, - sId: currentIds, + // sId: currentIds, sSqlCondition: { ...conditonValues, ...sFilterConditions, }, bFilter, pageNum: isPagination ? props?.mesPageNum || 1 : undefined, @@ -3183,7 +3183,7 @@ const CommonViewChooseComponent = props => { // 上报参数组件 const ReportParamComponent = props => { const { viewRow, masterData, config, sName, onDataChange } = props; - + const [reportExpand, setReportExpand] = useState(true); if (!viewRow || !viewRow.sReportParam) { @@ -3191,7 +3191,7 @@ const ReportParamComponent = props => { } const reportParam = JSON.parse(viewRow.sReportParam); - + if (!reportParam || !commonUtils.isNotEmptyObject(reportParam)) { return ''; }