Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

陈鑫涛
2 parents 1cd17970 f22cad38
Showing 1 changed file with 17 additions and 4 deletions
src/components/QuickQuote/index.jsx
@@ -1185,6 +1185,19 @@ const QuickQuoteEvent = props =&gt; {
         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 =&gt; {
           switcherIcon={<FolderFilled style={{ color: "#f7cc4f", fontSize: 20 }} />}
         ></Tree.TreeNode>
       )),
-    [boxTypeList.length]
+    [boxTypeList.length, boxData.length]
   );
   const getSvgProps = svg => {
     if (!svg) return;
@@ -3222,8 +3235,8 @@ const BoxModelSelectedModal = props =&gt; {
   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 =&gt; {
       if (dropDownData?.length) {
         return {
           dropDownData: dropDownData.map(item => ({
-            sId: commonUtils.createSid(),
+            sId: item,
             value: item,
             sParam: showConfig.sParam,
             [sName]: item,