diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index 948b6cf..1f3d260 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -1185,6 +1185,19 @@ const QuickQuoteEvent = props => { addState.slaveSelectedRowKeys = [slaveData[0].sId]; } + const { sPrintConfig = {}, downAbleConfigs = [], finishedConfigs = [] } = state; + const processConfigs = [sPrintConfig, ...downAbleConfigs, ...finishedConfigs]; + + const configOrderMap = {}; + processConfigs.forEach((config, index) => { + configOrderMap[config.sId] = index; + }); + + processData.sort((a, b) => { + return configOrderMap[a.sProcessClassifyId] - configOrderMap[b.sProcessClassifyId]; + }); + processData = processData.map((item, index) => ({ ...item, iOrder: index + 1 })); + const newState = { materialsConfig, masterData: { ...masterData1, ...masterData }, @@ -3154,7 +3167,7 @@ const BoxModelSelectedModal = props => { switcherIcon={} > )), - [boxTypeList.length] + [boxTypeList.length, boxData.length] ); const getSvgProps = svg => { if (!svg) return; @@ -3222,8 +3235,8 @@ const BoxModelSelectedModal = props => { const noImage = commonFunc.showLocalMessage(props, "ImpositionInformation", "暂无图片"); let btnSelectTitle = commonFunc.showLocalMessage(props, "BtnSelect", "选择"); const sLanguage = props.app?.userinfo?.sLanguage; - if(sLanguage === 'sEnglish') { - btnSelectTitle = 'BtnSelect'; + if (sLanguage === "sEnglish") { + btnSelectTitle = "BtnSelect"; } const tableProps = { ...commonBusiness.getTableTypes("box", { @@ -3373,7 +3386,7 @@ const BackendParamsExtraComponent = props => { if (dropDownData?.length) { return { dropDownData: dropDownData.map(item => ({ - sId: commonUtils.createSid(), + sId: item, value: item, sParam: showConfig.sParam, [sName]: item,