优化后道参数额外参数处理；

zhangzzzz
1 parent f1436b73
Showing 1 changed file with 18 additions and 21 deletions
src/components/QuickQuote/index.jsx
@@ -195,7 +195,7 @@ const QuickQuoteEvent = props =&gt; {
       const masterDataNew = { ...masterData, ...changeValue };
       masterDataNew.handleType = masterDataNew.handleType || "update";
       masterDataNew.sId = masterDataNew.sId || commonUtils.createSid();
-      
+
       if (sFieldName === "dProductQty") {
         setState(pre => ({
           ...pre,
@@ -204,15 +204,14 @@ const QuickQuoteEvent = props =&gt; {
       }
       if (sFieldName === "dLength" || sFieldName === "dWidth" || sFieldName === "dHeight") {
-        const sColumnNameConfig =  commonUtils.convertStrToObj(slaveData[iIndex].sColumnNameConfig, []).map(item => ({
+        const sColumnNameConfig = commonUtils.convertStrToObj(slaveData[iIndex].sColumnNameConfig, []).map(item => ({
           ...item,
           iColValue: item.iColValue || 6,
         }));
         slaveData[iIndex] = {
           ...slaveData[iIndex],
-          upAbleConfigsExtra:sColumnNameConfig
-        }
-
+          upAbleConfigsExtra: sColumnNameConfig,
+        };
       }
       setState(pre => ({ ...pre, masterData: masterDataNew, ...extraState }));
     } else if (name.includes("slave")) {
@@ -257,15 +256,16 @@ const QuickQuoteEvent = props =&gt; {
           extraState.backendParamsConfig = sParamConfig;
           extraState.backendConfig = { sParentFieldsName: sFieldName, sBoxModel: boxModel };
           const sBackendParams = sParamConfig
-            .map((item, index) => {
-              const { sParamDefault, sParam } = item;
+            .map(item => {
+              const { sParamDefault, sParam, sFieldName, iOrder } = item;
               return !sParamDefault
                 ? ""
                 : {
                     sId: commonUtils.createSid(),
                     value: sParamDefault,
                     sParam: sParam,
-                    [`sParam${index + 1}`]: sParamDefault,
+                    [`sParam${iOrder}`]: sParamDefault,
+                    ...(sFieldName ? { [sFieldName]: sParamDefault } : {}),
                   };
             })
             .filter(item => item !== "");
@@ -369,13 +369,13 @@ const QuickQuoteEvent = props =&gt; {
           dFlap: "",
         };
       }
-      const {upAbleConfigsExtra} = slaveData[saveIndex] || {};
-     
+      const { upAbleConfigsExtra = [] } = slaveData[saveIndex] || {};
+
       upAbleConfigsExtra.forEach(item => {
         if (item.sName === sFieldName) {
-          item.sAssignFormula  = null
+          item.sAssignFormula = null;
         }
-      })
+      });
       setState(pre => ({ ...pre, slaveData, ...extraState }));
     } else if (name === "finished") {
@@ -1189,17 +1189,16 @@ const TreeComponent = props =&gt; {
     };
     if (selectedNode.sProductType === "不干胶") {
       props.onSaveState({
-        masterData: { ...props.masterData, sFormId: "101251240115016002356125200",sOldFormId:props.masterData.sFormId  },
+        masterData: { ...props.masterData, sFormId: "101251240115016002356125200", sOldFormId: props.masterData.sFormId },
       });
     } else {
       props.onSaveState({
-        masterData: { ...props.masterData, sFormId:props.masterData.sOldFormId || props.masterData.sFormId  },
+        masterData: { ...props.masterData, sFormId: props.masterData.sOldFormId || props.masterData.sFormId },
       });
     }
-    
+
     getDropDownData(props);
   }, [selectedNode.sId, commonUtils.isEmptyObject(slaveConfig)]);
-    console.log(props.masterData,'pppppp',selectedNode.sProductType);
   return (
     <Tree
@@ -1461,7 +1460,6 @@ const BoxComponent = props =&gt; {
   }));
   const showUpAbleConfigsExtra = upAbleConfigsExtra.filter(x => x.bVisible === 1);
-  console.log("🚀 ~ showUpAbleConfigsExtra:", showUpAbleConfigsExtra);
   const upAbleConfigs = [
     ...slaveConfig.gdsconfigformslave.filter(item => item.iTag === 10).filter(item => (bBox ? true : item.sName !== "sName")),
     ...showUpAbleConfigsExtra,
@@ -1474,7 +1472,6 @@ const BoxComponent = props =&gt; {
     viewRow: slaveRowData,
     tableName: `slaveUp${boxModel}`,
   };
-  console.log("🚀 ~ upViewProps:", props.state);
   const getUpViewPropsByITag = iTag => {
     const config = slaveConfig.gdsconfigformslave
@@ -2891,10 +2888,10 @@ const BackendParamsExtraComponent = props =&gt; {
   const slaveRowData = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === sBoxModel) || {};
   const { sBackProcessData = [] } = slaveRowData;
-  const viewConfigs = backendParamsConfig.map((item, index) => ({
+  const viewConfigs = backendParamsConfig.map(item => ({
     ...item,
-    sName0: `sParam${index + 1}`,
-    sName: item.sFieldName || `sParam${index + 1}`,
+    sName0: `sParam${item.iOrder}`,
+    sName: item.sFieldName || `sParam${item.iOrder}`,
     showName: item.sParam,
     sDropDownType: item.sParamDropDown ? "sql" : "",
     iColValue: 4,