获取参数展示倍率信息

陈鑫涛
1 parent e55278aa
Showing 3 changed files with 38 additions and 26 deletions
src/components/Common/Typesetting/typesetting.js
src/components/QuickQuote/index.jsx
src/components/QuickQuote/kapai.json
@@ -23,14 +23,14 @@ const Typesetting = props =&gt; {
   } = props;
   if (!slaveRowData) return;
   let {
-    dSBLB, // 上边留白
-    dXBLB, // 下边留白
-    dZBLB, // 左边留白
-    dYBLB, // 右边留白
+    dSBLB = 0, // 上边留白
+    dXBLB = 0, // 下边留白
+    dZBLB = 0, // 左边留白
+    dYBLB = 0, // 右边留白
     // dXBJJ, // 上边距
-    dXBJJ, // 下边距
+    dXBJJ = 0, // 下边距
     // dYBJJ, // 左边距
-    dYBJJ, // 右边距
+    dYBJJ = 0, // 右边距
     sLengthFormula, // 盒长公式
     sWidthFormula, // 盒宽公式
     sPackDetailPath,
@@ -44,8 +44,8 @@ const Typesetting = props =&gt; {
   // 如果是卷筒类 那么上下左右留白等于左留白
   if (selectedNode && selectedNode.sTypeKey === "juantong") {
     dXBLB = dSBLB;
-    dZBLB = 0
-    dYBLB = 0
+    dZBLB = 0;
+    dYBLB = 0;
   }
   // 生成盒子图片
   const [boxKey, setBoxKey] = useState(new Date().getTime());
@@ -187,6 +187,12 @@ const Typesetting = props =&gt; {
     ...variables,
     ...result,
   };
+  Object.keys(variabless).forEach(key => {
+    if (variabless[key] === null || variabless[key] === undefined || variabless[key] === '') {
+      variabless[key] = 0;
+    }
+  });
+    console.log("🚀 ~ Object.keys ~ variabless:", variabless)
  
   let DisableMateriallIcon = L ? sPackDetailPath : null;
   // 盒子展长展开公式计算
@@ -554,7 +560,8 @@ const Typesetting = props =&gt; {
       }
     }
   }
