From 5095d5fd03dddabad55b0a51bd8782785587cc05 Mon Sep 17 00:00:00 2001
From: 陈鑫涛 <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Tue, 24 Jun 2025 14:01:15 +0800
Subject: [PATCH] 特殊盒型核价后赋值计算的材料长宽

---
 src/components/QuickQuote/index.jsx   | 10 ++++++++++
 src/mobile/components/SelectInput.jsx |  4 +++-
 src/mobile/quotation/detailNew.jsx    | 58 ++++++++++++++++++++++++----------------------------------
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx
index 4ba4625..75674da 100644
--- a/src/components/QuickQuote/index.jsx
+++ b/src/components/QuickQuote/index.jsx
@@ -546,8 +546,10 @@ const QuickQuoteEvent = props => {
     const dataReturn = (await commonServices.postValueService(token, paramMap, url)).data;
 
     if (dataReturn.code === 1) {
+
       const { slaveConfig, masterData: masterData1, materialsConfig, processConfig, sModelsId, app } = props;
       const { productClassify, partsNewInfo = [], productProcessInfo, partsInfo: partsOldInfo } = dataReturn.dataset.rows[0];
+      const { bCalculatingArea } = selectedNode;
 
       const slaveData = [];
       const controlData = [];
@@ -612,6 +614,12 @@ const QuickQuoteEvent = props => {
         slaveRowData.dMachineQty = item.dMachineQty;
         slaveRowData.dAuxiliaryQty = item.materialsInfo?.[0]?.dAuxiliaryQty;
         slaveRowData.sPrint = item.sProcessName;
+        if (bCalculatingArea) {
+      // todo 核价成功后 判断bSpecialRules 为false 就要给材料长材料款赋值
+          // partsNewInfo
+          slaveRowData.dWlcd = item.dMaterialsLength
+          slaveRowData.dWlkd = item.dMaterialsWidth
+        }
         setState(pre => ({ ...pre, slaveData: stateSlaveData }));
       });
 
@@ -2595,6 +2603,7 @@ const BackendParamsExtraComponent = props => {
   const { state, slaveConfig, boxModel } = props;
   const { backendParamsConfig = [], backendConfig = {}, slaveData, selectedNode } = state;
   if (!backendParamsConfig.length) return "";
+  console.log(backendParamsConfig, "backendParamsConfig");
 
   const { sParentFieldsName, sBoxModel } = backendConfig;
 
@@ -2677,6 +2686,7 @@ const BackendParamsExtraComponent = props => {
       props.setState(pre => ({ ...pre, slaveData }));
     },
   };
+  console.log(viewProps, "viewProps");
 
   return (
     <>
diff --git a/src/mobile/components/SelectInput.jsx b/src/mobile/components/SelectInput.jsx
index c3bd6b0..e7ef8bc 100644
--- a/src/mobile/components/SelectInput.jsx
+++ b/src/mobile/components/SelectInput.jsx
@@ -32,7 +32,9 @@ const SelectInput = props => {
       // const data = viewRow.sBackProcessData[downIndex][itemDetail.sName];
       // setValue(data);
     } else if (tableName.includes('sBackendParams')) {
-      setValue(itemDetail.sParamDefault)
+      const data = props.sBackProcessData.find(item => item[props.sParentFieldsName]).sBackendParams.find(item => item.sParam === itemDetail.sParam)
+      const values = data.label ? data.label : data.value
+      setValue(values || '')
     } else {
       setValue(viewRowNew || ""); // 动态更新 value
     }
diff --git a/src/mobile/quotation/detailNew.jsx b/src/mobile/quotation/detailNew.jsx
index 4c9edb9..9eecf77 100644
--- a/src/mobile/quotation/detailNew.jsx
+++ b/src/mobile/quotation/detailNew.jsx
@@ -142,7 +142,6 @@ const QuickQuoteEvent = props => {
   };
 
   addState.onDataChange = (name, sFieldName, changeValue, sId, dropDownData, isWait) => {
-    console.log("🚀 ~ changeValue:", name, changeValue);
     const { mastersId } = props;
     const { masterData = {}, slaveData = [], selectedNode = {} } = state;
     const extraState = {
@@ -1828,23 +1827,23 @@ const BoxComponent = props => {
     // const className = target.getAttribute("class");
     // const nodeName = target.nodeName;
     // if (className?.includes("select") && nodeName === "DIV") return;
-    if (!sBackProcessData) return;
-    const detail = sBackProcessData.find(item => item[showConfig.sName0 || showConfig.sName]);
-    let data = commonUtils.convertStrToObj(detail?.sParamConfig, []);
-    if (detail) {
-      // 确保 detail.sBackendParams 是一个数组
-      detail.sBackendParams = Array.isArray(detail.sBackendParams) ? detail.sBackendParams : [];
-      // 过滤掉 undefined 或 null 值
-      detail.sBackendParams = detail.sBackendParams.filter(param => param !== undefined && param !== null);
-
-      data.forEach((x, i) => {
-        const backendParam = detail.sBackendParams[i] || {}; // 如果是 undefined，则使用空对象
-        x.sParamDefault = x.sFieldName !== "" ? backendParam[x.sFieldName] : backendParam.label || x.sParamDefault;
-      });
-    }
+    // if (!sBackProcessData) return;
+    // const detail = sBackProcessData.find(item => item[showConfig.sName0 || showConfig.sName]);
+    // let data = commonUtils.convertStrToObj(detail?.sParamConfig, []);
+    // if (detail) {
+    //   // 确保 detail.sBackendParams 是一个数组
+    //   detail.sBackendParams = Array.isArray(detail.sBackendParams) ? detail.sBackendParams : [];
+    //   // 过滤掉 undefined 或 null 值
+    //   detail.sBackendParams = detail.sBackendParams.filter(param => param !== undefined && param !== null);
+
+    //   data.forEach((x, i) => {
+    //     const backendParam = detail.sBackendParams[i] || {}; // 如果是 undefined，则使用空对象
+    //     x.sParamDefault = x.sFieldName !== "" ? backendParam[x.sFieldName] : backendParam.label || x.sParamDefault;
+    //   });
+    // }
     props.setState(pre => ({
       ...pre,
-      backendParamsConfig: detail ? data : [],
+      backendParamsConfig: commonUtils.convertStrToObj(sBackProcessData.find(item => item[showConfig.sName0 || showConfig.sName])?.sParamConfig, []),
       backendConfig: { sParentFieldsName: showConfig.sName, sBoxModel: boxModel },
     }));
   };
@@ -2101,7 +2100,7 @@ const BoxComponent = props => {
             ))
           : ""}
       </div>
-      <BackendParamsExtraComponent {...props} />
+      <BackendParamsExtraComponent {...props} onCostomClick={onCostomClick} />
       <div>
         <div className={styles.projectBtn}>
           <div className={styles.boxTitle} style={{ marginTop: "2rem" }}>
@@ -2477,7 +2476,7 @@ const BackendParamsExtraComponent = props => {
   const { state, slaveConfig, boxModel } = props;
   const { backendParamsConfig = [], backendConfig = {}, slaveData, selectedNode } = state;
   const { sParentFieldsName, sBoxModel } = backendConfig;
-
+  if (!backendParamsConfig.length) return "";
   // 使用 useMemo 缓存计算结果
   const slaveRowData = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === sBoxModel) || {};
 
@@ -2502,6 +2501,8 @@ const BackendParamsExtraComponent = props => {
     })),
     tableConfig: { ...slaveConfig, gdsconfigformslave: viewConfigs },
     iColValueView: 24,
