From 4f949255c752366bc87e628152ff81e795ce82d8 Mon Sep 17 00:00:00 2001
From: 陈鑫涛 <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Fri, 27 Jun 2025 11:07:49 +0800
Subject: [PATCH] 不干胶状态展示显示出纸方向、拼版的界面改跳距、间距，只保留左留

---
 src/components/QuickQuote/index.jsx | 51 +++++++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx
index e9bdce1..8387549 100644
--- a/src/components/QuickQuote/index.jsx
+++ b/src/components/QuickQuote/index.jsx
@@ -1143,7 +1143,7 @@ const TreeComponent = props => {
         };
       });
     };
-    if (selectedNode.sTypeKey === "juantong") {
+    if (selectedNode.sProductType === "不干胶") {
       props.onSaveState({
         masterData: { ...props.masterData, sFormId: "101251240115016002356125200" },
       });
@@ -1300,10 +1300,10 @@ const MasterComponent = props => {
   const ableConfigs = masterConfig.gdsconfigformslave.filter(item => item.sName && item.bVisible);
   // 处理长宽样式
   const viewConfigs =
-    selectedNode?.bBox && selectedNode.sTypeKey !== "kapai" && selectedNode?.bBox && selectedNode.sTypeKey !== "juantong"
+    selectedNode?.bBox && selectedNode.sTypeKey !== "kapai" && selectedNode?.bBox && selectedNode.sProductType !== "不干胶"
       ? ableConfigs
       : ableConfigs.filter(x => x.sName !== "dHeight");
-  if (selectedNode?.bBox && selectedNode.sTypeKey !== "kapai" && selectedNode?.bBox && selectedNode.sTypeKey !== "juantong") {
+  if (selectedNode?.bBox && selectedNode.sTypeKey !== "kapai" && selectedNode?.bBox && selectedNode.sProductType !== "不干胶") {
     viewConfigs.forEach(item => {
       if (item.sName === "dLength" || item.sName === "dWidth") {
         item.iColValue = 4;
@@ -1363,7 +1363,7 @@ const BoxComponent = props => {
   const [boxTypeList, setBoxTypeList] = useState([]);
   const [boxData, setBoxData] = useState([]);
   useEffect(() => {
-    if (selectedNode.sTypeKey === "kapai" || selectedNode.sTypeKey === "juantong") {
+    if (selectedNode.sTypeKey === "kapai" || selectedNode.sProductType === "不干胶") {
       const getSqlDropDownData = async ({ sId }, cb) => {
         const url = `${commonConfig.server_host}business/getSelectLimit/${sId}`;
         const body = {
@@ -1432,20 +1432,34 @@ const BoxComponent = props => {
         ) {
           return false;
         }
-        if (selectedNode.sTypeKey !== "kapai" && item.sName === "sMagnification") {
+        // if (selectedNode.sTypeKey !== "kapai" && item.sName === "sMagnification") {
+        //   return false;
+        // }
+        const rateList = [
+          { id: 0, name: "不显示倍率" },
+          { id: 1, name: "每本张数" },
+          { id: 2, name: "片数" },
+        ];
+        if (Number(selectedNode.iRateType) === 0 && item.sName === "sMagnification") {
           return false;
+        } else {
+          if (item.sName === "sMagnification") {
+            item.showName = rateList.find(rate => rate.id === Number(selectedNode.iRateType))?.name || "倍率";
+          }
         }
-
+        
         return item.iTag === iTag;
       });
+      console.log(selectedNode.iRateType,'selectedNode.iRateType');
+      
     let boxConfigList = [];
     if (iTag === 20) {
       let showNameKeyList = ["dZBLB", "dSBLB", "dYBLB", "dXBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"];
-      if (selectedNode.sTypeKey === "juantong") {
+      if (selectedNode.sProductType === "不干胶") {
         showNameKeyList = ["dZBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"];
       }
       boxConfigList = boxConfig?.gdsconfigformslave?.filter(item => item.bVisible && showNameKeyList.includes(item.sName)) || [];
-      if (selectedNode.sTypeKey === "juantong") {
+      if (selectedNode.sProductType === "不干胶") {
         const mappings = {
           dZBLB: "留边",
           dXBJJ: "跳距",
@@ -1457,7 +1471,7 @@ const BoxComponent = props => {
             item.showName = mappings[item.sName];
           }
         });
-      }else {
+      } else {
         const mappings = {
           dZBLB: "左边留白",
           dXBJJ: "上下刀位",
@@ -1489,17 +1503,10 @@ const BoxComponent = props => {
 
   const filterConditions = {
     juantong: x =>
-      x.sName === "sMagnification" ||
-      x.sName === "dPartsLength" ||
-      x.sName === "dPartsWidth" ||
-      x.sName === "dRowGap" ||
-      x.sName === "dColGap" ||
-      x.sName === "sPaperDirection",
-    default: x => x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth" || x.sName === "dSumPQty",
+    x.sName === 'sMagnification' ||  x.sName === "dPartsLength" || x.sName === "dPartsWidth" || x.sName === "dRowGap" || x.sName === "dColGap" || x.sName === "sPaperDirection",
+    default: x =>x.sName === 'sMagnification' || x.sName === "dPartsLength" || x.sName === "dPartsWidth" || x.sName === "dSumPQty",
   };
-console.log(upViewProps12.viewConfigs,'upViewProps12.viewConfigs');
-
-  if (selectedNode.sTypeKey === "juantong") {
+if (selectedNode.sProductType === "不干胶") {
     upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(filterConditions.juantong);
   } else if (!(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {
     upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(filterConditions.default);
@@ -1777,7 +1784,7 @@ console.log(upViewProps12.viewConfigs,'upViewProps12.viewConfigs');
       };
       let juantongConfig = {};
 
-      if (selectedNode.sTypeKey === "juantong") {
+      if (selectedNode.sProductType === "不干胶") {
         const { dYBJJ, dXBJJ, dZBLB } = slaveData[index];
         juantongConfig = {
           dColGap: dYBJJ,
@@ -1841,7 +1848,7 @@ console.log(upViewProps12.viewConfigs,'upViewProps12.viewConfigs');
   if (
     (slaveRowData.sColumnNameConfig && masterData.dLength && masterData.dWidth && masterData.dHeight) ||
     (selectedNode.sTypeKey === "kapai" && slaveRowData.sColumnNameConfig && masterData.dLength && masterData.dWidth) ||
-    (selectedNode.sTypeKey === "juantong" && slaveRowData.sColumnNameConfig && masterData.dLength && masterData.dWidth)
+    (selectedNode.sProductType === "不干胶" && slaveRowData.sColumnNameConfig && masterData.dLength && masterData.dWidth)
   ) {
     const slaveNewData = JSON.parse(slaveRowData.sColumnNameConfig);
     const tables = [
@@ -2008,7 +2015,7 @@ console.log(upViewProps12.viewConfigs,'upViewProps12.viewConfigs');
                   <div className={styles.boxPart1}>
                     <div className={styles.boxPart1Left}>
                       <div className={styles.viewTable1}>
-                        {!(selectedNode.sTypeKey === "kapai" || selectedNode.sTypeKey === "juantong") ? <CommonViewTable {...upViewProps} /> : ""}
+                        {!(selectedNode.sTypeKey === "kapai" || selectedNode.sProductType === "不干胶") ? <CommonViewTable {...upViewProps} /> : ""}
                       </div>
                       {cailiaoyinshuaDiv}
                     </div>
--
libgit2 0.22.2