卷筒类

陈鑫涛
1 parent 3534bd0d
Showing 3 changed files with 21 additions and 12 deletions
src/components/Common/Typesetting/typesetting.js
src/components/QuickQuote/index.jsx
src/mobile/quotation/detailNew.jsx
@@ -223,7 +223,6 @@ const evaluateFormula = (formula, variables) =&gt; {
   const innerWidthCombined = isVertical
     ? Math.max(jInnerWidth + dFLengthOffset, jInnerWidth + dSLengthOffset) + dYBJJ
     : jInnerWidth * 2 + dSLengthOffset + dFLengthOffset + dYBJJ;
-console.log('总高',innerHeightCombined,'总款',innerWidthCombined);
  
   const style = {
     width: `${outerWidth}px`,
@@ -1216,7 +1216,7 @@ const TreeComponent = props =&gt; {
         };
       });
     };
-    if (selectedNode.sProductType === "不干胶") {
+    if (selectedNode.sTypeKey === "juantong") {
       props.onSaveState({
         masterData: { ...props.masterData, sFormId: "101251240115016002356125200", sOldFormId: props.masterData.sFormId },
       });
@@ -1450,7 +1450,7 @@ const BoxComponent = props =&gt; {
   const [boxTypeList, setBoxTypeList] = useState([]);
   const [boxData, setBoxData] = useState([]);
   useEffect(() => {
-    if (selectedNode.sTypeKey === "kapai" || selectedNode.sProductType === "不干胶") {
+    if (selectedNode.sTypeKey === "kapai" || selectedNode.sTypeKey === "juantong") {
       const getSqlDropDownData = async ({ sId }, cb) => {
         const url = `${commonConfig.server_host}business/getSelectLimit/${sId}`;
         const body = {
@@ -1464,10 +1464,10 @@ const BoxComponent = props =&gt; {
       };
  
       getSqlDropDownData({ sId: "17428091410008594700322758474000" }, dropDownData => {
-        const boxTypeList = Array.from(new Set(dropDownData?.map(item => item.sBoxType || "其它")));
+        const boxTypeList = Array.from(new Set((dropDownData || []).map(item => item.sBoxType || "其它")));
         setBoxTypeList(boxTypeList);
         setBoxData(
-          dropDownData.map((item, index) => ({
+          (dropDownData || []).map((item, index) => ({
             ...item,
             iOrder: index + 1,
           }))
@@ -1501,6 +1501,7 @@ const BoxComponent = props =&gt; {
     viewRow: slaveRowData,
     tableName: `slaveUp${boxModel}`,
   };
+console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 12}),'slaveConfig.gdsconfigformslave');
  
   const getUpViewPropsByITag = iTag => {
     const config = slaveConfig.gdsconfigformslave
@@ -1550,14 +1551,14 @@ const BoxComponent = props =&gt; {
     let boxConfigList = [];
     if (iTag === 20) {
       let showNameKeyList = ["dZBLB", "dSBLB", "dYBLB", "dXBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"];
-      if (selectedNode.sProductType === "不干胶") {
+      if (selectedNode.sTypeKey === "juantong") {
         showNameKeyList = ["dZBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"];
       }
       const UlToolPosition = commonFunc.showLocalMessage(props, "UlToolPosition", "上下刀位");
       const RLToolPosition = commonFunc.showLocalMessage(props, "RLToolPosition", "左右刀位");
       const LeftMargin = commonFunc.showLocalMessage(props, "LeftMargin", "左右刀位");
       boxConfigList = boxConfig?.gdsconfigformslave?.filter(item => item.bVisible && showNameKeyList.includes(item.sName)) || [];
-      if (selectedNode.sProductType === "不干胶") {
+      if (selectedNode.sTypeKey === "juantong") {
         const mappings = {
           dZBLB: "留边",
           dXBJJ: "跳距",
@@ -1584,6 +1585,8 @@ const BoxComponent = props =&gt; {
       }
     }
     const newConfig = [...boxConfigList, ...config];
+    console.log(newConfig,'newConfig');
+    
     return {
       ...props,
       viewConfigs: newConfig,
@@ -1598,6 +1601,7 @@ const BoxComponent = props =&gt; {
   // const upViewProps11 = getUpViewPropsByITag(11);
   // 印刷参数表单
   let upViewProps12 = getUpViewPropsByITag(12);
+  console.log("🚀 ~ upViewProps12:", upViewProps12)
  
   const filterConditions = {
     juantong: x =>
@@ -1609,9 +1613,9 @@ const BoxComponent = props =&gt; {
       x.sName === "dBleed" ||
       x.sName === "sPaperDirection",
     default: x =>
-      x.sName === "dBleed" || x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth" || x.sName === "dSumPQty",
+      x.sName === "sPaperDirection"|| x.sName === "dBleed" || x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth" || x.sName === "dSumPQty",
   };
-  if (selectedNode.sProductType === "不干胶") {
+  if (selectedNode.sTypeKey === "juantong") {
     upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(filterConditions.juantong);
   }
   if (!(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {
@@ -1891,7 +1895,7 @@ const BoxComponent = props =&gt; {
       };
       let juantongConfig = {};
  
-      if (selectedNode.sProductType === "不干胶") {
+      if (selectedNode.sTypeKey === "juantong") {
         const { dYBJJ, dXBJJ, dZBLB } = slaveData[index];
         juantongConfig = {
           dColGap: dYBJJ,
@@ -2132,7 +2136,7 @@ const BoxComponent = props =&gt; {
                   <div className={styles.boxPart1}>
                     <div className={styles.boxPart1Left}>
                       <div className={styles.viewTable1}>
-                        {!(selectedNode.sTypeKey === "kapai" || selectedNode.sProductType === "不干胶") ? <CommonViewTable {...upViewProps} /> : ""}
+                        {!(selectedNode.sTypeKey === "kapai" || selectedNode.sTypeKey === "juantong") ? <CommonViewTable {...upViewProps} /> : ""}
                       </div>
                       {cailiaoyinshuaDiv}
                     </div>
@@ -2313,7 +2313,13 @@ const PrintParamsComponent = props =&gt; {
       };
     });
     console.log("🚀 ~ printParamsConfig:", printParamsConfig)
-
+// printParamsConfig.forEach(item=>{
+//   const showDropDown = commonUtils.isNotEmptyArr(item.dropDownData)
+//           ? this.props.showConfig.dropDownData
+//           : typeof this.props.showConfig.showDropDown === "object"
+//           ? this.props.showConfig.showDropDown
+//           : commonUtils.objectToArr(commonUtils.convertStrToObj(this.props.showConfig.showDropDown));
+// })
   const result = [];
   for (let i = 0; i < printParams.length + 1; i++) {
     const printParamsItem = printParams[i - 1];