勒口

陈鑫涛
1 parent 5095d5fd
Showing 4 changed files with 60 additions and 13 deletions
src/components/Common/BoxDesignCompontent/svg.js
src/components/Common/Typesetting/typesetting.js
src/components/QuickQuote/index.jsx
src/mobile/quotation/detailNew.jsx
@@ -188,8 +188,8 @@ const SvgBox = props =&gt; {
       viewBoxWidth = (boxHeight + boxWidth) * 2 + dYTBW + dZTBW;
       viewBoxHeight = boxLength + max;
     } else if (Number(svgType) === 6) {
-      viewBoxWidth = boxLength + 2;
-      viewBoxHeight = boxWidth + 2;
+      viewBoxWidth = boxWidth + 2;
+      viewBoxHeight = boxLength + 2;
     }
     // 计算缩放比例
     let scale = 1;
@@ -1033,7 +1033,7 @@ const SvgBox = props =&gt; {
       svg.appendChild(g);
       // g.setAttribute('transform', `rotate(90, ${viewBoxWidth/2}, ${viewBoxHeight/2})`);
     } else if (Number(svgType) === 6) {
-      const rectangles = [{ x: 0, y: 0, width: scaledWidth, height: scaledHeight }];
+      const rectangles = [{ x: 0, y: 0, width: scaledHeight, height: scaledWidth }];
       rectangles.forEach(rect => {
         g.appendChild(createPathElements(rect.x, rect.y, rect.width, rect.height));
       });
@@ -537,6 +537,7 @@ const Typesetting = props =&gt; {
       newDHorizontalType !== dHorizontalType ||
       newDPortraitType !== dPortraitType
     ) {
+
       setMaterialLength(newMaterialLength);
       setMaterialWidth(newMaterialWidth);
       setMaterialName(sMaterialsName);
@@ -321,6 +321,23 @@ const QuickQuoteEvent = props =&gt; {
           dMaxWidth: Number(selectedNode.sMachineStyle.split("*")[1]),
         };
       }
+
+      if (sFieldName === "bFlap") {
+        slaveData[saveIndex] = {
+          ...slaveData[saveIndex],
+          bFold: false,
+          sFold: "",
+          dFold: "",
+          dAdhesive: "",
+        };
+      }
+      if (sFieldName === "bFold") {
+        slaveData[saveIndex] = {
+          ...slaveData[saveIndex],
+          bFlap: false,
+          dFlap: "",
+        };
+      }
       setState(pre => ({ ...pre, slaveData, ...extraState }));
     } else if (name === "finished") {
       const { productProcessInfo = [] } = masterData;
@@ -546,7 +563,6 @@ const QuickQuoteEvent = props =&gt; {
     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;
@@ -615,10 +631,10 @@ const QuickQuoteEvent = props =&gt; {
         slaveRowData.dAuxiliaryQty = item.materialsInfo?.[0]?.dAuxiliaryQty;
         slaveRowData.sPrint = item.sProcessName;
         if (bCalculatingArea) {
-      // todo 核价成功后 判断bSpecialRules 为false 就要给材料长材料款赋值
+          // todo 核价成功后 判断bSpecialRules 为false 就要给材料长材料款赋值
           // partsNewInfo
-          slaveRowData.dWlcd = item.dMaterialsLength
-          slaveRowData.dWlkd = item.dMaterialsWidth
+          slaveRowData.dWlcd = item.dMaterialsLength;
+          slaveRowData.dWlkd = item.dMaterialsWidth;
         }
         setState(pre => ({ ...pre, slaveData: stateSlaveData }));
       });
@@ -1257,6 +1273,20 @@ const MasterComponent = props =&gt; {
       item.iColValue = viewConfigs[0].iColValue;
     });
   }
