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

Min
2 parents be66bbc7 fe5d2f05
Showing 10 changed files with 118205 additions and 146035 deletions
src/components/Common/BoxDesignCompontent/svg.js
src/components/Common/BoxShowImgMaterial/indexNew.js
src/components/QuickQuote/index.jsx
src/mobile/components/SelectInput.jsx
src/mobile/quotation/detailNew.jsx
src/mobile/quotation/index.json
src/mobile/quotation/process.json
src/mobile/quotation/props.json
src/mobile/quotation/quotationDetail.css
src/mobile/quotation/quotationDetail.less
@@ -266,7 +266,7 @@ const SvgBox = props =&gt; {
       } else {
         leftSize = zbtb?.value;
       }
-      svg.setAttribute("viewBox", `${-(leftSize * scale)} ${-ySvg} ${viewBoxWidth} ${viewBoxHeight}`);
+      svg.setAttribute("viewBox", `${-(leftSize * scale)||0} ${-ySvg} ${viewBoxWidth} ${viewBoxHeight}`);
       svg.setAttribute("width", `${viewBoxWidth}px`);
       svg.setAttribute("height", `${viewBoxHeight}px`);
       svgContainerRef.current.style.width = `${viewBoxWidth}px`;
@@ -311,7 +311,7 @@ const SvgBox = props =&gt; {
       } else {
         leftSize = zbtb?.value;
       }
-      svg.setAttribute("viewBox", `${-((leftSize * scale))} ${-ySvg} ${dSvgBoxWidth} ${dSvgBoxHeight}`);
+      svg.setAttribute("viewBox", `${-(((leftSize * scale) || 0))} ${-ySvg} ${dSvgBoxWidth} ${dSvgBoxHeight}`);
       svg.setAttribute("width", `${dSvgBoxWidth}px`);
       svg.setAttribute("height", `${dSvgBoxHeight}px`);
       svgContainerRef.current.style.width = `${dSvgBoxWidth}px`;
@@ -191,7 +191,9 @@ const BoxShowImgMaterial = props =&gt; {
  
   const isShow =
     isDPartsLength && slaveDataDetail && slaveDataDetail.dMachineLength && slaveDataDetail.dMaxWidth && slaveDataDetail.dMaxLength && isMax;
-  return (
+ console.log(slaveDataDetail?.dMaxWidth,slaveDataDetail?.dMaxLength,slaveDataDetail?.dMachineLength,slaveDataDetail?.dMachineWidth,'dropDownData');
+ 
+    return (
     <>
       {isShow ? (
         <div
@@ -17,6 +17,7 @@ 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) => {
@@ -612,6 +613,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]);
+            console.log("🚀 ~ addState.handleCalcPrice= ~ sqlDropDownData:", sqlDropDownData)
             dropDownDataProcessName = sqlDropDownData.dropDownData;
             processAssignAssort = processConfig.gdsconfigformslave[iIndex].sAssignField;
           }
@@ -1361,6 +1363,7 @@ 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) {
@@ -1424,7 +1427,6 @@ const BoxComponent = props =&gt; {
       );
     },
   };
