快速报价app

陈鑫涛
1 parent 996bb84b
Showing 2 changed files with 31 additions and 27 deletions
src/components/Common/Typesetting/typesetting.js
src/mobile/quotation/detailNew.jsx
@@ -270,7 +270,6 @@ const Typesetting = props =&gt; {
   const isCustomized = bAdvancedSetting;
  
   let remaining = isVertical ? commonHeightCheck : commonWidthCheck;
-  console.log(commonWidthCheck,commonHeightCheck,remainingWidth,remainingHeight,remaining,'remaining');
  
   // 判断
   // const remaining = false;
@@ -1152,7 +1152,7 @@ const QuotationDetail = props =&gt; {
       item.iColValue = viewConfigs[0].iColValue;
     });
   }
-  if (selectedNode.sTypeKey !== "danye") {
+  if (selectedNode && selectedNode.sTypeKey && selectedNode.sTypeKey !== "danye") {
     if (lengthData) {
       lengthData.showName = "高(D)";
       lengthData.sChinese = "高(D)";
@@ -1237,7 +1237,10 @@ const MasterComponent = props =&gt; {
     ...props,
     itemDetail: sDeliverName,
   };
-
+  console.log(viewConfigs, "viewConfigs");
+  const viewConfigsList = viewConfigs.filter(
+    x => x.sName !== "sCustomerName" && x.sName !== "sProductName" && x.sName !== "dLength" && x.sName !== "dWidth" && x.sName !== "dHeight"
+  );
   return (
     <div>
       <div className={styles.customer}>
@@ -1281,19 +1284,19 @@ const MasterComponent = props =&gt; {
           )}
         </div>
       </div>
-      <div className={styles.sizeBox}>
-        <div className={styles.customer}>
-          <div>数量</div>
-          <SelectInput {...dProductQtyProps} bCanInput={true} />
-        </div>
-        <div className={styles.customer}>
-          <div>单位</div>
-          <SelectInput {...sProductUnitProps} />
-        </div>
-        <div className={styles.customer}>
-          <div>收货方式</div>
-          <SelectInput {...sDeliverNameProps} />
-        </div>
+      <div >
+        <Grid columns={3} gap={8}>
+          {viewConfigsList.map(item => {
+            return (
+              <Grid.Item>
+                <div className={styles.customer}>
+                  <div>{item.showName}</div>
+                  <SelectInput {...props} itemDetail={item} />
+                </div>
+              </Grid.Item>
+            );
+          })}
+        </Grid>
       </div>
     </div>
   );
@@ -1504,14 +1507,15 @@ const BoxComponent = props =&gt; {
   // if(!masterData) return
   if (
     (slaveRowData.sColumnNameConfig && masterData.dLength && masterData.dWidth && masterData.dHeight) ||
-    (Number(sStripType) === 1 && slaveRowData.sColumnNameConfig && masterData.dLength && masterData.dWidth)
+    (Number(sStripType) === 1 && slaveRowData.sColumnNameConfig && masterData.dLength && masterData.dWidth) ||
+    slaveRowData.sName === "卡牌"
   ) {
-    const slaveNewData = slaveRowData.upAbleConfigsExtra;
+    const slaveNewData = slaveRowData.upAbleConfigsExtra || JSON.parse(slaveRowData.sColumnNameConfig);
     const tables = [
       { name: "盒型类别", value: slaveRowData.sBoxType, type: null },
       { name: "盒身", value: slaveRowData.sBoxBody, type: slaveRowData.sTypes },
-      { name: "盒长", value: masterData.dLength ? Number(masterData.dLength) : 0, type: null },
-      { name: "盒宽", value: masterData.dWidth ? Number(masterData.dWidth) : 0, type: null },
+      { name: "盒长", value: slaveRowData.dL ? slaveRowData.dL : masterData.dLength ? Number(masterData.dLength) : 0, type: null },
+      { name: "盒宽", value: slaveRowData.dW ? slaveRowData.dW : masterData.dWidth ? Number(masterData.dWidth) : 0, type: null },
       { name: "盒高", value: masterData.dHeight ? Number(masterData.dHeight) : 0, type: null },
     ];
     const titleList1 = [
@@ -1531,23 +1535,24 @@ const BoxComponent = props =&gt; {
         // 提取公式中的变量名
         const variableNames = formula.match(/\b[a-zA-Z_][a-zA-Z0-9_]*\b/g) || [];
         // 构建函数参数
-        const params = variableNames.join(",");
+        const params = variableNames.join(",") + ",Math";
         // 替换公式中的变量为实际值
         const func = new Function(params, `return ${formula}`);
         // 提取变量值
         const args = variableNames.map(name => Number(variables[name]) || 0);
         // 执行函数并返回结果
-        return func(...args);
+        return func(...args, Math);
       } catch (error) {
+        console.error("公式执行错误:", error);
         return 0;
       }
     };
  
     // 确认是竖向排列还是横向排列
-    const L = masterData?.dLength;
-    const W = masterData?.dWidth;
-    const H = masterData?.dWidth;
-    const D = masterData?.dHeight;
+    const L = masterData?.dLength || 0;
+    const W = masterData?.dWidth || 0;
+    const H = masterData?.dWidth || 0;
+    const D = masterData?.dHeight || 0;
     const variables = {
       L,
       W,
@@ -2377,7 +2382,7 @@ const PrintParamsComponent = props =&gt; {
     //         ? props.showConfig.showDropDown
     //         : commonUtils.objectToArr(commonUtils.convertStrToObj(props.showConfig.showDropDown));
     const showDropDown = item.showDropDown;
-    console.log("🚀 ~ showDropDown:", showDropDown,props.showConfig);
+    console.log("🚀 ~ showDropDown:", showDropDown, props.showConfig);
   });
   const result = [];
   for (let i = 0; i < printParams.length + 1; i++) {