快速报价核价

陈鑫涛
1 parent fe5d2f05
Showing 7 changed files with 266 additions and 53 deletions
src/components/QuickQuote/index.jsx
src/mobile/quotation/detailNew.jsx
src/mobile/quotation/index.css
src/mobile/quotation/index.jsx
src/mobile/quotation/index.less
src/mobile/quotation/quotationDetail.css
src/mobile/quotation/quotationDetail.less
@@ -17,7 +17,6 @@ import Typesetting from &quot;@/components/Common/Typesetting/typesetting&quot;;
 import DynamicSVG from "@/components/Common/BoxDesignCompontent/svg";
 // 事件
 const QuickQuoteEvent = props => {
-  console.log("🚀 ~ QuickQuoteEvent:", props)
   const addState = {};
   addState.onGetFilterState = (state, bInit) => {
@@ -613,7 +612,6 @@ const QuickQuoteEvent = props =&gt; {
           const iIndex = processConfig.gdsconfigformslave.findIndex(item => item.sName === "sProcessName");
           if (iIndex > -1) {
             const sqlDropDownData = await props.getSqlDropDownData(sModelsId, "slave", processConfig.gdsconfigformslave[iIndex]);
-            console.log("🚀 ~ addState.handleCalcPrice= ~ sqlDropDownData:", sqlDropDownData)
             dropDownDataProcessName = sqlDropDownData.dropDownData;
             processAssignAssort = processConfig.gdsconfigformslave[iIndex].sAssignField;
           }
@@ -845,7 +843,6 @@ const QuickQuoteEvent = props =&gt; {
         { ...props, ...newState, manyqtysConfig: state.manyConfig, manyqtysData: state.manyData },
         true
       );
-
       if (commonUtils.isEmptyObject(result)) {
         setState(pre => ({ ...pre, calcPriceLoading: false }));
         return;
@@ -1363,7 +1360,6 @@ const BoxComponent = props =&gt; {
         onDataChange: (name, sFieldName, changeValue, sId, dropDownData, isWait) => {
           const iIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId);
           const iIndex1 = slaveData[iIndex].sBackProcessData.findIndex(item => item[child.sName]);
-          console.log("🚀 ~ child:", child)
           slaveData[iIndex].sBackProcessData[iIndex1][sFieldName] = changeValue[sFieldName];
           const { dManualLength, dManualWidth } = slaveData[iIndex].sBackProcessData[iIndex1];
           if (dManualLength !== undefined && dManualWidth !== undefined) {
 import { useRef, useEffect, useState, useCallback, useMemo } from "react";
 import { history } from "umi";
 import { Toast, Input, Tabs, Selector, Grid, Image, Button, Checkbox, Switch, Dialog } from "antd-mobile";
-import { AddOutline, MinusOutline } from "antd-mobile-icons";
+import { AddOutline, MinusOutline, EditFill } from "antd-mobile-icons";
 import commonConfig from "@/utils/config";
 import * as commonServices from "@/services/services";
 import * as commonFunc from "@/components/Common/commonFunc";
 import * as commonBusiness from "@/components/Common/commonBusiness";
 import styles from "./quotationDetail.less";
 import SelectInput from "../components/SelectInput";
-import JsonData from "./index.json";
-import PropsJson from "./props.json";
-import ProcessData from "./process.json";
 import * as commonUtils from "@/utils/utils";
 import Typesetting from "@/components/Common/Typesetting/typesetting";
 import DynamicSVG from "@/components/Common/BoxDesignCompontent/svg";
 import ShowImgM from "@/components/Common/BoxShowImgMaterial/indexNew";
+import CommonBase from "@/components/Common/CommonBase";
 const QuickQuoteEvent = props => {
   const { location } = props;
   const selectedNode = JSON.parse(location.state).quotationData;
@@ -116,7 +114,8 @@ const QuickQuoteEvent = props =&gt; {
     commonServices.getService(props.app.token, configUrls).then(({ data: configReturn }) => {
       if (configReturn.code === 1) {
         const formData = configReturn.dataset.rows[0].formData;
-        setState(pre => ({ ...pre, formData, masterConfig: formData[0], processConfig: ProcessData }));
+        // 需要查询到processConfig和materialsConfig
+        setState(pre => ({ ...pre, formData, masterConfig: formData[0], processConfig: {} }));
       }
     });
   }, []);
@@ -167,7 +166,7 @@ const QuickQuoteEvent = props =&gt; {
     };
     if (name === "master") {
-      const masterDataNew = { ...masterData, ...changeValue };
+      let masterDataNew = { ...masterData, ...changeValue };
       masterDataNew.handleType = masterDataNew.handleType || "update";
       masterDataNew.sId = masterDataNew.sId || commonUtils.createSid();
       if (sFieldName === "dProductQty") {
@@ -176,6 +175,9 @@ const QuickQuoteEvent = props =&gt; {
           dProductQty: changeValue.dProductQty,
         }));
       }
+      if (sFieldName === "sCustomerName") {
+        masterDataNew = { ...masterDataNew, sCustomerId: changeValue.sId };
+      }
       setState(pre => ({ ...pre, masterData: masterDataNew, ...extraState }));
     } else if (name.includes("slave")) {
       const boxModel = name.replace("slaveUp", "").replace("slaveDown", "");
@@ -297,8 +299,6 @@ const QuickQuoteEvent = props =&gt; {
           dMachineLength: slaveData[saveIndex].dWlcd,
         };
       }
-      console.log("dropDownData", slaveData);
-
       setState(pre => ({ ...pre, slaveData, ...extraState }));
     } else if (name === "finished") {
       const { productProcessInfo = [] } = masterData;
@@ -448,7 +448,6 @@ const QuickQuoteEvent = props =&gt; {
     const checkResult = Object.keys(mustFieldsMap).find(item => masterData[item] === undefined);
     if (checkResult) {
-      // message.error(mustFieldsMap[checkResult]);
       Toast.show({
         icon: "fail",
         content: mustFieldsMap[checkResult],
@@ -523,6 +522,7 @@ const QuickQuoteEvent = props =&gt; {
             iPositiveColor: Number(item.sColor),
             sPartsName: item.sBoxModel,
             materialsInfo: item.materialsInfo?.filter(x => commonUtils.isNotEmptyObject(x)),
+            iPrintModePo: Number(item.value),
             processInfo:
               item.sBackProcessData?.map(item => ({
                 ...item,
@@ -536,14 +536,13 @@ const QuickQuoteEvent = props =&gt; {
       delete paramMap.sPartsStyle;
     }
     // 先用好的数据模拟后面在调整
-    const newParamMap = JsonData;
+    // const newParamMap = JsonData;
     const url = `${commonConfig.server_host}calculationStd/countMoney?sModelsId=${sModelsId}`;
-    const dataReturn = (await commonServices.postValueService(token, newParamMap, url)).data;
+    const dataReturn = (await commonServices.postValueService(token, paramMap, url)).data;
     if (dataReturn.code === 1) {
-      const { app, sModelsId } = props;
-      const { slaveConfig, masterData: masterData1, materialsConfig, processConfig } = state;
-      console.log("🚀 ~ addState.handleCalcPrice= ~ state:", materialsConfig,slaveConfig)
+      const { app, sModelsId, materialsConfig } = props;
+      const { slaveConfig, masterData: masterData1, processConfig } = state;
       const { productClassify, partsNewInfo = [], productProcessInfo, partsInfo: partsOldInfo } = dataReturn.dataset.rows[0];
       const slaveData = [];
@@ -593,7 +592,10 @@ const QuickQuoteEvent = props =&gt; {
         partsOldInfo.forEach(item => {
           if (commonUtils.isNotEmptyObject(item) && !commonUtils.isEmpty(item.errorFlag)) {
             errorFlag = true;
-            props.getServiceError({ msg: `${item.sPartsName}  ${item.errorFlag}` });
+            // props.getServiceError({ msg: `${item.sPartsName}  ${item.errorFlag}` });
+            Toast.show({
+              content: `${item.sPartsName}  ${item.errorFlag}`,
+            });
           }
         });
       }
@@ -635,9 +637,7 @@ const QuickQuoteEvent = props =&gt; {
           const iIndex = processConfig.gdsconfigformslave.findIndex(item => item.sName === "sProcessName");
           if (iIndex > -1) {
             const sqlDropDownData = await props.getSqlDropDownData(sModelsId, "slave", processConfig.gdsconfigformslave[iIndex]);
-            if (sqlDropDownData) {
-              dropDownDataProcessName = sqlDropDownData.dropDownData;
-            }
+            dropDownDataProcessName = sqlDropDownData.dropDownData;
             processAssignAssort = processConfig.gdsconfigformslave[iIndex].sAssignField;
           }
         }
@@ -860,9 +860,7 @@ const QuickQuoteEvent = props =&gt; {
         Loading: false,
         // quickQuoteModel: false,
       };
-
       delete newState.masterData.sQuoConfig;
-
       const result = await props.handleCalculation(
         false,
         { ...props, ...newState, manyqtysConfig: state.manyConfig, manyqtysData: state.manyData },
@@ -879,7 +877,6 @@ const QuickQuoteEvent = props =&gt; {
         ...item,
         sParentId: newState.masterData.sId,
       }));
-
       setState(pre => {
         const preNew = { ...pre, manyData: result.manyqtysData, calcPriceLoading: false, calcPriceFinished: true };
         const stateNew = { ...newState, ...result };
@@ -932,9 +929,174 @@ const QuickQuoteEvent = props =&gt; {
     masterConfig: masterConfig && masterConfig.length ? masterConfig[0] : {},
   };
 };
-
+const handleMaterialsChange = async (tableDataRow, sModelsId, masterData, changeValue, sFieldName, app, token, models) => {
+  const { sComputeId, sConversionComputeId, sReConversionComputeId } = tableDataRow;
+  if (
+    sFieldName === "sMaterialsNo" ||
+    sFieldName === "sMaterialsName" ||
+    sFieldName === "dAuxiliaryQty" ||
+    sFieldName === "dReelAuxiliaryQty" ||
+    sFieldName === "dConversionQty" ||
+    sFieldName === "sMaterialsStyle" ||
+    sFieldName === "dProductQty"
+  ) {
+    if (sFieldName === "dReelAuxiliaryQty") {
+      if (tableDataRow.sMaterialsUnit === "吨" && tableDataRow.bReel && tableDataRow.dGramWeight > 0) {
+        tableDataRow = commonBusiness.getMaterialsQty(
+          app,
+          { ...tableDataRow, sMaterialsStyle: tableDataRow.sReelMaterialsStyle },
+          "dReelAuxiliaryQty",
+          "dMaterialsQty"
+        );
+        tableDataRow.dAuxiliaryQty = tableDataRow.dMaterialsQty;
+        tableDataRow.sMaterialsStyle =
+          tableDataRow.sMaterialsStyle !== undefined && tableDataRow.sMaterialsStyle.split("*").length > 1
+            ? tableDataRow.sMaterialsStyle.split("*")[0]
+            : tableDataRow.sMaterialsStyle;
+        tableDataRow.sAuxiliaryUnit = tableDataRow.sMaterialsUnit;
+      } else if (tableDataRow.sMaterialsUnit.toUpper() === "M2" && tableDataRow.bReel) {
+        tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, "dReelAuxiliaryQty", "dMaterialsQty");
+        tableDataRow.dAuxiliaryQty = tableDataRow.dReelAuxiliaryQty;
+      } else {
+        tableDataRow.dAuxiliaryQty = tableDataRow.dReelAuxiliaryQty;
+      }
+    }
+    if (commonUtils.isEmpty(sComputeId) && sFieldName !== "dConversionQty") {
+      if (sFieldName === "dProductQty") {
+        tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, "dProductQty", "dMaterialsQty");
+      } else {
+        tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, "dAuxiliaryQty", "dMaterialsQty");
+      }
+    } else if (!commonUtils.isEmpty(sComputeId)) {
+      tableDataRow.dMaterialsQty = await commonBusiness.getFormulaValue({
+        token,
+        sModelsId,
+        masterData,
+        tableDataRow,
+        sComputeId,
+      });
+    }
+    if (sFieldName !== "dConversionQty" && !commonUtils.isEmpty(sConversionComputeId)) {
+      tableDataRow.dConversionQty = await commonBusiness.getFormulaValue({
+        token,
+        sModelsId,
+        masterData,
+        tableDataRow,
+        sComputeId: sConversionComputeId,
+      });
+    }
+  } else if (sFieldName === "dMaterialsQty") {
+    const { sReComputeId } = tableDataRow;
+    if (commonUtils.isEmpty(sReComputeId) && tableDataRow.bInverse) {
+      tableDataRow = commonBusiness.getAuxiliaryQty(app, tableDataRow, sFieldName, "dAuxiliaryQty");
+    } else if (tableDataRow.bInverse) {
+      tableDataRow.dAuxiliaryQty = await commonBusiness.getFormulaValue({
+        token,
+        sModelsId,
+        masterData,
+        tableDataRow,
+        sComputeId: sReComputeId,
+      });
+      if (commonUtils.isNotEmptyArr(tableDataRow.dAuxiliaryQty) && tableDataRow.dAuxiliaryQty !== 0) {
+        tableDataRow.dProductQty = tableDataRow.dAuxiliaryQty;
+      }
+    }
+    if (!commonUtils.isEmpty(sReConversionComputeId)) {
+      tableDataRow.dConversionQty = await commonBusiness.getFormulaValue({
+        token,
+        sModelsId,
+        masterData,
+        tableDataRow,
+        sComputeId: sReConversionComputeId,
+      });
+    }
+  } else if (sFieldName === "dAuxiliaryLossQty") {
+    if (commonUtils.isEmpty(sComputeId)) {
+      tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, sFieldName, "dLossQty");
+    } else {
+      tableDataRow.dLossQty = await commonBusiness.getFormulaValue({
+        token,
+        sModelsId,
+        masterData,
+        tableDataRow,
+        sComputeId,
+      });
+    }
+    if (!commonUtils.isEmpty(tableDataRow.dSrcSurplusAuxiliaryQty)) {
+      tableDataRow.dAuxiliaryQty = tableDataRow.dSrcSurplusAuxiliaryQty - tableDataRow.dAuxiliaryLossQty;
+      tableDataRow.dMaterialsQty = commonUtils.convertFixNum(tableDataRow.dSrcSurplusQty - tableDataRow.dLossQty, 6);
+    }
+  } else if (sFieldName === "dLossQty") {
+    const { sReComputeId } = tableDataRow;
+    if (commonUtils.isEmpty(sReComputeId)) {
+      tableDataRow = commonBusiness.getAuxiliaryQty(app, tableDataRow, sFieldName, "dAuxiliaryLossQty");
+    } else {
+      tableDataRow.dAuxiliaryLossQty = await commonBusiness.getFormulaValue({
+        token,
+        sModelsId,
+        masterData,
+        tableDataRow,
+        sComputeId: sReComputeId,
+      });
+    }
+    if (!commonUtils.isEmpty(tableDataRow.dSrcSurplusAuxiliaryQty)) {
+      tableDataRow.dAuxiliaryQty = tableDataRow.dSrcSurplusAuxiliaryQty - tableDataRow.dAuxiliaryLossQty;
+      tableDataRow.dMaterialsQty = tableDataRow.dSrcSurplusQty - tableDataRow.dLossQty;
+    }
+  } else if (sFieldName === "sProcessId" || sFieldName === "sProcessNo" || sFieldName === "sProcessName") {
+    const sProcessId = changeValue.sProcessId;
+    const url = `${commonConfig.server_host}process/outsideprocess?sModelsId=${sModelsId}&sProcessId=${sProcessId}`;
+    const dataReturn = (await commonServices.getService(token, url)).data;
+    if (dataReturn.code === 1) {
+      if (commonUtils.isNotEmptyArr(dataReturn.dataset.rows)) {
+        tableDataRow.dMaterialsPrice = dataReturn.dataset.rows[0].dMaterialsPrice;
+      }
+      tableDataRow = commonBusiness.getCalculateAllMoney(app, models, "dMaterialsPrice", masterData, tableDataRow);
+    }
+  }
+  return tableDataRow;
+};
+const sortData = (tableData, processData) => {
+  processData.sort((g1, g2) => {
+    const iIndex1 = tableData.findIndex(item => item.sId === g1.sControlId) === -1 ? 999 : tableData.findIndex(item => item.sId === g1.sControlId);
+    let sPartOrder1 = `0000${iIndex1}`;
+    sPartOrder1 = sPartOrder1.substring(sPartOrder1.length - 3);
+    let sOrder1 = `000${g1.iOrder}`;
+    sOrder1 = sOrder1.substring(sOrder1.length - 3);
+
+    const iIndex2 = tableData.findIndex(item => item.sId === g2.sControlId) === -1 ? 999 : tableData.findIndex(item => item.sId === g2.sControlId);
+    let sPartOrder2 = `0000${iIndex2}`;
+    sPartOrder2 = sPartOrder2.substring(sPartOrder2.length - 3);
+    let sOrder2 = `000${g2.iOrder}`;
+    sOrder2 = sOrder2.substring(sOrder2.length - 3);
+    return parseInt(sPartOrder1 + g1.sType + sOrder1, 10) - parseInt(sPartOrder2 + g2.sType + sOrder2, 10);
+  });
+  return processData;
+};
 const QuotationAllprogressDetail = baseProps => {
-  const { location, quotationData, app } = baseProps;
+  const { location, quotationData, app, sModelsId } = baseProps;
+  const getSqlDropDownDatas = async (formId, name, showConfig, record, sKeyUpFilterName, pageNum) => {
+    const url = `${commonConfig.server_host}business/getSelectLimit/${showConfig.sId}?sModelsId=${sModelsId}`;
+    const body = {
+      sSqlCondition: {
+        sSqlCondition: "",
+      },
+      sKeyUpFilterName: "",
+      pageNum: 1,
+      pageSize: 20,
+    };
+    const retrunData = await commonServices.postValueService(propss.token, body, url);
+    if (retrunData.data.code === 1) {
+      /*   获取数据集   */
+      const { rows, totalPageCount, currentPageNo, totalCount } = retrunData.data.dataset;
+      return {
+        dropDownData: rows,
+        totalPageCount,
+        currentPageNo,
+        totalCount,
+      };
+    }
+  };
   // 处理 formData
   let propss = {
     ...baseProps,
@@ -945,25 +1107,16 @@ const QuotationAllprogressDetail = baseProps =&gt; {
     onSaveState: newState => {
       propss = { ...propss, ...newState };
     },
-    getSqlDropDownData: async sId => {
-      const url = `${commonConfig.server_host}business/getSelectLimit/${sId}`;
-      const body = {
-        sSqlCondition: {
-          sSqlCondition: "",
-        },
-        sKeyUpFilterName: "",
-        pageNum: 1,
-        pageSize: 20,
-      };
-      const retrunData = await commonServices.postValueService(propss.token, body, url);
-      console.log("🚀 ~ retrunData:", retrunData);
-    },
+    getSqlDropDownData: getSqlDropDownDatas,
+    onMaterialsChange: handleMaterialsChange,
+    sortData,
   };
   const props = QuickQuoteEvent(propss);
   const { selectedNode } = props;
   const { showName, sUnit } = quotationData;
   const timeRef = useRef(0);
+
   useEffect(() => {
     const getDropDownData = async props => {
       props.setState(pre => {
@@ -1072,8 +1225,11 @@ const QuotationDetail = props =&gt; {
     tableName: "master",
   };
   return (
-    <div>
-      <div>{selectedNode?.showName || "Loading..."}</div>
+    <div className={styles.quotationBody}>
+      <div className={styles.boxTitle}>
+        {selectedNode?.showName || "Loading..."}
+        <EditFill color="#BFBFBF" style={{ marginLeft: "1rem" }} />
+      </div>
       <div>
         <MasterComponent {...viewProps} />
       </div>
@@ -1132,11 +1288,11 @@ const MasterComponent = props =&gt; {
   return (
     <div>
       <div className={styles.customer}>
-        <div>{customerProps.formData?.showName}</div>
+        <div>{customerProps.itemDetail?.showName}</div>
         <SelectInput {...customerProps} />
       </div>
       <div className={styles.customer}>
-        <div>{productProps.formData?.showName}</div>
+        <div>{productProps.itemDetail?.showName}</div>
         <SelectInput {...productProps} />
       </div>
       <div className={styles.customer}>
@@ -1227,7 +1383,6 @@ const BoxComponent = props =&gt; {
   const { state, boxModel } = props;
   const { activeKey, slaveConfig, masterData, selectedNode, boxConfig, downAbleConfigs = [], slaveData } = state || {};
   const slaveRowData = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel) || {};
-
   const { sModelsId } = props;
   const [selectList, setSelectList] = useState([]);
   const [boxTypeList, setBoxTypeList] = useState([]);
@@ -1577,7 +1732,6 @@ const BoxComponent = props =&gt; {
     height: 150,
     size: 9,
   };
-  console.log(showImgMProps, "showImgMProps");
   const handleChange = v => {
     if (v.length) {
@@ -1695,6 +1849,7 @@ const BoxComponent = props =&gt; {
         value={selected ? [selected] : []}
         onChange={v => handleChange(v)}
       />
+      <div className={styles.line}></div>
       <div>
         <Grid columns={4} gap={8}>
           {upViewProps
@@ -1716,7 +1871,10 @@ const BoxComponent = props =&gt; {
         {slaveRowData && slaveRowData.sPackPath ? <Image src={slaveRowData.sPackPath} width={125} height={125} fit="fill" /> : ""}
       </div>
       <div>
-        <div>印刷信息</div>
+        <div className={styles.boxTitle}>
+          印刷信息
+          <EditFill color="#BFBFBF" style={{ marginLeft: "1rem" }} />
+        </div>
         <Grid columns={3} gap={8}>
           {upViewProps12
             ? upViewProps12.viewConfigs.map(x => (
@@ -1731,7 +1889,11 @@ const BoxComponent = props =&gt; {
         </Grid>
       </div>
       <div>
-        <div>拼版信息</div>
+        <div className={styles.boxTitle}>
+          拼版信息
+          <EditFill color="#BFBFBF" style={{ marginLeft: "1rem" }} />
+        </div>
+
         <Grid columns={3} gap={8}>
           {upViewProps20
             ? upViewProps20.viewConfigs.map(x => (
@@ -1757,7 +1919,11 @@ const BoxComponent = props =&gt; {
         <MaterialsComponent {...props} slaveRowData={slaveRowData} boxModel={boxModel} />
       </div>
       <div>
-        <div>后道参数</div>
+        <div className={styles.boxTitle}>
+          后道参数
+          <EditFill color="#BFBFBF" style={{ marginLeft: "1rem" }} />
+        </div>
+
         {downViewProps.viewConfigs.map((x, i) => (
           <div>
             <div className={styles.backBox}>
@@ -1777,7 +1943,11 @@ const BoxComponent = props =&gt; {
       </div>
       <div>
         <div className={styles.projectBtn}>
-          多数量报价
+          <div className={styles.boxTitle} style={{ marginTop: "2rem" }}>
+            多数量报价
+            <EditFill color="#BFBFBF" style={{ marginLeft: "1rem" }} />
+          </div>
+
           {/* <Button color="primary" fill="solid" loading={loading} onClick={props.onAdd}>
             新报价
           </Button>
@@ -1899,18 +2069,31 @@ const MaterialsComponent = props =&gt; {
       tableName: `slaveUp${boxModel}`,
       onDataChange: (name, sFieldName, changeValue, sId, dropDownData, isWait) => {
         const iIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId);
+        const { sMaterialsName, sMaterialsNo, sMaterialsId, sAuxiliaryUnit, sMaterialsUnit, dGramWeight, sMaterialsType, dWlkd, dWlcd } = changeValue;
+        const masterials = {
+          sMaterialsName,
+          sMaterialsNo,
+          sMaterialsId,
+          sAuxiliaryUnit,
+          sMaterialsUnit,
+          dGramWeight,
+          sMaterialsType,
+          dWlkd,
+          dWlcd,
+        };
         if (iIndex !== -1) {
-          slaveData[iIndex].materialsInfo = materialsInfo.map((item, i) => (i === index ? { ...item, ...changeValue } : item));
+          slaveData[iIndex].materialsInfo = materialsInfo.map((item, i) => (i === index ? { ...item, ...masterials } : item));
           slaveRowData = slaveData[iIndex];
         } else {
           const { selectedNode = {} } = state;
           const { showName: sTreeNodeName } = selectedNode;
+
           slaveData.push({
             sId: commonUtils.createSid(),
             handleType: "add",
             sBoxModel: boxModel,
             sTreeNodeName,
-            materialsInfo: materialsInfo.map((item, i) => (i === index ? { ...item, ...changeValue } : item)),
+            materialsInfo: materialsInfo.map((item, i) => (i === index ? { ...item, ...masterials } : item)),
           });
         }
         props.setState(pre => ({ ...pre, slaveData, slaveRowData, ...extraState }));
@@ -5,6 +5,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  overflow: hidden;
 }
 .quotationBox .quotationNavigation {
   width: 30%;
@@ -16,6 +17,7 @@
 .quotationBox .quotationContent {
   width: 70%;
   height: 100%;
+  overflow-y: auto;
 }
 .quotationBox .quotationContent .contentItem {
   width: 92%;
@@ -118,7 +118,7 @@ const ContentComponent = props =&gt; {
     <div className={styles.content}>
       {contentList.map(item => (
         <div key={item.key} className={styles.contentItem} onClick={handleGridClick(item)}>
-          <img src={Icon5} alt="" className={styles.contentItemImg} />
+          <img src={'http://8.130.144.93:8088/xlyEntry/file/downloadLogo?sLogoName=logosPackPath%E9%A3%9E%E6%9C%BA%E7%9B%92&date=1747049329258'} alt="" className={styles.contentItemImg} />
           <span className={styles.contentItemTitle}>{item.showName}</span>
         </div>
       ))}
@@ -6,6 +6,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  overflow: hidden;
   .quotationNavigation {
     width: 30%;
     height: 100%;
@@ -16,6 +17,7 @@
   .quotationContent {
     width: 70%;
     height: 100%;
+    overflow-y: auto;
     .contentItem {
       width: 92%;
       height: 7.5rem;
@@ -111,3 +111,18 @@
   align-items: center;
   justify-content: space-between;
 }
+.boxTitle {
+  font-size: 1.5rem;
+  font-weight: 700;
+  margin-bottom: 2rem;
+  margin-top: 1rem;
+}
+.quotationBody {
+  font-size: 1.25rem;
+}
+.quotationBody .line {
+  width: 100%;
+  height: 1px;
+  margin-top: 1rem;
+  background-color: #dededf;
+}
@@ -119,4 +119,19 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
+}
+.boxTitle{
+  font-size: 1.5rem;
+  font-weight: 700;
+  margin-bottom: 2rem;
+  margin-top: 1rem;
+}
+.quotationBody{
+  font-size: 1.25rem;
+  .line{
+    width: 100%;
+    height: 1px;
+    margin-top: 1rem;
+    background-color: #dededf;
+  }
 }
 \ No newline at end of file