+  const lengthData = viewConfigs.find(x => x.sName === "dLength");
+  if (selectedNode.sTypeKey !== "danye") {
+    if (lengthData) {
+      lengthData.showName = "高(D)";
+      lengthData.sChinese = "高(D)";
+      lengthData.sEnglish = "Height (D)";
+    }
+  } else {
+    if (lengthData) {
+      lengthData.showName = "长(L)";
+      lengthData.sChinese = "长(L)";
+      lengthData.sEnglish = "Length (L)";
+    }
+  }
   const viewProps = {
     ...props,
     viewConfigs: viewConfigs,
@@ -1835,7 +1865,13 @@ const BoxComponent = props =&gt; {
                 </Divider>
                 <div className={styles.viewTable1}>
                   <PrintParamsComponent {...props} />
-                  <CommonViewTable {...upViewProps12} />
+                  <div className={styles.materialsLine}>
+                    <div className={styles.materialsViewTable}>
+                      <CommonViewTable {...upViewProps12} />
+                    </div>
+                    <div className={styles.materialsBtns} style={{ width: "10%", height: "30px" }}></div>
+                  </div>
+                  {/* <CommonViewTable {...upViewProps12} /> */}
                 </div>
                 {/* <Divider {...dividerProps} orientationMargin="10px">
                   材料信息
@@ -2038,7 +2074,7 @@ const PrintParamsComponent = props =&gt; {
         <div className={styles.materialsViewTable}>
           <CommonViewTable {...viewProps} />
         </div>
-        <div className={styles.materialsBtns} style={{ width: "25%", paddingRight: "calc(25% - 85px)" }}>
+        <div className={styles.materialsBtns} style={{ width: "10%" }}>
           <Button
             type="primary"
             icon={<PlusOutlined />}
@@ -2603,7 +2639,6 @@ const BackendParamsExtraComponent = props =&gt; {
   const { state, slaveConfig, boxModel } = props;
   const { backendParamsConfig = [], backendConfig = {}, slaveData, selectedNode } = state;
   if (!backendParamsConfig.length) return "";
-  console.log(backendParamsConfig, "backendParamsConfig");
  
   const { sParentFieldsName, sBoxModel } = backendConfig;
  
@@ -2686,7 +2721,6 @@ const BackendParamsExtraComponent = props =&gt; {
       props.setState(pre => ({ ...pre, slaveData }));
     },
   };
-  console.log(viewProps, "viewProps");
  
   return (
     <>
@@ -630,11 +630,17 @@ const QuickQuoteEvent = props =&gt; {
  
       // 返回数据赋值
       const { slaveData: stateSlaveData = [] } = state;
+      const { bCalculatingArea } = selectedNode;
       partsNewInfo.forEach(item => {
         const slaveRowData = stateSlaveData.find(row => item.sTreeNodeName === row.sTreeNodeName && item.sBoxModel === row.sBoxModel);
         slaveRowData.dMachineQty = item.dMachineQty;
         slaveRowData.dAuxiliaryQty = item.materialsInfo?.[0]?.dAuxiliaryQty;
         slaveRowData.sPrint = item.sProcessName;
+        if (bCalculatingArea) {
+          // todo 核价成功后 判断bSpecialRules 为false 就要给材料长材料款赋值
+          slaveRowData.dWlcd = item.dMaterialsLength;
+          slaveRowData.dWlkd = item.dMaterialsWidth;
+        }
         setState(pre => ({ ...pre, slaveData: stateSlaveData }));
       });
  
@@ -2561,7 +2567,7 @@ const BackendParamsExtraComponent = props =&gt; {
           slaveData[iIndex].sBackProcessData[iIndex1].dManualValue = dManualLength * dManualWidth;
         }
       }
-      
+
       const itemDetail = viewProps.viewConfigs.find(x => x.sName === sFieldName);
       props.setState(pre => ({ ...pre, slaveData }));
       // props.onCostomClick(itemDetail);
@@ -2581,7 +2587,13 @@ const BackendParamsExtraComponent = props =&gt; {
             <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} onCostomClick={null}/>
+                <SelectInput
+                  {...viewProps}
+                  itemDetail={x}
+                  getSqlDropDownData={viewProps.getSqlDropDownData}
+                  onDataChange={viewProps.onDataChange}
+                  onCostomClick={null}
+                />
               </div>
             </Grid.Item>
           ))}