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

陈鑫涛
2 parents 7f8864ea f2b067aa
Showing 2 changed files with 15 additions and 18 deletions
src/components/QuickQuote/index.jsx
src/components/QuickQuote/index.less
@@ -1316,15 +1316,16 @@ const TreeComponent = props =&gt; {
           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 =&gt; {
         };
       });
     };
-    console.log(selectedNode, "selectedNode");
     if (selectedNode.sTypeKey === "juantong") {
       props.onSaveState({
         masterData: { ...props.masterData, sFormId: "101251240115016002356125200" },
@@ -1378,6 +1378,7 @@ const TreeComponent = props =&gt; {
     <Tree
       className={"hide-file-icon"}
       onSelect={(e, select) => {
+        props.onSaveState({ currentBoxModel: undefined });
         props.setState(pre => {
           const { masterData = {} } = pre;
           const { sProductName, sProductUnit } = masterData;
@@ -1647,9 +1648,6 @@ const BoxComponent = props =&gt; {
         ) {
           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 =&gt; {
     dSvgBoxHeight: 200,
     showNew: 1,
   };
-  console.log(boxList, "boxList");
  
   // upViewProps.viewRow =
  
@@ -2570,18 +2567,18 @@ const MaterialsComponent = props =&gt; {
         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;
@@ -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;