diff --git a/src/components/Common/Typesetting/typesetting.js b/src/components/Common/Typesetting/typesetting.js
index 98305b3..46b6a35 100644
--- a/src/components/Common/Typesetting/typesetting.js
+++ b/src/components/Common/Typesetting/typesetting.js
@@ -277,17 +277,6 @@ const Typesetting = props => {
 
   let remaining = isVertical ? commonHeightCheck : commonWidthCheck;
   // const remaining = false;
-  console.log(innerWidth, '盒长');
-  console.log(innerHeight, '盒高');
-  console.log(dFWidthOffset, '首盒纵向偏移');
-  console.log(dFLengthOffset, '首盒横向偏移');
-  console.log(dSWidthOffset,radioValue?.sSWidthOffset, '次盒纵向偏移');
-  console.log(dSLengthOffset,radioValue?.sSLengthOffset, '次盒横向偏移');
-  console.log(boxLengthOffset, '第二列横向偏移');
-  console.log(boxWidthOffset, '第二列纵向偏移');
-  console.log(variabless,'variabless');
-  
-
   const isOdd = num => {
     return num % 2 !== 0;
   };
@@ -497,14 +486,8 @@ const Typesetting = props => {
   }, [radioValue, slaveRowData, masterData, selectedNode, slaveData]);
   // 生成里层 div 的数组
   const innerDivs = [];
