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

陈鑫涛
2 parents 6aad6927 2f717896
Showing 2 changed files with 29 additions and 11 deletions
src/components/QuickQuote/index.jsx
src/components/QuickQuote/index.less
@@ -681,7 +681,7 @@ const QuickQuoteEvent = props =&gt; {
           sProductName: tableDataRowNew.sProductName,
           sProductStyle: tableDataRowNew.sProductStyle,
           sProductUnit: tableDataRowNew.sProductUnit,
-          sProductNo: tableDataRowNew.sProductNo,
+          sProductNo: tableDataRowNew.sProductNo || "XP0001",
           sCustomerProductNo: tableDataRowNew.sCustomerProductNo,
           sProductClassifyId: tableDataRowNew.sProductClassifyId,
           sProductClassifyName: tableDataRowNew.sProductClassifyName,
@@ -1160,7 +1160,7 @@ const TreeComponent = props =&gt; {
       const downAbleConfigs = await getSqlDropDownData({ ...showDownConfig });
  
       props.setState(pre => {
-        const { slaveData = [], slaveConfig } = pre;
+        const { slaveData = [], slaveConfig, manyData = [] } = pre;
         const addState = {};
         const defaultData = commonFunc.getDefaultData(slaveConfig, { tree: selectedNode });
         const slaveDataNew = slaveData.filter(item => item.sTreeNodeName === selectedNode.showName);
@@ -1189,6 +1189,10 @@ const TreeComponent = props =&gt; {
         if (timeRef.current > 1) {
           addState.slaveData = slaveDataNew;
           addState.extraParts = {};
+          addState.calcPriceFinished = false;
+          if (manyData.some(item => Object.keys(item).length > 4)) {
+            addState.manyData = [];
+          }
         }
         return {
           ...pre,
@@ -133,7 +133,7 @@
               flex: 0 0 25px !important;
               max-width: 25px !important;
  
-              > label {
+              >label {
                 display: flex;
                 width: 100%;
                 align-items: center;
@@ -156,7 +156,7 @@
               max-width: calc(100% - 25px);
             }
  
-            .viewStyle > .ant-col-24 {
+            .viewStyle>.ant-col-24 {
               padding-left: 100px;
             }
           }
@@ -207,9 +207,12 @@
             height: auto;
             display: flex;
             align-items: center;
-            :global .ant-carousel .slick-dots li button  {
-              background-color: #000; /* 未激活时的指示器颜色 */
+
+            :global .ant-carousel .slick-dots li button {
+              background-color: #000;
+              /* 未激活时的指示器颜色 */
             }
+
             :global {
               .ant-image {
                 padding: 15px;
@@ -249,13 +252,13 @@
         display: flex;
         position: relative;
  
-        > div:first-child {
+        >div:first-child {
           flex: 1;
           border-right: 1px solid #d7d7d7;
         }
  
-        > div:nth-child(2) {
-          > div:first-child {
+        >div:nth-child(2) {
+          >div:first-child {
             display: flex;
           }
         }
@@ -360,6 +363,16 @@
           justify-content: space-around;
  
           :global {
+            button {
+              padding: 0;
+              width: 16px;
+              height: 16px;
+
+              >span {
+                font-size: 10px;
+              }
+            }
+
             .ant-btn:nth-child(2) {
               background-color: #53b637;
               border-color: #53b637;
@@ -412,6 +425,7 @@
  
   :global {
     .ant-tree {
+
       .ant-tree-title,
       .ant-badge {
         color: #5c6374;
@@ -464,7 +478,7 @@
       width: 16px;
       height: 16px;
  
-      > span {
+      >span {
         font-size: 10px;
       }
     }
@@ -487,4 +501,4 @@
       }
     }
   }
 -}
+}
 \ No newline at end of file