-  
   // 获取sType为3的
   const { productProcessInfo = [] } = masterData;
   const finishedViewProps = {
@@ -20,15 +20,14 @@ const SelectInput = props =&gt; {
   const { bReadonly } = itemDetail || {};
   useEffect(() => {
     if (!itemDetail) return;
-
     const viewRowNew = itemDetail.sName ? viewRow?.[itemDetail.sName] : "";
     if (itemDetail.sDropDownType === "const") {
       return
     }
     if (tableName.includes("slaveDown")) {
       if (!viewRow.sBackProcessData) return;
-      const data = viewRow.sBackProcessData[downIndex][itemDetail.sName];
-      setValue(data);
+      // const data = viewRow.sBackProcessData[downIndex][itemDetail.sName];
+      // setValue(data);
     } else {
       setValue(viewRowNew || ""); // 动态更新 value
     }
@@ -62,7 +61,7 @@ const SelectInput = props =&gt; {
     const data = coplyColumns[index];
     data[itemDetail.sName] = data[itemDetail.sName] ? data[itemDetail.sName] : data.label || data.sName || data.sProcessName || data.sColorName;
     setValue(columns[index]?.label || "");
-    props.onDataChange(tableName, itemDetail.sName, data, null, coplyColumns);
+    props.onDataChange(tableName, itemDetail.sName, data, data.sId, coplyColumns);
     setVisible(false);
   };
  
 import { useRef, useEffect, useState, useCallback, useMemo } from "react";
 import { history } from "umi";
-import { Input, Tabs, Selector, Grid, Image, Button, Checkbox, Switch, Dialog, Toast } from "antd-mobile";
+import { Toast, Input, Tabs, Selector, Grid, Image, Button, Checkbox, Switch, Dialog } from "antd-mobile";
 import { AddOutline, MinusOutline } from "antd-mobile-icons";
 import commonConfig from "@/utils/config";
 import * as commonServices from "@/services/services";
@@ -9,6 +9,8 @@ import * as commonBusiness from &quot;@/components/Common/commonBusiness&quot;;
 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";
@@ -90,6 +92,7 @@ const QuickQuoteEvent = props =&gt; {
   useEffect(() => {
     setState(pre => ({ ...pre, selectedNode }));
   }, []);
+
   useEffect(() => {
     setHideBackBtn(!bLinkFieledClick);
     setEnabled(!bLinkFieledClick || props.enabled);
@@ -113,7 +116,7 @@ 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] }));
+        setState(pre => ({ ...pre, formData, masterConfig: formData[0], processConfig: ProcessData }));
       }
     });
   }, []);
