You need to sign in before continuing.
Commit 4586dcb12aa9b339a96b10c952d6f1a9afa46282
1 parent
651b9ca5
1.处理查询传参
Showing
1 changed file
with
3 additions
and
3 deletions
src/mes/common/commonModelComponent/index.js
| ... | ... | @@ -920,7 +920,7 @@ const useCommonModelEvent = props => { |
| 920 | 920 | configData: config, |
| 921 | 921 | condition: { |
| 922 | 922 | ...masterState, |
| 923 | - sId: currentIds, | |
| 923 | + // sId: currentIds, | |
| 924 | 924 | sSqlCondition: { ...conditonValues, ...sFilterConditions, }, |
| 925 | 925 | bFilter, |
| 926 | 926 | pageNum: isPagination ? props?.mesPageNum || 1 : undefined, |
| ... | ... | @@ -3183,7 +3183,7 @@ const CommonViewChooseComponent = props => { |
| 3183 | 3183 | // 上报参数组件 |
| 3184 | 3184 | const ReportParamComponent = props => { |
| 3185 | 3185 | const { viewRow, masterData, config, sName, onDataChange } = props; |
| 3186 | - | |
| 3186 | + | |
| 3187 | 3187 | const [reportExpand, setReportExpand] = useState(true); |
| 3188 | 3188 | |
| 3189 | 3189 | if (!viewRow || !viewRow.sReportParam) { |
| ... | ... | @@ -3191,7 +3191,7 @@ const ReportParamComponent = props => { |
| 3191 | 3191 | } |
| 3192 | 3192 | |
| 3193 | 3193 | const reportParam = JSON.parse(viewRow.sReportParam); |
| 3194 | - | |
| 3194 | + | |
| 3195 | 3195 | if (!reportParam || !commonUtils.isNotEmptyObject(reportParam)) { |
| 3196 | 3196 | return ''; |
| 3197 | 3197 | } | ... | ... |