+    sBackProcessData,
+    sParentFieldsName,
     getViewRow: config => {
       return sBackProcessData.find(item => item[sParentFieldsName])?.sBackendParams?.find(item => item.sParam === config.showName) || {};
     },
@@ -2560,21 +2561,10 @@ const BackendParamsExtraComponent = props => {
           slaveData[iIndex].sBackProcessData[iIndex1].dManualValue = dManualLength * dManualWidth;
         }
       }
-      // const detail = sBackProcessData.find(item => item[showConfig.sName0 || showConfig.sName]);
-      // let data = commonUtils.convertStrToObj(detail?.sParamConfig, []);
-      // if (detail) {
-      //   // 确保 detail.sBackendParams 是一个数组
-      //   detail.sBackendParams = Array.isArray(detail.sBackendParams) ? detail.sBackendParams : [];
-      //   // 过滤掉 undefined 或 null 值
-      //   detail.sBackendParams = detail.sBackendParams.filter(param => param !== undefined && param !== null);
-
-      //   data.forEach((x, i) => {
-      //     const backendParam = detail.sBackendParams[i] || {}; // 如果是 undefined，则使用空对象
-      //     x.sParamDefault = x.sFieldName !== "" ? backendParam[x.sFieldName] : backendParam.label || x.sParamDefault;
-      //   });
-      // }
-      // (backendParamsConfig = detail ? data : []),
-       props.setState(pre => ({ ...pre, slaveData, ...extraState }));
+      
+      const itemDetail = viewProps.viewConfigs.find(x => x.sName === sFieldName);
+      props.setState(pre => ({ ...pre, slaveData }));
+      // props.onCostomClick(itemDetail);
     },
   };
 
@@ -2591,7 +2581,7 @@ const BackendParamsExtraComponent = props => {
             <Grid.Item>
               <div className={styles.customer} key={x.id || x.showName}>
                 <div>{x.showName}</div>
-                <SelectInput {...viewProps} itemDetail={x} getSqlDropDownData={viewProps.getSqlDropDownData} onDataChange={viewProps.onDataChange} />
+                <SelectInput {...viewProps} itemDetail={x} getSqlDropDownData={viewProps.getSqlDropDownData} onDataChange={viewProps.onDataChange} onCostomClick={null}/>
               </div>
             </Grid.Item>
           ))}
--
libgit2 0.22.2