diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index 238015d..7b56e26 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -274,7 +274,7 @@ const QuickQuoteEvent = props => { dProductQty: changeValue.dProductQty, })); } - + if (sFieldName === "dLength" || sFieldName === "dWidth" || sFieldName === "dHeight") { if (props.currentBoxModel) { const boxModel = props.currentBoxModel.replace("slaveUp", "").replace("slaveDown", ""); @@ -1146,7 +1146,6 @@ const QuickQuoteEvent = props => { // 入口 const QuickQuote = baseProps => { const props = QuickQuoteEvent(baseProps); - console.log("🚀 ~ QuickQuote:", props); const [treeClassName, setTreeClassName] = useState(""); // 监听页面滚动事件 @@ -1306,6 +1305,7 @@ const TreeComponent = props => { return { ...pre, ...addState, + sPrintConfig: downAbleConfigs.find(item => item.sType === "1" && item.sName === "胶印"), downAbleConfigs: downAbleConfigs .filter(item => item.sType === "2") .map((item, index) => ({ @@ -1501,7 +1501,7 @@ const MasterComponent = props => { item.iColValue = 4; } }); - } + } const lengthData = viewConfigs.find(x => x.sName === "dLength"); if (selectedNode && selectedNode.sTypeKey && selectedNode.sTypeKey !== "danye") { @@ -1557,13 +1557,12 @@ 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") { - const {sBillNo} = slaveRowData - if(sBillNo) return + const { sBillNo } = slaveRowData; + if (sBillNo) return; let dropDownData = []; dropDownData.push(KapaiJson); const boxData = (dropDownData || []).map((item, index) => ({ @@ -2403,14 +2402,19 @@ const PrintParamsComponent = props => { const printParamsItem = printParams[i - 1]; const viewRow = { ...(i === 0 ? slaveRowData : printParamsItem), sProductClassifyId: selectedNode.sId }; + const viewTableId = "viewTableId_" + viewRow.sId; const viewProps = { ...props, - viewConfigs: printParamsConfig, + viewConfigs: printParamsConfig.map(item => ({ ...item, costomStyle: `xlyPrintParams${i}` })), tableConfig: { ...slaveConfig, gdsconfigformslave: printParamsConfig }, iColValueView: 24, viewRow, tableName: `${i === 0 ? "slaveUp" : "slaveDown"}${boxModel}`, onDataChange: (...args) => { + setTimeout(() => { + const oLabel = document.querySelector(`#${viewTableId}`)?.querySelector(`.xlyPrintParams${i}`)?.querySelector(".ant-form-item-label"); + oLabel?.click(); + }, 200); if (i === 0) { props.onDataChange(...args); return; @@ -2423,11 +2427,37 @@ const PrintParamsComponent = props => { return { ...pre, slaveData }; }); }, + onCostomClick: (showConfig, { target }) => { + if (showConfig.sName !== "sPrint") return; + const className = target.getAttribute("class"); + const nodeName = target.nodeName; + if (className?.includes("select") && nodeName === "DIV") return; + + const { sPrintConfig } = state; + + if (!sPrintConfig) return; + const backendConfigNew = { + sParentFieldsName: "sPrint", + sBoxModel: boxModel, + printParamsId: viewRow.sId, + }; + + const dropDownData = commonUtils.convertStrToObj(sPrintConfig.sChineseDropDown, []); + const dropDownDataSelected = dropDownData.find(item => item.sId === viewRow.sProcessId); + if (!dropDownDataSelected) return; + const backendParamsConfigNew = commonUtils.convertStrToObj(dropDownDataSelected.sParamConfig, []); + + props.setState(pre => ({ + ...pre, + backendParamsConfig: backendParamsConfigNew, + backendConfig: backendConfigNew, + })); + }, }; result.push(