diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index b5fc630..25a1f4b 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)?.iOppositeColor || 0, + iOppositeSpecialColor: item.sBackProcessData?.find(item => item.bPrintParams)?.iOppositeSpecialColor || 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}
+
{/* @@ -1977,6 +1982,92 @@ const BoxComponent = props => { ); }; +// 印刷参数组件(印刷、颜色、单双面) +const PrintParamsComponent = props => { + const { state, setState, boxModel } = props; + const { slaveConfig, slaveData, selectedNode } = state; + + const slaveRowData = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel) || {}; + const slaveRowDataIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId); + const { sBackProcessData = [] } = slaveRowData; + const printParams = sBackProcessData.filter(item => item.bPrintParams); + + const printParamsConfig = slaveConfig.gdsconfigformslave + .filter(item => ["sPrint", "sColor", "iPrintModePo"].includes(item.sName)) + .map(item => { + return { + ...item, + iColValue: 8, + }; + }); + + const result = []; + for (let i = 0; i < printParams.length + 1; i++) { + const printParamsItem = printParams[i - 1]; + const viewRow = { ...(i === 0 ? slaveRowData : printParamsItem), sProductClassifyId: selectedNode.sId }; + + const viewProps = { + ...props, + viewConfigs: printParamsConfig, + tableConfig: { ...slaveConfig, gdsconfigformslave: printParamsConfig }, + iColValueView: 24, + viewRow, + tableName: `${i === 0 ? "slaveUp" : "slaveDown"}${boxModel}`, + onDataChange: (...args) => { + if (i === 0) { + props.onDataChange(...args); + return; + } + + const iIndex = sBackProcessData.findIndex(item => item.sId === printParamsItem.sId); + sBackProcessData[iIndex] = { ...sBackProcessData[iIndex], ...args[2] }; + slaveData[slaveRowDataIndex] = { ...slaveRowData, sBackProcessData }; + setState(pre => { + return { ...pre, slaveData }; + }); + }, + }; + + result.push( +
+
+ +
+
+
+
+ ); + } + return result; +}; + // 材料组件 const MaterialsComponent = props => { const { state, slaveRowData, boxModel } = props;