xlyErp / xlyUmi

Commit 2e335e53574979353966435d9ee7138d1ee02e3f

Authored by 陈鑫涛
2 parents ddddc2f1 619dd4f5

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

# Conflicts:
#	src/components/QuickQuote/index.jsx
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
src/components/QuickQuote/index.jsx
  View file @2e335e5
@@ -1141,6 +1141,7 @@ const TreeComponent = props => { @@ -1141,6 +1141,7 @@ const TreeComponent = props => {
1141 }; 1141 };
1142 }); 1142 });
1143 }; 1143 };
  1144 +console.log(selectedNode,'selectedNode');
1144 1145
1145 getDropDownData(props); 1146 getDropDownData(props);
1146 }, [selectedNode.sId, commonUtils.isEmptyObject(slaveConfig)]); 1147 }, [selectedNode.sId, commonUtils.isEmptyObject(slaveConfig)]);
@@ -1152,9 +1153,7 @@ const TreeComponent = props => { @@ -1152,9 +1153,7 @@ const TreeComponent = props => {
1152 props.setState(pre => { 1153 props.setState(pre => {
1153 const { masterData = {} } = pre; 1154 const { masterData = {} } = pre;
1154 const { sProductName, sProductUnit } = masterData; 1155 const { sProductName, sProductUnit } = masterData;
1155 - const showNameList = [...flattenArray(treeData).map(item => item.showName), ""];  
1156 - console.log(select.selectedNodes[0]?.treeNode ,'select.selectedNodes[0]?.treeNode ');  
1157 - 1156 + const showNameList = [...flattenArray(treeData).map(item => item.showName), "", undefined];
1158 return { 1157 return {
1159 ...pre, 1158 ...pre,
1160 selectedNode: select.selectedNodes[0]?.treeNode || {}, 1159 selectedNode: select.selectedNodes[0]?.treeNode || {},
@@ -1699,6 +1698,7 @@ const BoxComponent = props => { @@ -1699,6 +1698,7 @@ const BoxComponent = props => {
1699 const { selectedNode } = props.state; 1698 const { selectedNode } = props.state;
1700 1699
1701 const index = slaveData?.findIndex(x => x.sTreeNodeName === selectedNode.showName && x.sBoxModel === props.boxModel); 1700 const index = slaveData?.findIndex(x => x.sTreeNodeName === selectedNode.showName && x.sBoxModel === props.boxModel);
  1701 + console.log("🚀 ~ selectedNode:", index,slaveData,selectedNode.showName,props.boxModel,props)
1702 // 判断展长展宽是否可以放下原纸 1702 // 判断展长展宽是否可以放下原纸
1703 const isDPartsLength = 1703 const isDPartsLength =
1704 slaveData[index]?.dPartsLength < slaveData[index]?.dMaxLength && slaveData[index]?.dPartsWidth < slaveData[index]?.dMaxWidth; 1704 slaveData[index]?.dPartsLength < slaveData[index]?.dMaxLength && slaveData[index]?.dPartsWidth < slaveData[index]?.dMaxWidth;