diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index efa62cd..0e8982e 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -1396,7 +1396,7 @@ const MasterComponent = props => { }); } const lengthData = viewConfigs.find(x => x.sName === "dLength"); - + if (selectedNode && selectedNode.sTypeKey && selectedNode.sTypeKey !== "danye") { if (lengthData) { lengthData.showName = "้ซ(D)"; @@ -1458,9 +1458,13 @@ const BoxComponent = props => { sKeyUpFilterName: "", pageNum: 1, pageSize: 1000, + sSqlCondition: { + sProductClassifyId: selectedNode.sId, + }, }; const retrunData = await commonServices.postValueService(props.app.token, body, url); const dropDownData = retrunData.data?.dataset?.rows; + console.log("๐ ~ getSqlDropDownData ~ dropDownData:", dropDownData) cb(dropDownData); }; @@ -1502,7 +1506,12 @@ const BoxComponent = props => { viewRow: slaveRowData, tableName: `slaveUp${boxModel}`, }; -console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 12}),'slaveConfig.gdsconfigformslave'); + console.log( + slaveConfig.gdsconfigformslave.filter(item => { + return item.iTag === 12; + }), + "slaveConfig.gdsconfigformslave" + ); const getUpViewPropsByITag = iTag => { const config = slaveConfig.gdsconfigformslave @@ -1546,6 +1555,9 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1 if (!selectedNode.bBleed && item.sName === "dBleed") { return false; } + if (selectedNode.sTypeKey !== "juantong" && item.sName === "sPaperDirection") { + return false; + } return item.iTag === iTag; }); @@ -1586,8 +1598,8 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1 } } const newConfig = [...boxConfigList, ...config]; - console.log(newConfig,'newConfig'); - + console.log(newConfig, "newConfig"); + return { ...props, viewConfigs: newConfig, @@ -1602,7 +1614,7 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1 // const upViewProps11 = getUpViewPropsByITag(11); // ๅฐๅทๅๆฐ่กจๅ let upViewProps12 = getUpViewPropsByITag(12); - console.log("๐ ~ upViewProps12:", upViewProps12) + console.log("๐ ~ upViewProps12:", upViewProps12); const filterConditions = { juantong: x => @@ -1614,7 +1626,12 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1 x.sName === "dBleed" || x.sName === "sPaperDirection", default: x => - x.sName === "sPaperDirection"|| 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.sTypeKey === "juantong") { upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(filterConditions.juantong); @@ -2146,25 +2163,25 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1