diff --git a/src/components/Common/CommonBase.js b/src/components/Common/CommonBase.js index 5eeab52..d5755aa 100644 --- a/src/components/Common/CommonBase.js +++ b/src/components/Common/CommonBase.js @@ -451,7 +451,7 @@ export default (ChildComponent) => { } const url = `${commonConfig.server_host}business/getSelectLimit/${showConfig.sId}?sModelsId=${this.state.sModelsId}&sName=${formSrcRoute}`; /* 参数 */ - const nameNew = name.includes('slaveUp') ? 'slave' : name; + const nameNew = (name.includes('slaveUp') || name.includes('slaveDown')) ? 'slave' : name; const conditonValues = this.getSqlCondition(showConfig, nameNew, record); const body = { diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index c9cf115..6459157 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -526,6 +526,8 @@ const QuickQuoteEvent = props => { }, {}), dPartsQty: masterData.dProductQty, // iPositiveColor: Number(item.sColor), + iOppositeColor: item.sBackProcessData?.find(item => item.bPrintParams)?.iPositiveColor || 0, + iOppositeSpecialColor: item.sBackProcessData?.find(item => item.bPrintParams)?.iPositiveSpecialColor || 0, sPartsName: item.sBoxModel, materialsInfo: item.materialsInfo?.filter(x => commonUtils.isNotEmptyObject(x)), processInfo: @@ -1335,23 +1337,25 @@ const BoxComponent = props => { }; const getUpViewPropsByITag = iTag => { - const config = slaveConfig.gdsconfigformslave.filter(item => { - if (item.sName === "dSumPQty" && selectedNode.sTypeKey !== "huace") { - return false; - } - const { bAdvancedSetting, bFlap, bFold } = slaveRowData; - const shouldExcludeItem = (condition, itemNameList) => !condition && itemNameList.includes(item.sName); - - if ( - shouldExcludeItem(bAdvancedSetting, ["dPortrait", "dHorizontal"]) || - shouldExcludeItem(bFlap, ["dFlap"]) || - shouldExcludeItem(bFold, ["sFold", "dAdhesive", "dFold"]) - ) { - return false; - } + const config = slaveConfig.gdsconfigformslave + .filter(item => !["sPrint", "sColor", "iPrintModePo"].includes(item.sName)) + .filter(item => { + if (item.sName === "dSumPQty" && selectedNode.sTypeKey !== "huace") { + return false; + } + const { bAdvancedSetting, bFlap, bFold } = slaveRowData; + const shouldExcludeItem = (condition, itemNameList) => !condition && itemNameList.includes(item.sName); + + if ( + shouldExcludeItem(bAdvancedSetting, ["dPortrait", "dHorizontal"]) || + shouldExcludeItem(bFlap, ["dFlap"]) || + shouldExcludeItem(bFold, ["sFold", "dAdhesive", "dFold"]) + ) { + return false; + } - return item.iTag === iTag; - }); + return item.iTag === iTag; + }); let boxConfigList = []; if (iTag === 20) { const showNameKeyList = ["dZBLB", "dSBLB", "dYBLB", "dXBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"]; @@ -1825,6 +1829,7 @@ const BoxComponent = props => { {PrintingParameters}