Commit a808ce54acc09aa651774b9e76ff43c20bdbc12d
1 parent
3d07d128
弹窗报错
Showing
2 changed files
with
6 additions
and
7 deletions
src/components/Common/CommonBillEvent.js
| @@ -7435,7 +7435,6 @@ export default (ChildComponent) => { | @@ -7435,7 +7435,6 @@ export default (ChildComponent) => { | ||
| 7435 | materials0Data.push(tableDataRowAdd); | 7435 | materials0Data.push(tableDataRowAdd); |
| 7436 | }); | 7436 | }); |
| 7437 | } | 7437 | } |
| 7438 | - console.log('222', materials0Data, copyToAssignField); | ||
| 7439 | 7438 | ||
| 7440 | if (commonUtils.isNotEmptyArr(materials0Data) && location.pathname.includes('processCardPackTableTree')) { | 7439 | if (commonUtils.isNotEmptyArr(materials0Data) && location.pathname.includes('processCardPackTableTree')) { |
| 7441 | /* 根据配置过滤数据 */ | 7440 | /* 根据配置过滤数据 */ |
| @@ -7649,7 +7648,6 @@ export default (ChildComponent) => { | @@ -7649,7 +7648,6 @@ export default (ChildComponent) => { | ||
| 7649 | 7648 | ||
| 7650 | 7649 | ||
| 7651 | }); | 7650 | }); |
| 7652 | - console.log('放大镜确认数据：', tbName, tableData, materials0Data) | ||
| 7653 | this.props.onSaveState({ materials0Data }); | 7651 | this.props.onSaveState({ materials0Data }); |
| 7654 | } | 7652 | } |
| 7655 | } else if (selectConfig.sControlName && selectConfig.sControlName.includes('BtnPopupMaterials')) { /* 报价单工序表放大镜 选择材料 */ | 7653 | } else if (selectConfig.sControlName && selectConfig.sControlName.includes('BtnPopupMaterials')) { /* 报价单工序表放大镜 选择材料 */ |
src/components/Common/CommonHooks/useCommonBase.js
| @@ -326,7 +326,7 @@ const useCommonBase = props => { | @@ -326,7 +326,7 @@ const useCommonBase = props => { | ||
| 326 | } | 326 | } |
| 327 | } | 327 | } |
| 328 | } | 328 | } |
| 329 | - if ( isPagination ) { | 329 | + if (isPagination) { |
| 330 | condition.pageSize = condition.pageSize || 10; /* 前台传入页数或者默认页数 */ | 330 | condition.pageSize = condition.pageSize || 10; /* 前台传入页数或者默认页数 */ |
| 331 | condition.pageNum = condition.pageNum || 1; /* 前台传入页数或者默认页数 */ | 331 | condition.pageNum = condition.pageNum || 1; /* 前台传入页数或者默认页数 */ |
| 332 | } | 332 | } |
| @@ -387,14 +387,15 @@ const useCommonBase = props => { | @@ -387,14 +387,15 @@ const useCommonBase = props => { | ||
| 387 | } | 387 | } |
| 388 | if (name.includes('slave') && pageRoute.includes('indexPage/commonBill')) { | 388 | if (name.includes('slave') && pageRoute.includes('indexPage/commonBill')) { |
| 389 | delete condition.sId | 389 | delete condition.sId |
| 390 | - // condition.sSqlCondition = { | ||
| 391 | - // sParentId: sId | ||
| 392 | - // } | 390 | + condition.sSqlCondition = { |
| 391 | + sParentId: condition.sSqlCondition.sParentId | ||
| 392 | + } | ||
| 393 | } | 393 | } |
| 394 | // 只有弹窗没有不查询 | 394 | // 只有弹窗没有不查询 |
| 395 | - if (name === 'master' && sId === '' && props.parentProps && pageRoute.includes('indexPage/commonBill')) return | 395 | + if (name === 'master' && (sId === '' || !sId) && props.parentProps && pageRoute.includes('indexPage/commonBill')) return |
| 396 | const dataUrl = `${commonConfig.server_host | 396 | const dataUrl = `${commonConfig.server_host |
| 397 | }business/getBusinessDataByFormcustomId/${configDataId}?sModelsId=${sModelsId}&sName=${formSrcRoute}`; | 397 | }business/getBusinessDataByFormcustomId/${configDataId}?sModelsId=${sModelsId}&sName=${formSrcRoute}`; |
| 398 | + | ||
| 398 | const dataReturn = (await commonServices.postValueService( | 399 | const dataReturn = (await commonServices.postValueService( |
| 399 | token, | 400 | token, |
| 400 | condition, | 401 | condition, |