Commit 7290ea02b6a52e0dd14adb16d78b05c17a33729c
1 parent
04e38ae6
快速报价app
Showing
2 changed files
with
6 additions
and
2 deletions
src/mobile/quotation/detailNew.jsx
| @@ -541,7 +541,9 @@ const QuickQuoteEvent = props => { | @@ -541,7 +541,9 @@ const QuickQuoteEvent = props => { | ||
| 541 | return pre; | 541 | return pre; |
| 542 | }, {}), | 542 | }, {}), |
| 543 | dPartsQty: masterData.dProductQty, | 543 | dPartsQty: masterData.dProductQty, |
| 544 | - iPositiveColor: Number(item.sColor), | 544 | + // iPositiveColor: Number(item.sColor), |
| 545 | + iOppositeColor: item.sBackProcessData?.find(item => item.bPrintParams)?.iPositiveColor || 0, | ||
| 546 | + iOppositeSpecialColor: item.sBackProcessData?.find(item => item.bPrintParams)?.iPositiveSpecialColor || 0, | ||
| 545 | sPartsName: item.sBoxModel, | 547 | sPartsName: item.sBoxModel, |
| 546 | materialsInfo: item.materialsInfo?.filter(x => commonUtils.isNotEmptyObject(x)), | 548 | materialsInfo: item.materialsInfo?.filter(x => commonUtils.isNotEmptyObject(x)), |
| 547 | iPrintModePo: Number(item.value), | 549 | iPrintModePo: Number(item.value), |
| @@ -2499,7 +2501,8 @@ const ManyComponent = props => { | @@ -2499,7 +2501,8 @@ const ManyComponent = props => { | ||
| 2499 | // props.slaveData?.forEach(slaveRowData => { | 2501 | // props.slaveData?.forEach(slaveRowData => { |
| 2500 | // props.onDataChange0("slave", "dProductQty", { dProductQty }, slaveRowData.sId, [], props); | 2502 | // props.onDataChange0("slave", "dProductQty", { dProductQty }, slaveRowData.sId, [], props); |
| 2501 | // }); | 2503 | // }); |
| 2502 | - setState(pre => ({ | 2504 | + |
| 2505 | + props.setState(pre => ({ | ||
| 2503 | ...pre, | 2506 | ...pre, |
| 2504 | manySelectedRowKeys: selectedRowKeys.sId, | 2507 | manySelectedRowKeys: selectedRowKeys.sId, |
| 2505 | dQuickQuoteProductQty: dProductQty, | 2508 | dQuickQuoteProductQty: dProductQty, |
src/mobile/quotation/master.jsx
| @@ -899,6 +899,7 @@ const handleSave = async (skipCalculation, props) => { | @@ -899,6 +899,7 @@ const handleSave = async (skipCalculation, props) => { | ||
| 899 | return; | 899 | return; |
| 900 | } | 900 | } |
| 901 | const data = []; | 901 | const data = []; |
| 902 | + | ||
| 902 | data.push(commonBusiness.mergeData("master", masterConfig.sTbName, [masterData])); | 903 | data.push(commonBusiness.mergeData("master", masterConfig.sTbName, [masterData])); |
| 903 | data.push(commonBusiness.mergeData("slave", slaveConfig.sTbName, slaveData, slaveDelData)); | 904 | data.push(commonBusiness.mergeData("slave", slaveConfig.sTbName, slaveData, slaveDelData)); |
| 904 | data.push(commonBusiness.mergeData("control", controlConfig.sTbName, controlData, controlDelData)); | 905 | data.push(commonBusiness.mergeData("control", controlConfig.sTbName, controlData, controlDelData)); |