Commit f20864a8c6f6f3a81ba7c9aa229fddc9f84fc550

Authored by 陈鑫涛
2 parents 2b172e95 c5f5a9f5

Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

src/components/QuickQuote/index.jsx
@@ -2340,6 +2340,7 @@ const BoxComponent = props => { @@ -2340,6 +2340,7 @@ const BoxComponent = props => {
2340 ...pre, 2340 ...pre,
2341 slaveData: [...slaveData], 2341 slaveData: [...slaveData],
2342 activeKey: 1, 2342 activeKey: 1,
  2343 + calcPriceFinished: false,
2343 })); 2344 }));
2344 }} 2345 }}
2345 value={radioValue} 2346 value={radioValue}
@@ -2664,8 +2665,7 @@ const MaterialsComponent = props => { @@ -2664,8 +2665,7 @@ const MaterialsComponent = props => {
2664 // } 2665 // }
2665 2666
2666 return materialsInfo.map((item, index) => { 2667 return materialsInfo.map((item, index) => {
2667 - // let viewRow = { ...materialsInfo[index], sProductClassifyId: selectedNode.sId,sId: selectedNode.sId};  
2668 - let viewRow = { ...materialsInfo[index], sProductClassifyId: selectedNode.sId }; 2668 + let viewRow = { ...materialsInfo[index], sProductClassifyId: selectedNode.sId, sId: selectedNode.sId };
2669 viewRow = { ...viewRow, sMaterialsName0: viewRow.showName || "" }; 2669 viewRow = { ...viewRow, sMaterialsName0: viewRow.showName || "" };
2670 let materialsConfigNew = cloneDeep(materialsConfig); 2670 let materialsConfigNew = cloneDeep(materialsConfig);
2671 if (viewRow.showName) { 2671 if (viewRow.showName) {