@@ -201,7 +204,7 @@ const QuickQuoteEvent = props =&gt; {
       const { showName: sTreeNodeName } = selectedNode;
       const iIndex = slaveData.findIndex(item => item.sTreeNodeName === sTreeNodeName && item.sBoxModel === boxModel);
       if (name.includes("slaveDown")) {
-        const dropDownDataSelected = dropDownData.find(item => item.sId === changeValue[sFieldName]);
+        const dropDownDataSelected = dropDownData.find(item => item.sId === changeValue.sId);
         dropDownDataSelected && (dropDownDataSelected[sFieldName] = dropDownDataSelected.sProcessName);
         const extraRowData = {};
         // if (dropDownDataSelected.sProcessName === "胶印") {
@@ -218,7 +221,8 @@ const QuickQuoteEvent = props =&gt; {
           });
         } else {
           const sBackProcessData = slaveData[iIndex].sBackProcessData || [];
-          const iIndex1 = sBackProcessData.findIndex(item => item.sProductClassifyId === dropDownData[0].sProductClassifyId);
+          const iIndex1 = sBackProcessData.findIndex(item => item.value === dropDownData[0].value);
+
           if (iIndex1 === -1) {
             dropDownDataSelected !== undefined && sBackProcessData.push(dropDownDataSelected);
           } else {
@@ -286,6 +290,14 @@ const QuickQuoteEvent = props =&gt; {
           dMaxWidth: Number(selectedNode.sMachineStyle.split("*")[1]),
         };
       }
+      if (sFieldName === "sPrint") {
+        slaveData[saveIndex] = {
+          ...slaveData[saveIndex],
+          dMachineWidth: slaveData[saveIndex].dWlkd,
+          dMachineLength: slaveData[saveIndex].dWlcd,
+        };
+      }
+      console.log("dropDownData", slaveData);
  
       setState(pre => ({ ...pre, slaveData, ...extraState }));
     } else if (name === "finished") {
@@ -344,7 +356,10 @@ const QuickQuoteEvent = props =&gt; {
     const { masterData = {} } = nextState;
     const { sProductName, sProductNo, sCustomerName, sCustomerId, sCustomerNo } = masterData;
     if (!sProductName || !sCustomerName) {
-      message.info("请先填写客户名称和产品名称");
+      // message.info("请先填写客户名称和产品名称");
+      Toast.show({
+        content: "请先填写客户名称和产品名称",
+      });
       return;
     }
  
@@ -415,7 +430,11 @@ const QuickQuoteEvent = props =&gt; {
     const { masterData = {}, slaveData = [], selectedNode = {}, extraParts = {} } = state;
  
     if (commonUtils.isEmptyObject(selectedNode)) {
-      message.error("请先选择产品");
+      // message.error("请先选择产品");
+      Toast.show({
+        icon: "fail",
+        content: "请先选择产品",
+      });
       return;
     }
     const mustFieldsMap = {
@@ -429,7 +448,11 @@ const QuickQuoteEvent = props =&gt; {
  
     const checkResult = Object.keys(mustFieldsMap).find(item => masterData[item] === undefined);
     if (checkResult) {
-      message.error(mustFieldsMap[checkResult]);
+      // message.error(mustFieldsMap[checkResult]);
+      Toast.show({
+        icon: "fail",
+        content: mustFieldsMap[checkResult],
+      });
       return;
     }
  
@@ -445,7 +468,11 @@ const QuickQuoteEvent = props =&gt; {
         .filter(item => (bBox ? item.sName : true))
         .filter(item => item.sPrint !== undefined && item.sColor !== undefined && item.iPrintModePo !== undefined) || [];
     if (!slaveRowDataList.length) {
-      message.error("请至少保证一个部件的材料信息填写完整");
+      // message.error("请至少保证一个部件的材料信息填写完整");
+      Toast.show({
+        icon: "fail",
+        content: "请至少保证一个部件的材料信息填写完整",
+      });
       return;
     }
  
@@ -464,6 +491,8 @@ const QuickQuoteEvent = props =&gt; {
       dProductWidth: masterData.dWidth,
       dProductLength: masterData.dLength,
       dProductHeight: masterData.dHeight,
+      sConsigneeMobile: masterData.sMobile,
+      sConsignee: masterData.sContacts,
       sProductStyle:
         masterData.dHeight !== undefined
           ? `${masterData.dLength}*${masterData.dWidth}*${masterData.dHeight}`
@@ -506,11 +535,15 @@ const QuickQuoteEvent = props =&gt; {
     if (paramMap.sPartsStyle === "0*0") {
       delete paramMap.sPartsStyle;
     }
+    // 先用好的数据模拟后面在调整
+    const newParamMap = JsonData;
     const url = `${commonConfig.server_host}calculationStd/countMoney?sModelsId=${sModelsId}`;
-    const dataReturn = (await commonServices.postValueService(token, paramMap, url)).data;
+    const dataReturn = (await commonServices.postValueService(token, newParamMap, url)).data;
  
     if (dataReturn.code === 1) {
-      const { slaveConfig, masterData: masterData1, materialsConfig, processConfig, sModelsId, app } = props;
+      const { app, sModelsId } = props;
+      const { slaveConfig, masterData: masterData1, materialsConfig, processConfig } = state;
+      console.log("🚀 ~ addState.handleCalcPrice= ~ state:", materialsConfig,slaveConfig)
       const { productClassify, partsNewInfo = [], productProcessInfo, partsInfo: partsOldInfo } = dataReturn.dataset.rows[0];
  
       const slaveData = [];
@@ -602,7 +635,9 @@ 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]);
-            dropDownDataProcessName = sqlDropDownData.dropDownData;
+            if (sqlDropDownData) {
+              dropDownDataProcessName = sqlDropDownData.dropDownData;
+            }
             processAssignAssort = processConfig.gdsconfigformslave[iIndex].sAssignField;
           }
         }
@@ -638,7 +673,7 @@ const QuickQuoteEvent = props =&gt; {
           const materialInfo = partInfo.materialsInfo[i];
           const iOrder = i;
           let materialDataRow = {};
-          for (const item of materialsConfig.gdsconfigformslave) {
+          for (const item of materialsConfig?.gdsconfigformslave) {
             materialDataRow[item.sName] = materialInfo[item.sName];
           }
           materialDataRow.handleType = "add";
@@ -854,7 +889,11 @@ const QuickQuoteEvent = props =&gt; {
         return preNew;
       });
     } else {
-      message.error(dataReturn.erroMsg || dataReturn.msg);
+      // message.error(dataReturn.erroMsg || dataReturn.msg);
+      Toast.show({
+        icon: "fail",
+        content: dataReturn.erroMsg || dataReturn.msg,
+      });
       setState(pre => ({ ...pre, calcPriceLoading: false }));
     }
   };
@@ -895,71 +934,122 @@ const QuickQuoteEvent = props =&gt; {
 };
  
 const QuotationAllprogressDetail = baseProps => {
-  const { location, quotationData } = baseProps;
+  const { location, quotationData, app } = baseProps;
   // 处理 formData
-  const propss = {
+  let propss = {
     ...baseProps,
     selectedNode: quotationData,
     state: {},
+    manyDataCache: [],
+    token: baseProps.app.token,
+    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);
+    },
   };
+
   const props = QuickQuoteEvent(propss);
   const { selectedNode } = props;
   const { showName, sUnit } = quotationData;
   const timeRef = useRef(0);
   useEffect(() => {
-    props.setState(pre => {
-      const { slaveData = [], slaveConfig } = pre;
-      const addState = {};
-      const defaultData = commonFunc.getDefaultData(slaveConfig);
-      const slaveDataNew = slaveData.filter(item => item.sTreeNodeName === selectedNode.showName);
-      if (!slaveDataNew.length) {
-        const sAllPartsName = selectedNode.sAllPartsName || selectedNode.showName;
-        sAllPartsName.split(",").forEach((item, index) => {
-          const tempData = {
-            sId: commonUtils.createSid(),
-            handleType: "add",
-            ...defaultData,
-            sBoxModel: item,
-            sTreeNodeName: selectedNode.showName,
-          };
-          if (selectedNode.sTypeKey === "huace") {
-            if (index !== 0) {
-              delete tempData.dSumPQty;
-            } else {
-              tempData.dSumPQty = 4;
+    const getDropDownData = async props => {
+      props.setState(pre => {
+        const { slaveData = [], slaveConfig } = pre;
+        const addState = {};
+        const defaultData = commonFunc.getDefaultData(slaveConfig);
+        const slaveDataNew = slaveData.filter(item => item.sTreeNodeName === selectedNode.showName);
+        if (!slaveDataNew.length) {
+          const sAllPartsName = selectedNode.sAllPartsName || selectedNode.showName;
+          sAllPartsName.split(",").forEach((item, index) => {
+            const tempData = {
+              sId: commonUtils.createSid(),
+              handleType: "add",
+              ...defaultData,
+              sBoxModel: item,
+              sTreeNodeName: selectedNode.showName,
+            };
+            if (selectedNode.sTypeKey === "huace") {
+              if (index !== 0) {
+                delete tempData.dSumPQty;
+              } else {
+                tempData.dSumPQty = 4;
+              }
             }
-          }
-          slaveDataNew.push(tempData);
-        });
-        addState.slaveData = slaveDataNew;
-      }
-      if (timeRef.current > 1) {
-        addState.slaveData = slaveDataNew;
-        addState.extraParts = {};
-      }
-      return {
-        ...pre,
-        ...addState,
-        masterData: { ...quotationData, sProductName: showName, sProductUnit: sUnit },
-        // downAbleConfigs: downAbleConfigs
-        //   .filter(item => item.sType === "2")
-        //   .map((item, index) => ({
-        //     ...item,
-        //     sName: `sParams${index}`,
-        //     iColValue: item.iColValue || 4,
-        //     sVisColumnName: "sProcessName",
-        //   })),
-        // finishedConfigs: downAbleConfigs
-        //   .filter(item => item.sType === "3")
-        //   .map((item, index) => ({
-        //     ...item,
-        //     sName: `sParams${index}`,
-        //     iColValue: item.iColValue || 4,
-        //     sVisColumnName: "sProcessName",
-        //   })),
-      };
-    });
+            slaveDataNew.push(tempData);
+          });
+          addState.slaveData = slaveDataNew;
+        }
+        if (timeRef.current > 1) {
+          addState.slaveData = slaveDataNew;
+          addState.extraParts = {};
+        }
+        return {
+          ...pre,
+          ...addState,
+          masterData: { ...quotationData, sProductName: showName, sProductUnit: sUnit },
+          // downAbleConfigs: downAbleConfigs
+          //   .filter(item => item.sType === "2")
+          //   .map((item, index) => ({
+          //     ...item,
+          //     sName: `sParams${index}`,
+          //     iColValue: item.iColValue || 4,
+          //     sVisColumnName: "sProcessName",
+          //   })),
+          // finishedConfigs: downAbleConfigs
+          //   .filter(item => item.sType === "3")
+          //   .map((item, index) => ({
+          //     ...item,
+          //     sName: `sParams${index}`,
+          //     iColValue: item.iColValue || 4,
+          //     sVisColumnName: "sProcessName",
+          //   })),
+        };
+      });
+    };
+    getDropDownData(props);
   }, []);
+  const getSqlDropDownData = async ({ sId }) => {
+    const url = `${commonConfig.server_host}business/getSelectLimit/${sId}`;
+    const body = {
+      sSqlCondition: {
+        sProductClassifyId: selectedNode.sId,
+      },
+      sKeyUpFilterName: "",
+      pageNum: 1,
+      pageSize: 20,
+    };
+    const retrunData = await commonServices.postValueService(props.app.token, body, url);
+    const sColumnNameConfigStr = retrunData.data?.dataset?.rows?.[0]?.sColumnNameConfig;
+    // 取上机尺寸
+    return commonUtils.convertStrToObj(sColumnNameConfigStr, []);
+  };
+  useEffect(() => {
+    const getData = async props => {
+      const showDownConfig = props.state.slaveConfig?.gdsconfigformslave.find(item => item.sControlName === "BtnDownConfig");
+      const downAbleConfigs = await getSqlDropDownData({ ...showDownConfig });
+      // downAbleConfigs.forEach((x, i) => {
+      //   x.sName = "sParams" + i;
+      // });
+      props.setState(pre => ({
+        ...pre,
+        downAbleConfigs,
+      }));
+    };
+    getData(props);
+  }, [props.state.slaveConfig]);
   return (
     <div className={styles.quotationDetailBox}>
       <QuotationDetail {...props} />
@@ -1133,14 +1223,9 @@ const QuotationTabs = props =&gt; {
 };
  
 // 内容
-const BoxComponent = async props => {
+const BoxComponent = props => {
   const { state, boxModel } = props;
-  console.log("🚀 ~ BoxComponent:", props);
- 
-  const { activeKey, slaveConfig, masterData, selectedNode, boxConfig, slaveData } = state || {};
-   const showDownConfig = slaveConfig.gdsconfigformslave.find(item => item.sControlName === "BtnDownConfig");
-  const downAbleConfigs = await getSqlDropDownData({ ...showDownConfig });
-  console.log("🚀 ~ downAbleConfigs:", downAbleConfigs);
+  const { activeKey, slaveConfig, masterData, selectedNode, boxConfig, downAbleConfigs = [], slaveData } = state || {};
   const slaveRowData = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel) || {};
  
   const { sModelsId } = props;
@@ -1345,9 +1430,7 @@ const BoxComponent = async props =&gt; {
   const [downAbleConfigsNew, setDownAbleConfigsNew] = useState([]);
   useEffect(() => {
     setDownAbleConfigsNew(downAbleConfigs);
-  }, [selectedNode.showName, boxModel]);
-  console.log("🚀 ~ useEffect ~ downAbleConfigs:", downAbleConfigs);
-
+  }, [downAbleConfigs]);
   // 初始化状态，存储每个 Switch 的状态
   const [switchStates, setSwitchStates] = useState(null);
   useEffect(() => {
@@ -1363,10 +1446,13 @@ const BoxComponent = async props =&gt; {
   }, [downAbleConfigsNew, boxModel]); // 依赖数组
  
   // 处理 Switch 变化的函数
-  const handleSwitchChange = (sName, val) => {
+  const handleSwitchChange = (item, val) => {
+    // const dropDownData = JSON.parse(item.sChineseDropDown)
+    // console.log("🚀 ~ handleSwitchChange ~ dropDownData:", dropDownData)
+    // const dropDownDataSelected = dropDownData.find(item => item.sId === changeValue[sFieldName]);
     setSwitchStates({
       ...switchStates,
-      [sName]: val,
+      [item.sName]: val,
     });
   };
   // 过滤后的数据
@@ -1376,6 +1462,7 @@ const BoxComponent = async props =&gt; {
       ...item,
       isSelect: switchStates ? switchStates[item.sName] : false,
     }));
+
   const downViewProps = {
     ...props,
     viewConfigs: downViewConfigs,
@@ -1384,8 +1471,6 @@ const BoxComponent = async props =&gt; {
     viewRow: slaveRowData,
     tableName: `slaveDown${boxModel}`,
   };
-  console.log(downViewProps, "downViewProps");
-
   const calcMethodData = commonUtils.convertStrToObj(slaveRowData?.sColumnNameConfigExclusion, []);
   const radioValue = calcMethodData[0]?.sCode;
   const [materialLength, setMaterialLength] = useState(0);
@@ -1492,6 +1577,8 @@ const BoxComponent = async props =&gt; {
     height: 150,
     size: 9,
   };
+  console.log(showImgMProps, "showImgMProps");
+
   const handleChange = v => {
     if (v.length) {
       const newValue = v[0];
@@ -1512,7 +1599,8 @@ const BoxComponent = async props =&gt; {
  
   const getTableCloum = (i, child) => {
     if (!sBackProcessData) return;
-    const value = sBackProcessData[i];
+    const value = sBackProcessData.find(item => item[child.sName]) || {};
+    if (!value) return;
     const { bSetArea, bSetQty, sName, sSetQtyUnt } = value;
     const viewConfigs = [];
     if (bSetArea) {
@@ -1521,14 +1609,14 @@ const BoxComponent = async props =&gt; {
         showName: "x",
         iColValue: bSetQty ? 8 : 12,
         placeholder: "长",
-        value: value.dManualLength + "",
+        value: value.dManualLength ? value.dManualLength + "" : "",
       });
       viewConfigs.push({
         sName: "dManualWidth",
         showName: "mm",
         iColValue: bSetQty ? 8 : 12,
         placeholder: "宽",
-        value: value.dManualWidth + "",
+        value: value.dManualWidth ? value.dManualWidth + "" : "",
       });
     }
     if (bSetQty) {
@@ -1537,7 +1625,7 @@ const BoxComponent = async props =&gt; {
         showName: sSetQtyUnt || "",
         iColValue: bSetArea ? 8 : 24,
         placeholder: "数量",
-        value: value.dManualQty + "",
+        value: value.dManualQty ? value.dManualQty + "" : "",
       });
     }
     const viewProps = {
@@ -1547,16 +1635,17 @@ const BoxComponent = async props =&gt; {
       iColValueView: 24,
       viewRow: value,
       tableName: `slaveDown${boxModel}${sName}`,
-      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]);
-        slaveData[iIndex].sBackProcessData[iIndex1][sFieldName] = changeValue;
-        const { dManualLength, dManualWidth } = slaveData[iIndex].sBackProcessData[iIndex1];
-        if (dManualLength !== undefined && dManualWidth !== undefined) {
-          slaveData[iIndex].sBackProcessData[iIndex1].dManualValue = dManualLength * dManualWidth;
-        }
-        props.setState(pre => ({ ...pre, slaveData }));
-      },
+    };
+    const onDataChange = (name, sFieldName, changeValue) => {
+      const iIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId);
+      const iIndex1 = slaveData[iIndex].sBackProcessData.findIndex(item => item[child.sName]);
+
+      slaveData[iIndex].sBackProcessData[iIndex1][sFieldName] = changeValue;
+      const { dManualLength, dManualWidth } = slaveData[iIndex].sBackProcessData[iIndex1];
+      if (dManualLength !== undefined && dManualWidth !== undefined) {
+        slaveData[iIndex].sBackProcessData[iIndex1].dManualValue = dManualLength * dManualWidth;
+      }
+      props.setState(pre => ({ ...pre, slaveData }));
     };
     return viewConfigs.length ? (
       <Grid columns={3} gap={8}>
@@ -1565,9 +1654,8 @@ const BoxComponent = async props =&gt; {
             <div className={styles.customer} key={x.id || x.showName} style={{ marginTop: "0", display: "flex", alignItems: "center" }}>
               <Input
                 placeholder=""
-                value={x.value}
                 onChange={e => {
-                  viewProps.onDataChange("", x.sName, e, "");
+                  onDataChange(viewProps.tableName, x.sName, e, x);
                 }}
               ></Input>
               <div style={{ width: "30%", textAlign: "center" }}>{x.showName}</div>
@@ -1579,6 +1667,25 @@ const BoxComponent = async props =&gt; {
       ""
     );
   };
+  const { loading } = props;
+  // 核价事件
+  const onCalcPrice = async () => {
+    const addState = {
+      ...props.onGetAllDelData(),
+      manyDataCache: [],
+    };
+
+    props.onSaveState(
+      {
+        masterData: { ...props.masterData, handleType: props.masterData.handleType || "update" },
+        ...addState,
+      },
+      () => {
+        props.handleCalcPrice();
+      }
+    );
+    await props.handleCalcPrice();
+  };
   return (
     <div>
       <Selector
@@ -1655,18 +1762,44 @@ const BoxComponent = async props =&gt; {
           <div>
             <div className={styles.backBox}>
               <div className={styles.backEnd}>{x.showName}</div>
-              <Switch checked={switchStates ? switchStates[x.sName] : ""} onChange={val => handleSwitchChange(x.sName, val)} />
+              <Switch checked={switchStates ? switchStates[x.sName] : ""} onChange={val => handleSwitchChange(x, val)} />
               <div className={styles.customer} style={{ marginTop: "0", marginLeft: "2rem", width: "40%" }}>
-                <SelectInput {...downViewProps} itemDetail={x} downIndex={i} />
+                {switchStates && switchStates[x.sName] ? (
+                  <SelectInput {...downViewProps} itemDetail={{ ...x, sVisColumnName: "sProcessName", sDropDownType: "sql" }} downIndex={i} />
+                ) : (
+                  ""
+                )}
               </div>
-              {/* <div>{downViewProps.viewRow.sBackProcessData[i].bSetArea === 1 ? downViewProps.viewRow.sBackProcessData[i].bSetArea : ""}</div> */}
             </div>
             {getTableCloum(i, x)}
           </div>
         ))}
       </div>
       <div>
-        多数量报价
+        <div className={styles.projectBtn}>
+          多数量报价
+          {/* <Button color="primary" fill="solid" loading={loading} onClick={props.onAdd}>
+            新报价
+          </Button>
+          <Button
+            color="primary"
+            fill="solid"
+            loading={loading}
+            onClick={() => {
+              props.onSaveDraft();
+            }}
+          >
+            存草稿
+          </Button> */}
+          <div>
+            <Button color="primary" fill="solid" onClick={onCalcPrice} size="small" style={{ marginRight: "1rem" }}>
+              核价
+            </Button>
+            <Button color="success" size="small">
+              确认下单数量
+            </Button>
+          </div>
+        </div>
         <ManyComponent {...props}></ManyComponent>
       </div>
       <Dialog
@@ -1716,13 +1849,13 @@ const BoxComponent = async props =&gt; {
 const MaterialsComponent = props => {
   const { state, boxModel } = props;
   const { slaveConfig, slaveData = [], selectedNode = {} } = state;
-  let { slaveRowData } = state;
+  let { slaveRowData } = props;
   if (!slaveRowData) return;
   const { sParam = "" } = selectedNode;
   const sParamList = sParam.split(",");
   let materialsInfoDefaultData = sParam ? new Array(sParamList.length).fill({}).map((_, index) => ({ showName: sParamList[index] })) : [{}];
   let { materialsInfo = materialsInfoDefaultData } = slaveRowData;
-  const materialsConfig = slaveConfig.gdsconfigformslave
+  const materialsConfig = slaveConfig?.gdsconfigformslave
     .filter(item => item.iTag === 11)
     .map(item => {
       const { sName } = item;
@@ -1749,6 +1882,7 @@ const MaterialsComponent = props =&gt; {
   return materialsInfo.map((item, index) => {
     let viewRow = { ...materialsInfo[index], sProductClassifyId: selectedNode.sId };
     viewRow = { ...viewRow, sMaterialsName0: viewRow.showName || "" };
+    if (!materialsConfig) return;
     let materialsConfigNew = JSON.parse(JSON.stringify(materialsConfig));
     if (viewRow.showName) {
       const iIndex = materialsConfigNew.findIndex(item => item.sName === "sMaterialsName");
@@ -1862,6 +1996,29 @@ const ManyComponent = props =&gt; {
   const { masterData = {}, calcPriceLoading, calcPriceFinished, manyData = [] } = state;
   const [submitLoading, setSubmitLoading] = useState(false);
   const [processPercent, setProcessPercent] = useState(0);
+  // 根据主表数量更改多数量表
+  useEffect(() => {
+    const baseCount = masterData.dProductQty || 1000;
+    if (manyData[0]?.dManyQty === baseCount) return;
+
+    const manyDataNew = Array(5)
+      .fill("")
+      .map((item, index) => ({
+        sId: commonUtils.createSid(),
+        handleType: "add",
+        dManyQty: baseCount * (index + 1),
+      }));
+    setState(pre => ({
+      ...pre,
+      manyData: manyDataNew,
+      manySelectedRowKeys: [manyDataNew[0].sId],
+      dProductQty: baseCount,
+      dQuickQuoteProductQty: baseCount,
+    }));
+    // props.onSaveState({
+    //   manyDataCache: [],
+    // });
+  }, [masterData.dProductQty, manyData.length]);
   const tableProps = {
     ...commonBusiness.getTableTypes("many", { ...props, ...state }),
     fixedHeight: 185,