Commit aed31270de6be0d300510614f242d0d9e5344013
1 parent
5a24e22e
核价材料长宽
Showing
2 changed files
with
23 additions
and
6 deletions
src/components/QuickQuote/index.jsx
| ... | ... | @@ -445,7 +445,23 @@ const QuickQuoteEvent = props => { |
| 445 | 445 | materialWidth: sFieldName === "dWlkd" ? changeValue[sFieldName] : slaveData[saveIndex]?.dWlkd, |
| 446 | 446 | }; |
| 447 | 447 | } |
| 448 | - | |
| 448 | + // 如果是卡牌那么赋值sMachineStyle | |
| 449 | + // if (selectedNode.sTypeKey === 'kapai' || selectedNode.sTypeKey === 'juantong') { | |
| 450 | + // console.log(slaveData[saveIndex].dMaxLength,'juantong'); | |
| 451 | + | |
| 452 | + // if (slaveData[saveIndex].dMaxLength === undefined) { | |
| 453 | + // slaveData[saveIndex] = { | |
| 454 | + // ...slaveData[saveIndex], | |
| 455 | + // dMaxLength: Number(selectedNode.sMachineStyle.split("*")[0]), | |
| 456 | + // }; | |
| 457 | + // } | |
| 458 | + // if (slaveData[saveIndex].dMaxWidth === undefined) { | |
| 459 | + // slaveData[saveIndex] = { | |
| 460 | + // ...slaveData[saveIndex], | |
| 461 | + // dMaxWidth: Number(selectedNode.sMachineStyle.split("*")[1]), | |
| 462 | + // }; | |
| 463 | + // } | |
| 464 | + // } | |
| 449 | 465 | if (sFieldName === "sName") { |
| 450 | 466 | slaveData[saveIndex] = { |
| 451 | 467 | ...slaveData[saveIndex], |
| ... | ... | @@ -814,6 +830,8 @@ const QuickQuoteEvent = props => { |
| 814 | 830 | slaveRowData.dWlcd = item.dMaterialsLength; |
| 815 | 831 | slaveRowData.dWlkd = item.dMaterialsWidth; |
| 816 | 832 | } |
| 833 | + // slaveRowData.dMaterialsLength = item.dMaterialsLength; | |
| 834 | + // slaveRowData.dMaterialsWidth = item.dMaterialsWidth; | |
| 817 | 835 | setState(pre => ({ ...pre, slaveData: stateSlaveData })); |
| 818 | 836 | }); |
| 819 | 837 | |
| ... | ... | @@ -864,8 +882,8 @@ const QuickQuoteEvent = props => { |
| 864 | 882 | partsDataRow.iOppositeColor = partsDataRow.iPositiveColor; |
| 865 | 883 | } |
| 866 | 884 | delete partsDataRow.dMaterialsKQty; |
| 867 | - delete partsDataRow.dMaterialsLength; | |
| 868 | - delete partsDataRow.dMaterialsWidth; | |
| 885 | + // delete partsDataRow.dMaterialsLength; | |
| 886 | + // delete partsDataRow.dMaterialsWidth; | |
| 869 | 887 | // if (productClassify.bSpecialRules) { |
| 870 | 888 | // partsDataRow.dMachineLength = partsDataRow.dMaxMachineLength; |
| 871 | 889 | // partsDataRow.dMachineWidth = partsDataRow.dMaxMachineWidth; |
| ... | ... | @@ -1665,8 +1683,8 @@ const BoxComponent = props => { |
| 1665 | 1683 | if (selectedNode.sTypeKey === "juantong") { |
| 1666 | 1684 | const mappings = { |
| 1667 | 1685 | dZBLB: "留边", |
| 1668 | - dXBJJ: "跳距", | |
| 1669 | - dYBJJ: "间距", | |
| 1686 | + dXBJJ: "间距", | |
| 1687 | + dYBJJ: "跳距", | |
| 1670 | 1688 | }; |
| 1671 | 1689 | |
| 1672 | 1690 | boxConfigList.forEach(item => { | ... | ... |
src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
| ... | ... | @@ -2664,7 +2664,6 @@ class QuotationPackTableTree extends Component { |
| 2664 | 2664 | materialsConfig, materialsData, materialsDelData, processConfig, processData, processDelData, colorConfig, |
| 2665 | 2665 | colorData, colorDelData, packConfig, packData, packDelData, |
| 2666 | 2666 | } = this.props; |
| 2667 | - console.log("🚀 ~ QuotationPackTableTree ~ handleButtonClick= ~ slaveData:", slaveData) | |
| 2668 | 2667 | const data = []; |
| 2669 | 2668 | slaveConfig.gdsconfigformslave.forEach((itemConfig) => { |
| 2670 | 2669 | slaveData.filter(itemData => itemData.handleType === 'add' || itemData.handleType === 'update').forEach((itemData) => { | ... | ... |