diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index 0a55e29..01b59ef 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -445,7 +445,23 @@ const QuickQuoteEvent = props => { materialWidth: sFieldName === "dWlkd" ? changeValue[sFieldName] : slaveData[saveIndex]?.dWlkd, }; } - + // 如果是卡牌那么赋值sMachineStyle + // if (selectedNode.sTypeKey === 'kapai' || selectedNode.sTypeKey === 'juantong') { + // console.log(slaveData[saveIndex].dMaxLength,'juantong'); + + // if (slaveData[saveIndex].dMaxLength === undefined) { + // slaveData[saveIndex] = { + // ...slaveData[saveIndex], + // dMaxLength: Number(selectedNode.sMachineStyle.split("*")[0]), + // }; + // } + // if (slaveData[saveIndex].dMaxWidth === undefined) { + // slaveData[saveIndex] = { + // ...slaveData[saveIndex], + // dMaxWidth: Number(selectedNode.sMachineStyle.split("*")[1]), + // }; + // } + // } if (sFieldName === "sName") { slaveData[saveIndex] = { ...slaveData[saveIndex], @@ -814,6 +830,8 @@ const QuickQuoteEvent = props => { slaveRowData.dWlcd = item.dMaterialsLength; slaveRowData.dWlkd = item.dMaterialsWidth; } + // slaveRowData.dMaterialsLength = item.dMaterialsLength; + // slaveRowData.dMaterialsWidth = item.dMaterialsWidth; setState(pre => ({ ...pre, slaveData: stateSlaveData })); }); @@ -864,8 +882,8 @@ const QuickQuoteEvent = props => { partsDataRow.iOppositeColor = partsDataRow.iPositiveColor; } delete partsDataRow.dMaterialsKQty; - delete partsDataRow.dMaterialsLength; - delete partsDataRow.dMaterialsWidth; + // delete partsDataRow.dMaterialsLength; + // delete partsDataRow.dMaterialsWidth; // if (productClassify.bSpecialRules) { // partsDataRow.dMachineLength = partsDataRow.dMaxMachineLength; // partsDataRow.dMachineWidth = partsDataRow.dMaxMachineWidth; @@ -1665,8 +1683,8 @@ const BoxComponent = props => { if (selectedNode.sTypeKey === "juantong") { const mappings = { dZBLB: "留边", - dXBJJ: "跳距", - dYBJJ: "间距", + dXBJJ: "间距", + dYBJJ: "跳距", }; boxConfigList.forEach(item => { diff --git a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js index 43d73dd..79e590c 100644 --- a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js +++ b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js @@ -2664,7 +2664,6 @@ class QuotationPackTableTree extends Component { materialsConfig, materialsData, materialsDelData, processConfig, processData, processDelData, colorConfig, colorData, colorDelData, packConfig, packData, packDelData, } = this.props; - console.log("🚀 ~ QuotationPackTableTree ~ handleButtonClick= ~ slaveData:", slaveData) const data = []; slaveConfig.gdsconfigformslave.forEach((itemConfig) => { slaveData.filter(itemData => itemData.handleType === 'add' || itemData.handleType === 'update').forEach((itemData) => {