Commit d1a9aac55580a3034a87f1bd0ff288d8c0bae0c8
1 parent
4f9a5a4d
没有拼版信息时默认为印刷页面
Showing
1 changed file
with
7 additions
and
2 deletions
src/components/QuickQuote/index.jsx
| @@ -2219,6 +2219,11 @@ const BoxComponent = props => { | @@ -2219,6 +2219,11 @@ const BoxComponent = props => { | ||
| 2219 | { src: slaveRowData.sPackPath, alt: "立体图" }, | 2219 | { src: slaveRowData.sPackPath, alt: "立体图" }, |
| 2220 | ]; | 2220 | ]; |
| 2221 | const { activeKey = 0 } = state; | 2221 | const { activeKey = 0 } = state; |
| 2222 | + useEffect(()=>{ | ||
| 2223 | + props.setState(pre => { | ||
| 2224 | + return { ...pre, activeKey:0 }; | ||
| 2225 | + }); | ||
| 2226 | + },[selectedNode]) | ||
| 2222 | return ( | 2227 | return ( |
| 2223 | <Tabs | 2228 | <Tabs |
| 2224 | key={boxModel} | 2229 | key={boxModel} |
| @@ -2594,7 +2599,8 @@ const MaterialsComponent = props => { | @@ -2594,7 +2599,8 @@ const MaterialsComponent = props => { | ||
| 2594 | } | 2599 | } |
| 2595 | 2600 | ||
| 2596 | return materialsInfo.map((item, index) => { | 2601 | return materialsInfo.map((item, index) => { |
| 2597 | - let viewRow = { ...materialsInfo[index], sProductClassifyId: selectedNode.sId }; | 2602 | + // let viewRow = { ...materialsInfo[index], sProductClassifyId: selectedNode.sId,sId: selectedNode.sId}; |
| 2603 | + let viewRow = { ...materialsInfo[index], sProductClassifyId: selectedNode.sId}; | ||
| 2598 | viewRow = { ...viewRow, sMaterialsName0: viewRow.showName || "" }; | 2604 | viewRow = { ...viewRow, sMaterialsName0: viewRow.showName || "" }; |
| 2599 | let materialsConfigNew = cloneDeep(materialsConfig); | 2605 | let materialsConfigNew = cloneDeep(materialsConfig); |
| 2600 | if (viewRow.showName) { | 2606 | if (viewRow.showName) { |
| @@ -2791,7 +2797,6 @@ const ManyComponent = props => { | @@ -2791,7 +2797,6 @@ const ManyComponent = props => { | ||
| 2791 | }, | 2797 | }, |
| 2792 | fixedHeight: 145, | 2798 | fixedHeight: 145, |
| 2793 | }; | 2799 | }; |
| 2794 | - | ||
| 2795 | return ( | 2800 | return ( |
| 2796 | <div className={`xly-bill-list ${styles.many}`}> | 2801 | <div className={`xly-bill-list ${styles.many}`}> |
| 2797 | <StaticEditTable {...tableProps} /> | 2802 | <StaticEditTable {...tableProps} /> |