快速报价材料费展示

陈鑫涛
1 parent b4f3409a
Showing 3 changed files with 24 additions and 18 deletions
src/components/Common/BoxShowImgMaterial/indexNew.js
src/components/Common/Typesetting/typesetting.js
src/components/QuickQuote/index.jsx
@@ -25,6 +25,9 @@ const BoxShowImgMaterial = props =&gt; {
   const verticalBoxes = Math.floor(dWlkd / dMachineWidth);
   const scaleX = (clientWidth - 70) / (dWlcd);
   const scaleY = (clientHeight - 70) / (dWlkd);
+  const getNum =(num)=>{
+    return Number(num).toFixed(0);
+  }
   // 动态生成多个 materialBox
   const generateMaterialBoxes = () => {
     const boxes = [];
@@ -78,7 +81,7 @@ const BoxShowImgMaterial = props =&gt; {
                 color: "red",
               }}
             >
-              {dMachineLength}
+              {getNum(dMachineLength)}
             </span>
             <VerticalLeftOutlined
               style={{
@@ -136,7 +139,7 @@ const BoxShowImgMaterial = props =&gt; {
                 color: "red",
               }}
             >
-              {dMachineWidth}
+              {getNum(dMachineWidth)}
             </span>
             <VerticalLeftOutlined
               style={{
@@ -183,7 +186,7 @@ const BoxShowImgMaterial = props =&gt; {
           textRefs.current.style.transform = `scale(${1 / scaleX}, ${1 / scaleY})`;
           textRefs.current.style.transformOrigin = "top left";
         }
-      }, 0);
+      }, 1); // umijs 需要延时处理
     },
     [slaveDataDetail]
   );
