Commit 3f49020ad441eebda25f5912ddaed8a051fe2fe5
1 parent
c89d44fd
1.修复subbill导入数据 不展示问题
Showing
1 changed file
with
18 additions
and
1 deletions
src/components/Common/CommonSubBill.js
| @@ -140,7 +140,7 @@ class CommonSubBill extends Component { | @@ -140,7 +140,7 @@ class CommonSubBill extends Component { | ||
| 140 | handleUploadChangeFile = async (info) => { | 140 | handleUploadChangeFile = async (info) => { |
| 141 | const { file } = info; | 141 | const { file } = info; |
| 142 | const { | 142 | const { |
| 143 | - masterData, sModelsId, app, token, sModelsType, masterConfig, formData = [], | 143 | + masterData, sModelsId, app, token, sModelsType, masterConfig, formData = [], slaveData, slaveSelectedRowKeys, |
| 144 | } = this.props; | 144 | } = this.props; |
| 145 | if (file.response) { | 145 | if (file.response) { |
| 146 | if (file.response.code === 1) { | 146 | if (file.response.code === 1) { |
| @@ -192,6 +192,23 @@ class CommonSubBill extends Component { | @@ -192,6 +192,23 @@ class CommonSubBill extends Component { | ||
| 192 | iCount += 1; | 192 | iCount += 1; |
| 193 | tableDataRow.iOrder = iCount; | 193 | tableDataRow.iOrder = iCount; |
| 194 | } | 194 | } |
| 195 | + if(temp === 'slaveChild') { | ||
| 196 | + let slaveRow = {}; | ||
| 197 | + if(commonUtils.isNotEmptyArr(slaveData)) { | ||
| 198 | + if(commonUtils.isNotEmptyArr(slaveSelectedRowKeys)) { | ||
| 199 | + const iSIndex = slaveData.findIndex(item =>slaveSelectedRowKeys.includes(item.sId)); | ||
| 200 | + if(iSIndex > -1) { | ||
| 201 | + slaveRow = slaveData[iSIndex]; | ||
| 202 | + } | ||
| 203 | + } else { | ||
| 204 | + slaveRow = slaveData[0]; | ||
| 205 | + } | ||
| 206 | + if(commonUtils.isNotEmptyObject(slaveRow)){ | ||
| 207 | + tableDataRow.sSqlConditionId = slaveRow.sSqlConditionId; | ||
| 208 | + } | ||
| 209 | + | ||
| 210 | + } | ||
| 211 | + } | ||
| 195 | for (const child of Object.keys(tableDataRow)) { | 212 | for (const child of Object.keys(tableDataRow)) { |
| 196 | const index = child.indexOf('_sRealValue_'); | 213 | const index = child.indexOf('_sRealValue_'); |
| 197 | if (index > -1) { | 214 | if (index > -1) { |