diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index e04ec25..4316c30 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -1316,15 +1316,16 @@ const TreeComponent = props => { addState.slaveData = slaveDataNew; } + addState.slaveData = slaveDataNew.map(item => { + const { sPackDetailPathUpLoad, sPackPath } = selectedNode; + return { + ...item, + ...(sPackDetailPathUpLoad ? { sPackDetailPathUpLoad } : {}), + ...(sPackPath ? { sPackPath } : {}), + }; + }); + if (timeRef.current > 1) { - addState.slaveData = slaveDataNew.map(item => { - const { sPackDetailPathUpLoad, sPackPath } = selectedNode; - return { - ...item, - ...(sPackDetailPathUpLoad ? { sPackDetailPathUpLoad } : {}), - ...(sPackPath ? { sPackPath } : {}), - }; - }); delete masterData.cpProcessName; delete masterData.productProcessInfo; addState.masterData = masterData; @@ -1360,7 +1361,6 @@ const TreeComponent = props => { }; }); }; - console.log(selectedNode, "selectedNode"); if (selectedNode.sTypeKey === "juantong") { props.onSaveState({ masterData: { ...props.masterData, sFormId: "101251240115016002356125200" }, @@ -1378,6 +1378,7 @@ const TreeComponent = props => { { + props.onSaveState({ currentBoxModel: undefined }); props.setState(pre => { const { masterData = {} } = pre; const { sProductName, sProductUnit } = masterData; @@ -1647,9 +1648,6 @@ const BoxComponent = props => { ) { return false; } - if (item.sName === "iRateType") { - console.log(item, "iRateType"); - } if (Number(selectedNode.iRateType) === 0 && item.sName === "iPage") { return false; } else { @@ -2205,7 +2203,6 @@ const BoxComponent = props => { dSvgBoxHeight: 200, showNew: 1, }; - console.log(boxList, "boxList"); // upViewProps.viewRow = @@ -2570,18 +2567,18 @@ const MaterialsComponent = props => { return { ...item, sVisColumnName: "sMaterialsName", - iColValue: 14, + iColValue: 8, }; } else if (sName === "dMaterialPrice") { return { ...item, - iColValue: 6, + iColValue: 8, }; } else if (sName === "sComMaterials") { return { ...item, sName: "bComMaterials", - iColValue: 4, + iColValue: 8, }; } else { return item; diff --git a/src/components/QuickQuote/index.less b/src/components/QuickQuote/index.less index 8e98747..5c56709 100644 --- a/src/components/QuickQuote/index.less +++ b/src/components/QuickQuote/index.less @@ -100,7 +100,7 @@ .ant-form-item-control { flex: 1; - max-width: calc(100% - 70x); + max-width: calc(100% - 70px); } .viewStyle { @@ -386,7 +386,7 @@ } .materialsBtns { - width: 80px; + width: 10%; display: flex; align-items: center; justify-content: space-around;