@@ -192,7 +195,6 @@ const BoxShowImgMaterial = props =&gt; {
     const MaterialUtilizationRate =  commonFunc.showLocalMessage(props, "MaterialUtilizationRate", "材料利用率");
   const isShow =
     slaveDataDetail && slaveDataDetail.dMachineLength && slaveDataDetail.dMaxWidth && slaveDataDetail.dMaxLength && isMax;
-    console.log("🚀 ~ isDPartsLength:", isDPartsLength,isMax)
     return (
     <>
       {isShow ? (
@@ -248,7 +250,7 @@ const BoxShowImgMaterial = props =&gt; {
                   color: "red",
                 }}
               >
-                {dWlcd}
+                {getNum(dWlcd)}
               </span>
               <span
                 style={{
@@ -318,9 +320,11 @@ const BoxShowImgMaterial = props =&gt; {
             <span
               style={{
                 color: "red",
+                 position: "absolute",
+                top: "15px",
               }}
             >
-              {dWlkd}
+              {getNum(dWlkd)}
             </span>
             <VerticalLeftOutlined
               style={{
@@ -631,7 +631,7 @@ const Typesetting = props =&gt; {
       const newScale = Math.min(scaleX, scaleY);
       setScale(newScale);
       if (boxRef.current) {
-        boxRef.current.style.transform = `scale(${scaleX}, ${scaleY})`;
+        boxRef.current.style.transform = `scale(${newScale}, ${newScale})`;
         boxRef.current.style.transformOrigin = "top left";
       }
     }, 0);
@@ -871,7 +871,9 @@ const Typesetting = props =&gt; {
     setIsModalOpen(false);
   };
-
+  const getNum =(num)=>{
+    return Number(num).toFixed(0);
+  }
   return (
     <>
       {isShow ? (
@@ -928,7 +930,7 @@ const Typesetting = props =&gt; {
                     transformOrigin: "top left",
                   }}
                 >
-                  <span style={{ color: "red", display: "inline-block", width: "100px" }}>{materialLength}</span>
+                  <span style={{ color: "red", display: "inline-block", width: "100px" }}>{getNum(materialLength)}</span>
                   <div className={styles.maxWidthLeft}>
                     <VerticalRightOutlined />
                     <div
@@ -972,7 +974,7 @@ const Typesetting = props =&gt; {
                     transformOrigin: "top left",
                   }}
                 >
-                  <span style={{ color: "red", display: "inline-block", width: "30px", textAlign: "center" }}>{materialWidth}</span>
+                  <span style={{ color: "red", display: "inline-block", width: "30px", textAlign: "center" }}>{getNum(materialWidth)}</span>
                   {isJuantong ? (
                     <span
                       style={{
@@ -1116,7 +1118,7 @@ const Typesetting = props =&gt; {
               <div
                 style={{
                   position: "absolute",
-                  right: "-10px",
+                  right: "-50px",
                   top: 0,
                   textAlign: "center",
                   width: `${30}px`,
@@ -1132,7 +1134,7 @@ const Typesetting = props =&gt; {
                     color: "red",
                   }}
                 >
-                  {maxHeight}
+                  {getNum(maxHeight)}
                 </span>
                 <div
                   style={{
@@ -1284,7 +1286,7 @@ const Typesetting = props =&gt; {
                     color: "#333",
                   }}
                 >
-                  <span style={{ color: "red", display: "inline-block", width: "100px" }}>{materialLength}</span>
+                  <span style={{ color: "red", display: "inline-block", width: "100px" }}>{getNum(materialLength)}</span>
                   <div className={styles.maxWidthLeft}>
                     <LeftOutlined style={{ fontSize: "20px" }} />
                     <div
@@ -1454,7 +1456,7 @@ const Typesetting = props =&gt; {
                     overflow: "hide",
                   }}
                 >
-                  <span style={{ color: "red" }}>{maxWidth}</span>
+                  <span style={{ color: "red" }}>{getNum(maxWidth)}</span>
                   {openEdition ? (
                     <span>
                       <span>{OpenVersion}：</span>
@@ -1524,7 +1526,7 @@ const Typesetting = props =&gt; {
                     color: "red",
                   }}
                 >
-                  {maxHeight}
+                  {getNum(maxHeight)}
                 </div>
                 <div
                   style={{
@@ -997,7 +997,6 @@ const QuickQuoteEvent = props =&gt; {
       newCopyTo.slave = commonUtils.isEmptyArr(slaveData) ? {} : slaveData[0];
       for (let i = 0; i < partsNewInfo.length; i++) {
         const partInfo = partsNewInfo[i];
-        console.log("🚀 ~ QuickQuoteEvent ~ partInfo:", partInfo)
         const iIndex = i;
         const partsDataRow = {};
         for (const child of Object.keys(partInfo)) {
@@ -2381,9 +2380,9 @@ const BoxComponent = props =&gt; {
         materialWidth: dWlkd,
         dMachineLength: dWlcd, // 上机长
         dMachineWidth: dWlkd, // 上机宽
-        sMaterialsStyle: `${slaveData[index]?.dWlcd || 0}*${slaveData[index]?.dWlkd || 0}`, // 原纸尺寸
+        sMaterialsStyle: `${slaveData[index]?.dWlcd || dWlcd}*${slaveData[index]?.dWlkd || dWlkd}`, // 原纸尺寸
         sMachineStyle: `${length || slaveData[index].materialLength}*${width || slaveData[index].materialWidth}`, // 开料尺寸为计算的排版尺寸
-        sMaterialRate: (((length * width) / (slaveData[index].dWlcd * slaveData[index].dWlkd)) * 100).toFixed(2),
+        sMaterialRate: (((length * width) / ((slaveData[index].dWlcd || dWlcd) * (slaveData[index].dWlkd || dWlkd))) * 100).toFixed(2),
         newMaterialLength: dWlcd,
         newMaterialWidth: dWlkd,
         sLayoutRate: Number(
@@ -3248,6 +3247,7 @@ const ManyComponent = props =&gt; {
     },
     fixedHeight: 145,
   };
+  
   const pricingInProgress = commonFunc.showLocalMessage(props, "sNuclearPricing", "核价中");
   const progress = commonFunc.showLocalMessage(props, "progress", "进度");
   return (