-  // 如果第一列
-  // if (rows === 0) {
-  //   const maxWidth = Number(slaveDataDetail?.dMaxWidth)
-  //   if (maxWidth > innerHeight) {
-  //     rows = 1
-  //   }
-  // }
-
+ 
+  
   for (let col = 0; col < cols; col++) {
     for (let row = 0; row < rows; row++) {
       const leftPosition = col * innerWidthCombined;
@@ -553,7 +536,16 @@ const Typesetting = props => {
       innerDivs.push(createBoxOne(0, rows, 3, leftPosition + dZBLB, topPosition + dSBLB, iFAngle, DisableMateriallIcon));
     }
   }
-
+ // 如果第一列
+  if (rows === 0) {
+    const maxWidth = Number(slaveDataDetail?.dMaxWidth)
+    if (maxWidth > innerHeight) {
+       let leftPosition = 0;
+      let topPosition = 0;
+      innerDivs.push(createBoxOne(cols, 0, 3, leftPosition + dZBLB, topPosition + dSBLB, iFAngle, DisableMateriallIcon));
+    }
+  }
+  console.log(cols, '列数', rows, '行数');
   // 判断展开长展开宽是否变化
   if (dPartsLength !== innerWidth && !innerDivs.length) {
     setDPartsLength(innerWidth);
@@ -669,12 +661,13 @@ const Typesetting = props => {
     Number(slaveDataDetail?.dMaxLength) >= Number(slaveRowData?.dMachineLength) &&
     Number(slaveDataDetail?.dMaxWidth) >= Number(slaveRowData?.dMachineWidth);
 
-  const isShow = slaveRowData && slaveRowData.dMachineLength && slaveRowData.dMaxWidth && slaveRowData.dMaxLength && isMax && innerDivs.length;
+  const isShow = slaveRowData && slaveRowData.dMachineLength && slaveRowData.dMaxWidth && slaveRowData.dMaxLength && isMax && innerDivs.length > 0;
   console.log(
     slaveDataDetail?.dMaxLength,
     slaveDataDetail?.dMaxWidth,
     slaveRowData?.dMachineLength,
     slaveRowData?.dMachineWidth,
+    innerDivs,
     isMax,
     isShow,
     "isMax"
diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx
index 26b6c01..60dfbba 100644
--- a/src/components/QuickQuote/index.jsx
+++ b/src/components/QuickQuote/index.jsx
@@ -179,6 +179,7 @@ const QuickQuoteEvent = props => {
 
   addState.onDataChange = (name, sFieldName, changeValue, sId, dropDownData, isWait) => {
     const { masterData = {}, slaveData = [], selectedNode = {}, manyData = [] } = state;
+
     const extraState = {
       calcPriceFinished: false,
     };
@@ -188,9 +189,13 @@ const QuickQuoteEvent = props => {
     }
 
     if (name === "master") {
+      const { showName: sTreeNodeName } = selectedNode;
+      const boxModel = props.currentBoxModel.replace("slaveUp", "").replace("slaveDown", "");
+      const iIndex = slaveData.findIndex(item => item.sTreeNodeName === sTreeNodeName && item.sBoxModel === boxModel);
       const masterDataNew = { ...masterData, ...changeValue };
       masterDataNew.handleType = masterDataNew.handleType || "update";
       masterDataNew.sId = masterDataNew.sId || commonUtils.createSid();
+      
       if (sFieldName === "dProductQty") {
         setState(pre => ({
           ...pre,
@@ -198,6 +203,17 @@ const QuickQuoteEvent = props => {
         }));
       }
 
+      if (sFieldName === "dLength" || sFieldName === "dWidth" || sFieldName === "dHeight") {
+        const sColumnNameConfig =  commonUtils.convertStrToObj(slaveData[iIndex].sColumnNameConfig, []).map(item => ({
+          ...item,
+          iColValue: item.iColValue || 6,
+        }));
+        slaveData[iIndex] = {
+          ...slaveData[iIndex],
+          upAbleConfigsExtra:sColumnNameConfig
+        }
+
+      }
       setState(pre => ({ ...pre, masterData: masterDataNew, ...extraState }));
     } else if (name.includes("slave")) {
       const boxModel = name.replace("slaveUp", "").replace("slaveDown", "");
@@ -353,6 +369,14 @@ const QuickQuoteEvent = props => {
           dFlap: "",
         };
       }
+      const {upAbleConfigsExtra} = slaveData[saveIndex] || {};
+     
+      upAbleConfigsExtra.forEach(item => {
+        if (item.sName === sFieldName) {
+          item.sAssignFormula  = null
+        }
+      })
+
       setState(pre => ({ ...pre, slaveData, ...extraState }));
     } else if (name === "finished") {
       const { productProcessInfo = [] } = masterData;
@@ -1165,12 +1189,17 @@ const TreeComponent = props => {
     };
     if (selectedNode.sProductType === "不干胶") {
       props.onSaveState({
-        masterData: { ...props.masterData, sFormId: "101251240115016002356125200" },
+        masterData: { ...props.masterData, sFormId: "101251240115016002356125200",sOldFormId:props.masterData.sFormId  },
+      });
+    } else {
+      props.onSaveState({
+        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
@@ -1432,6 +1461,7 @@ const BoxComponent = props => {
   }));
 
   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,
@@ -1444,6 +1474,7 @@ const BoxComponent = props => {
     viewRow: slaveRowData,
     tableName: `slaveUp${boxModel}`,
   };
+  console.log("🚀 ~ upViewProps:", props.state);
 
   const getUpViewPropsByITag = iTag => {
     const config = slaveConfig.gdsconfigformslave
@@ -1900,7 +1931,7 @@ const BoxComponent = props => {
     (slaveRowData.sColumnNameConfig && masterData.dLength && masterData.dWidth && masterData.dHeight) ||
     (Number(sStripType) === 1 && slaveRowData.sColumnNameConfig && masterData.dLength && masterData.dWidth)
   ) {
-    const slaveNewData = JSON.parse(slaveRowData.sColumnNameConfig);
+    const slaveNewData = slaveRowData.upAbleConfigsExtra;
     const tables = [
       { name: "盒型类别", value: slaveRowData.sBoxType, type: null },
       { name: "盒身", value: slaveRowData.sBoxBody, type: slaveRowData.sTypes },
@@ -1954,6 +1985,7 @@ const BoxComponent = props => {
       let key = 0;
       if (x.sAssignFormula) {
         key = evaluateFormula(x.sAssignFormula, variables);
+        slaveRowData[x.sName] = key;
       } else {
         key = slaveRowData[x.sName];
       }
@@ -1993,6 +2025,8 @@ const BoxComponent = props => {
     dSvgBoxHeight: 300,
     showNew: 1,
   };
+  // upViewProps.viewRow =
+
   const isShowImg = boxList.find(x => x.sName === "盒身")?.type !== "" || false;
   const PrintingParameters = props.getI18nName("PrintingParameters", "印刷参数");
 
@@ -2001,7 +2035,6 @@ const BoxComponent = props => {
 
   const noImage = commonFunc.showLocalMessage(props, "ImpositionInformation", "暂无图片");
 
-
   const imagesData = [
     { src: slaveRowData.sPackDetailPathUpLoad, alt: "展开图" },
     { src: slaveRowData.sPackPath, alt: "立体图" },
@@ -2099,14 +2132,13 @@ const BoxComponent = props => {
                             {/* <div className={styles.boxRreviewTitile}>展开图</div> */}
                             {slaveRowData.sPackPath ? (
                               // <Image width={300} src={slaveRowData.sPackPath} />
-                        
+
                               <Carousel style={{ width: "300px", height: "300px" }} className={styles.carousel} dots>
-                               {   imagesData.map((image, index) => (
+                                {imagesData.map((image, index) => (
                                   <div key={index} className="carousel-item">
-                                  <Image width={300} src={image.src} alt={image.alt} />
+                                    <Image width={300} src={image.src} alt={image.alt} />
                                   </div>
-                                ))
-                              }
+                                ))}
                               </Carousel>
                             ) : (
                               <div className={styles.noImg}>{noImage}</div>
@@ -2765,7 +2797,6 @@ const BoxModelSelectedModal = props => {
       columns
         .filter(item => item.dataIndex?.includes("Path"))
         .forEach(column => {
-
           // (value ? (column.dataIndex === 'sPackDetailPath' ? (boxData[index].sPackPath ? <img src={value} alt="" width={270} height={270} /> : '') : <img src={value} alt="" width={270} height={270} />)  : "暂无图片");
           column.render = (value, record, index) =>
             column.dataIndex === "sPackDetailPathUpLoad" ? (