Commit 4586dcb12aa9b339a96b10c952d6f1a9afa46282

Authored by Min
1 parent 651b9ca5

1.处理查询传参

src/mes/common/commonModelComponent/index.js
@@ -920,7 +920,7 @@ const useCommonModelEvent = props => { @@ -920,7 +920,7 @@ const useCommonModelEvent = props => {
920 configData: config, 920 configData: config,
921 condition: { 921 condition: {
922 ...masterState, 922 ...masterState,
923 - sId: currentIds, 923 + // sId: currentIds,
924 sSqlCondition: { ...conditonValues, ...sFilterConditions, }, 924 sSqlCondition: { ...conditonValues, ...sFilterConditions, },
925 bFilter, 925 bFilter,
926 pageNum: isPagination ? props?.mesPageNum || 1 : undefined, 926 pageNum: isPagination ? props?.mesPageNum || 1 : undefined,
@@ -3183,7 +3183,7 @@ const CommonViewChooseComponent = props => { @@ -3183,7 +3183,7 @@ const CommonViewChooseComponent = props => {
3183 // 上报参数组件 3183 // 上报参数组件
3184 const ReportParamComponent = props => { 3184 const ReportParamComponent = props => {
3185 const { viewRow, masterData, config, sName, onDataChange } = props; 3185 const { viewRow, masterData, config, sName, onDataChange } = props;
3186 - 3186 +
3187 const [reportExpand, setReportExpand] = useState(true); 3187 const [reportExpand, setReportExpand] = useState(true);
3188 3188
3189 if (!viewRow || !viewRow.sReportParam) { 3189 if (!viewRow || !viewRow.sReportParam) {
@@ -3191,7 +3191,7 @@ const ReportParamComponent = props => { @@ -3191,7 +3191,7 @@ const ReportParamComponent = props => {
3191 } 3191 }
3192 3192
3193 const reportParam = JSON.parse(viewRow.sReportParam); 3193 const reportParam = JSON.parse(viewRow.sReportParam);
3194 - 3194 +
3195 if (!reportParam || !commonUtils.isNotEmptyObject(reportParam)) { 3195 if (!reportParam || !commonUtils.isNotEmptyObject(reportParam)) {
3196 return ''; 3196 return '';
3197 } 3197 }