From 6646c6bd2d30e2de6938142bc75da9d53774e48d Mon Sep 17 00:00:00 2001 From: 陈鑫涛 <10125295+chen-xintao97@user.noreply.gitee.com> Date: Fri, 4 Jul 2025 11:42:40 +0800 Subject: [PATCH] 重新打开后卡牌不展示的问题 --- src/components/Common/Typesetting/typesetting.js | 36 +++++++++++++++++++----------------- src/components/QuickQuote/index.jsx | 48 +++++++++++++++++++++++++++++++++++++----------- 2 files changed, 56 insertions(+), 28 deletions(-) diff --git a/src/components/Common/Typesetting/typesetting.js b/src/components/Common/Typesetting/typesetting.js index ed3259c..356b886 100644 --- a/src/components/Common/Typesetting/typesetting.js +++ b/src/components/Common/Typesetting/typesetting.js @@ -1,12 +1,18 @@ /* eslint-disable */ -import React, { useEffect, useState, useRef } from "react"; -import { Modal, message } from "antd-v4"; -import { VerticalRightOutlined, VerticalLeftOutlined, LeftOutlined, RightOutlined, UpOutlined, DownOutlined } from "@ant-design/icons"; -import * as commonUtils from "@/utils/utils"; /* 通用方法 */ -import commonConfig from "@/utils/config"; -import styles from "./index.less"; -import DynamicSVG from "../../Common/BoxDesignCompontent/svg"; -import * as commonFunc from "@/components/Common/commonFunc"; +import * as commonFunc from '@/components/Common/commonFunc'; +import { + DownOutlined, + LeftOutlined, + RightOutlined, + UpOutlined, + VerticalLeftOutlined, + VerticalRightOutlined, +} from '@ant-design/icons'; +import { message, Modal } from 'antd-v4'; +import React, { useEffect, useRef, useState } from 'react'; + +import DynamicSVG from '../../Common/BoxDesignCompontent/svg'; +import styles from './index.less'; const Typesetting = props => { const { @@ -41,6 +47,7 @@ const Typesetting = props => { } = slaveRowData; const { masterData, selectedNode, slaveData } = state; + if (!masterData) return // 如果是卷筒类 那么上下左右留白等于左留白 if (selectedNode && selectedNode.sTypeKey === "juantong") { dSBLB = dZBLB; @@ -564,10 +571,9 @@ const Typesetting = props => { onSaveDPartsLength(innerWidth, innerHeight, slaveData); } const propsData = innerDivs[innerDivs.length - 1]; - let openEdition = 0; if (propsData && L) { - console.log(111111); + const {dWlcd,sBillNo} = slaveRowData const sMaterialsName = slaveData.find(x => x.sTreeNodeName === selectedNode.showName && x.sBoxModel === props.boxModel).sMaterialsName; const propsDataLeft = Number(propsData.props.style.left.slice(0, -2)); @@ -612,10 +618,9 @@ const Typesetting = props => { newMaterialWidth !== materialWidth || materialName !== sMaterialsName || newDHorizontalType !== dHorizontalType || - newDPortraitType !== dPortraitType + newDPortraitType !== dPortraitType || + (!dWlcd && sBillNo) ) { - console.log(222222); - setMaterialLength(newMaterialLength); setMaterialWidth(newMaterialWidth); setMaterialName(sMaterialsName); @@ -666,10 +671,7 @@ const Typesetting = props => { dHorizontalType, dPortraitType ); - } else if (selectedNode.sTypeKey === 'kapai') { - console.log(111111111); - - } + } openEdition = (((newMaterialLength * newMaterialWidth) / (maxWidth * maxHeight)) * 100).toFixed(2); setTimeout(() => { diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index 745cea8..a6abb15 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -1142,7 +1142,7 @@ const QuickQuoteEvent = props => { // 入口 const QuickQuote = baseProps => { const props = QuickQuoteEvent(baseProps); - console.log("🚀 ~ QuickQuote:", props) + console.log("🚀 ~ QuickQuote:", props); const [treeClassName, setTreeClassName] = useState(""); // 监听页面滚动事件 @@ -1320,14 +1320,21 @@ const TreeComponent = props => { }; }); }; - if (selectedNode.sTypeKey === "juantong") { - props.onSaveState({ - masterData: { ...props.masterData, sFormId: "101251240115016002356125200", sOldFormId: props.masterData.sFormId }, - }); - } else { - props.onSaveState({ - masterData: { ...props.masterData, sFormId: props.masterData.sOldFormId || props.masterData.sFormId }, - }); + const { masterData } = props; + if (masterData.sFormId !== "101251240115016002356125200") { + localStorage.setItem("quickMasterFormId", masterData.sFormId); + } + const quickMasterFormId = localStorage.getItem("quickMasterFormId"); + if (quickMasterFormId) { + if (selectedNode.sTypeKey === "juantong") { + props.onSaveState({ + masterData: { ...props.masterData, sFormId: "101251240115016002356125200" }, + }); + } else { + props.onSaveState({ + masterData: { ...props.masterData, sFormId: quickMasterFormId }, + }); + } } getDropDownData(props); }, [selectedNode.sId, commonUtils.isEmptyObject(slaveConfig)]); @@ -1480,13 +1487,14 @@ const MasterComponent = props => { if (!masterConfig) return ""; const ableConfigs = masterConfig.gdsconfigformslave.filter(item => item.sName && item.bVisible); + const JosnAbleConfigs = JSON.parse(JSON.stringify(ableConfigs)); // 处理长宽样式 // selectedNode?.bBox && selectedNode.sTypeKey !== "kapai" && selectedNode?.bBox && selectedNode.sProductType !== "不干胶" // ? ableConfigs // : ableConfigs.filter(x => x.sName !== "dHeight"); const { sStripType = 0 } = selectedNode; // {"0":"长宽高","1":"高宽"} ，0显示长宽高，1显示宽高 - const viewConfigs = Number(sStripType) === 0 ? ableConfigs : ableConfigs.filter(x => x.sName !== "dHeight"); + const viewConfigs = Number(sStripType) === 0 ? JosnAbleConfigs : JosnAbleConfigs.filter(x => x.sName !== "dHeight"); if (Number(sStripType) === 0) { viewConfigs.forEach(item => { if (item.sName === "dLength" || item.sName === "dWidth") { @@ -1552,6 +1560,10 @@ const BoxComponent = props => { const { bBox } = selectedNode; const [boxTypeList, setBoxTypeList] = useState([]); + // 卡牌类卷筒类默认使用矩形 当是核价保存过的需要在主表数据加载完后在赋值 + console.log(props, "asdadasd"); + const slaveRowData = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel) || {}; + const { sBillNo } = slaveRowData; useEffect(() => { if (selectedNode.sTypeKey === "kapai" || selectedNode.sTypeKey === "juantong") { let dropDownData = []; @@ -1564,7 +1576,21 @@ const BoxComponent = props => { } }, [boxModel]); - const slaveRowData = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel) || {}; + // useEffect(() => { + // if (sBillNo) { + // setTimeout(() => { + // if (selectedNode.sTypeKey === "kapai" || selectedNode.sTypeKey === "juantong") { + // let dropDownData = []; + // dropDownData.push(KapaiJson); + // const boxData = (dropDownData || []).map((item, index) => ({ + // ...item, + // iOrder: index + 1, + // })); + // props.onDataChange("slaveUp" + boxModel, "sName", { sName: KapaiJson.sName }, KapaiJson.sId, boxData); + // } + // }, 500); + // } + // }, [masterData.dLength]); const { upAbleConfigsExtra = [], calcMethodData = [], boxPicData = [], radioValue = calcMethodData[0]?.sCode } = slaveRowData; const calcMethod = calcMethodData.map(item => ({ value: item.sCode, -- libgit2 0.22.2