-
+  console.log(cols,rows,'cols');
+  
   // 判断展开长展开宽是否变化
   if (dPartsLength !== innerWidth && !innerDivs.length) {
     setDPartsLength(innerWidth);
@@ -696,7 +703,7 @@ const Typesetting = props =&gt; {
     Number(slaveDataDetail?.dMaxWidth) >= Number(slaveRowData?.dMachineWidth);
  
   const isShow = slaveRowData && slaveRowData.dMachineLength && slaveRowData.dMaxWidth && slaveRowData.dMaxLength && isMax && innerDivs.length > 0;
-
+  
   const confirmParam = commonFunc.showLocalMessage(props, "confirmParam", "排版尺寸大于上机尺寸，请确认参数!");
   const isJuantong = selectedNode.sTypeKey === "juantong";
   if (isCustomized && !isShow) {
@@ -1198,11 +1205,11 @@ const Typesetting = props =&gt; {
                   }}
                 >
                   <span style={{ color: "red", display: "inline-block", width: "100px" }}>{materialWidth}</span>
-                   {isJuantong ? (
+                  {isJuantong ? (
                     <span
                       style={{
                         position: "absolute",
-                        top: '50%',
+                        top: "50%",
                         textAlign: "center",
                         width: "30px",
                         writingMode: "vertical-rl",
@@ -1326,7 +1326,7 @@ const TreeComponent = props =&gt; {
         };
       });
     };
-
+    console.log(selectedNode, "selectedNode");
     if (selectedNode.sTypeKey === "juantong") {
       props.onSaveState({
         masterData: { ...props.masterData, sFormId: "101251240115016002356125200" },
@@ -1603,7 +1603,9 @@ const BoxComponent = props =&gt; {
         }
         const { bAdvancedSetting, bFlap, bFold } = slaveRowData;
         const shouldExcludeItem = (condition, itemNameList) => !condition && itemNameList.includes(item.sName);
-
+        if (selectedNode.showName === "封套") {
+          slaveRowData.bFold = true;
+        }
         if (
           shouldExcludeItem(bAdvancedSetting, ["dPortrait", "dHorizontal"]) ||
           shouldExcludeItem(bFlap, ["dFlap"]) ||
@@ -1611,24 +1613,24 @@ const BoxComponent = props =&gt; {
         ) {
           return false;
         }
-        const rateList = [
-          { id: 0, name: "不显示倍率" },
-          { id: 1, name: "每本张数" },
-          { id: 2, name: "片数" },
-        ];
+        if (item.sName === 'iRateType') {
+          console.log(item,'iRateType');
+          
+        }
         if (Number(selectedNode.iRateType) === 0 && item.sName === "iPage") {
           return false;
         } else {
           if (item.sName === "iPage") {
-            item.showName = rateList.find(rate => rate.id === Number(selectedNode.iRateType))?.name || "倍率";
+            const rateList = JSON.parse(slaveConfig.gdsconfigformslave.find(x=>x.sName === "iRateType")?.showDropDown) || []
+            item.showName = rateList[Number(selectedNode.iRateType)] || "倍率";
           }
         }
  
         if (item.sName === "dWlcd" && selectedNode.sTypeKey === "juantong") {
-          return false
+          return false;
         }
         if (item.sName === "dAuxiliaryQty" && selectedNode.sTypeKey !== "juantong") {
-          return false
+          return false;
         }
         if (item.sName === "dWlkd") {
           if (selectedNode.sTypeKey === "juantong") {
@@ -1653,6 +1655,9 @@ const BoxComponent = props =&gt; {
         if (selectedNode.sTypeKey !== "juantong" && item.sName === "sPaperDirection") {
           return false;
         }
+        if ((selectedNode.showName === "封套" && item.sName === "dSpine") || (selectedNode.showName === "封套" && item.sName === "bFlap")) {
+          return false;
+        }
  
         return item.iTag === iTag;
       });
@@ -1966,7 +1971,7 @@ const BoxComponent = props =&gt; {
     // 判断展长展宽是否可以放下原纸
     const isDPartsLength =
       slaveData[index]?.dPartsLength < slaveData[index]?.dMaxLength && slaveData[index]?.dPartsWidth < slaveData[index]?.dMaxWidth;
-    const dProductQtys = props.state.masterData.dProductQty || 0
+    const dProductQtys = props.state.masterData.dProductQty || 0;
     if (index !== undefined && index !== -1) {
       // 计算开数
       // 获取原始对象并创建一个新的对象进行更新
@@ -1991,7 +1996,7 @@ const BoxComponent = props =&gt; {
         // dWlcd: selectedNode.sTypeKey === 'juantong' ? Math.floor(dProductQty / dSinglePQty * ( length/ 1000)) : dWlcd,
         dWlcd: dWlcd,
         dWlkd: dWlkd,
-        dAuxiliaryQty:  Math.floor(dProductQty / dSinglePQty * ( length/ 1000)),
+        dAuxiliaryQty: Math.floor((dProductQty / dSinglePQty) * (length / 1000)),
         dMachineQty: Math.floor(dProductQty / dSinglePQty),
         dSinglePQty: dSinglePQty,
         dMaterialsKQty: dMaterialsKQty,
@@ -16,9 +16,9 @@
     "dZBLB": 5,
     "dYBLB": 5,
     "dSBJJ": 0,
-    "dXBJJ": 5,
+    "dXBJJ": 0,
     "dZBJJ": 0,
-    "dYBJJ": 5,
+    "dYBJJ": 0,
     "sColumnNameConfig": "[{\"sId\": \"17503121050007868467942061636000\", \"sBig5\": \"上方盒舌\", \"sName\": \"dSFHS\", \"iOrder\": 1, \"sTypes\": \"\", \"bVisible\": 0, \"sChinese\": \"上方盒舌\", \"sDefault\": 0, \"showName\": \"上方盒舌\", \"iFitWidth\": 120, \"sBrandsId\": \"1111111111\", \"sParentId\": \"17503120900005596112489925319000\", \"iIncrement\": 24930, \"sSubsidiaryId\": \"1111111111\", \"sAssignFormula\": null},{\"sId\": \"17503121050004734713992285329000\", \"sBig5\": \"盒底组件\", \"sName\": \"dHDC\", \"iOrder\": 2, \"sTypes\": \"\", \"bVisible\": 0, \"sChinese\": \"盒底组件\", \"sDefault\": 0, \"showName\": \"盒底组件\", \"iFitWidth\": 120, \"sBrandsId\": \"1111111111\", \"sParentId\": \"17503120900005596112489925319000\", \"iIncrement\": 24931, \"sSubsidiaryId\": \"1111111111\", \"sAssignFormula\": null},{\"sId\": \"17503121050003805022968003848700\", \"sBig5\": \"下方盒舌\", \"sName\": \"dXFHS\", \"iOrder\": 3, \"sTypes\": \"\", \"bVisible\": 0, \"sChinese\": \"下方盒舌\", \"sDefault\": 0, \"showName\": \"下方盒舌\", \"iFitWidth\": 120, \"sBrandsId\": \"1111111111\", \"sParentId\": \"17503120900005596112489925319000\", \"iIncrement\": 24932, \"sSubsidiaryId\": \"1111111111\", \"sAssignFormula\": null},{\"sId\": \"17503121050009676586559595633000\", \"sBig5\": \"左(上)插位组件\", \"sName\": \"dZSCW\", \"iOrder\": 4, \"sTypes\": \"\", \"bVisible\": 0, \"sChinese\": \"左(上)插位组件\", \"sDefault\": 0, \"showName\": \"左(上)插位组件\", \"iFitWidth\": 120, \"sBrandsId\": \"1111111111\", \"sParentId\": \"17503120900005596112489925319000\", \"iIncrement\": 24933, \"sSubsidiaryId\": \"1111111111\", \"sAssignFormula\": null},{\"sId\": \"17503121050001962345088454939000\", \"sBig5\": \"左贴边位\", \"sName\": \"dZTBW\", \"iOrder\": 5, \"sTypes\": \"\", \"bVisible\": 0, \"sChinese\": \"左贴边位\", \"sDefault\": 0, \"showName\": \"左贴边位\", \"iFitWidth\": 120, \"sBrandsId\": \"1111111111\", \"sParentId\": \"17503120900005596112489925319000\", \"iIncrement\": 24934, \"sSubsidiaryId\": \"1111111111\", \"sAssignFormula\": null},{\"sId\": \"17503121050002414611810439558000\", \"sBig5\": \"左(下)插位组件\", \"sName\": \"dZXCW\", \"iOrder\": 6, \"sTypes\": \"\", \"bVisible\": 0, \"sChinese\": \"左(下)插位组件\", \"sDefault\": 0, \"showName\": \"左(下)插位组件\", \"iFitWidth\": 120, \"sBrandsId\": \"1111111111\", \"sParentId\": \"17503120900005596112489925319000\", \"iIncrement\": 24935, \"sSubsidiaryId\": \"1111111111\", \"sAssignFormula\": null},{\"sId\": \"17503121050002143115722990272500\", \"sBig5\": \"右(上)插位组件\", \"sName\": \"dYSCW\", \"iOrder\": 7, \"sTypes\": \"\", \"bVisible\": 0, \"sChinese\": \"右(上)插位组件\", \"sDefault\": 0, \"showName\": \"右(上)插位组件\", \"iFitWidth\": 120, \"sBrandsId\": \"1111111111\", \"sParentId\": \"17503120900005596112489925319000\", \"iIncrement\": 24936, \"sSubsidiaryId\": \"1111111111\", \"sAssignFormula\": null},{\"sId\": \"17503121050003634411255280123400\", \"sBig5\": \"右贴边位\", \"sName\": \"dYTBW\", \"iOrder\": 8, \"sTypes\": \"\", \"bVisible\": 0, \"sChinese\": \"右贴边位\", \"sDefault\": 0, \"showName\": \"右贴边位\", \"iFitWidth\": 120, \"sBrandsId\": \"1111111111\", \"sParentId\": \"17503120900005596112489925319000\", \"iIncrement\": 24937, \"sSubsidiaryId\": \"1111111111\", \"sAssignFormula\": null},{\"sId\": \"17503121050004462109599634759000\", \"sBig5\": \"右(下)插位组件\", \"sName\": \"dYXCW\", \"iOrder\": 9, \"sTypes\": \"\", \"bVisible\": 0, \"sChinese\": \"右(下)插位组件\", \"sDefault\": 0, \"showName\": \"右(下)插位组件\", \"iFitWidth\": 120, \"sBrandsId\": \"1111111111\", \"sParentId\": \"17503120900005596112489925319000\", \"iIncrement\": 24938, \"sSubsidiaryId\": \"1111111111\", \"sAssignFormula\": null}]",
     "sColumnNameConfigExclusion": "[{\"sId\": \"17503122410009257367226894416000\", \"sBig5\": \"正常算法\", \"sCode\": \"横向\", \"sName\": \"横向\", \"iOrder\": 1, \"iFAngle\": 0, \"iSAngle\": 0, \"sChinese\": \"正常算法\", \"showName\": \"正常算法\", \"iFitWidth\": 120, \"sBrandsId\": \"1111111111\", \"sParentId\": \"17503120900005596112489925319000\", \"iIncrement\": 23752, \"sFWidthOffset\": \"0\", \"sSGroupOffset\": \"首盒\", \"sSWidthOffset\": \"0\", \"sSubsidiaryId\": \"1111111111\", \"sFLengthOffset\": \"0\", \"sSLengthOffset\": \"0\", \"sSettingMethod\": \"从上到下\", \"sSecondorizontalOffset\": \"0\", \"sSecondLongitudinalOffset\": \"0\"}]",
     "sLengthFormula": "L",