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

# Conflicts: # src/components/QuickQuote/index.jsx

Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main
# Conflicts: # src/components/QuickQuote/index.jsx
陈鑫涛
2 parents 15f9d34e 9c88cf55
Showing 1 changed file with 56 additions and 53 deletions
src/components/QuickQuote/index.jsx
@@ -253,6 +253,15 @@ const QuickQuoteEvent = props =&gt; {
       const { selectedNode = {}, slaveConfig } = state;
       const { showName: sTreeNodeName } = selectedNode;
+
+      if (sFieldName === "dSumPQty" && (sTreeNodeName.includes("骑马") || sTreeNodeName.includes("锁线"))) {
+        if (!changeValue.dSumPQty || changeValue.dSumPQty % 4 !== 0) {
+          message.info("P数要为4的倍数!");
+          changeValue.dSumPQty = 4;
+          extraState.slaveUpKey = `key_${commonUtils.createSid()}`;
+        }
+      }
+
       const iIndex = slaveData.findIndex(item => item.sTreeNodeName === sTreeNodeName && item.sBoxModel === boxModel);
       if (name.includes("slaveDown")) {
         const dropDownDataSelected = dropDownData.find(item => item.sId === changeValue[sFieldName]);
@@ -1188,7 +1197,14 @@ const TreeComponent = props =&gt; {
         }
         if (timeRef.current > 1) {
-          addState.slaveData = slaveDataNew;
+          addState.slaveData = slaveDataNew.map(item => {
+            const { sPackDetailPathUpLoad, sPackPath } = selectedNode;
+            return {
+              ...item,
+              ...(sPackDetailPathUpLoad ? { sPackDetailPathUpLoad } : {}),
+              ...(sPackPath ? { sPackPath } : {}),
+            };
+          });
           addState.extraParts = {};
           addState.calcPriceFinished = false;
           if (manyData.some(item => Object.keys(item).length > 4)) {
@@ -1516,12 +1532,6 @@ const BoxComponent = props =&gt; {
     viewRow: slaveRowData,
     tableName: `slaveUp${boxModel}`,
   };
-  console.log(
-    slaveConfig.gdsconfigformslave.filter(item => {
-      return item.iTag === 12;
-    }),
-    "slaveConfig.gdsconfigformslave"
-  );
   const getUpViewPropsByITag = iTag => {
     const config = slaveConfig.gdsconfigformslave
@@ -1567,7 +1577,7 @@ const BoxComponent = props =&gt; {
         }
         if (selectedNode.sTypeKey !== "juantong" && item.sName === "sPaperDirection") {
           return false;
-         }
+        }
         return item.iTag === iTag;
       });
@@ -1608,7 +1618,6 @@ const BoxComponent = props =&gt; {
       }
     }
     const newConfig = [...boxConfigList, ...config];
-    console.log(newConfig, "newConfig");
     return {
       ...props,
@@ -1624,7 +1633,6 @@ const BoxComponent = props =&gt; {
   // const upViewProps11 = getUpViewPropsByITag(11);
   // 印刷参数表单
   let upViewProps12 = getUpViewPropsByITag(12);
-  console.log("🚀 ~ upViewProps12:", upViewProps12);
   const filterConditions = {
     juantong: x =>
@@ -2119,7 +2127,7 @@ const BoxComponent = props =&gt; {
                 <div className={styles.viewTable1}>
                   <PrintParamsComponent {...props} />
                   <div className={styles.materialsLine}>
-                    <div className={styles.materialsViewTable}>
+                    <div className={styles.materialsViewTable} key={state.slaveUpKey}>
                       <CommonViewTable {...upViewProps12} />
                     </div>
                     <div className={styles.materialsBtns} style={{ width: "10%", height: "30px" }}></div>
@@ -2168,44 +2176,39 @@ const BoxComponent = props =&gt; {
                       </div>
                       {cailiaoyinshuaDiv}
                     </div>
-                    {bBox && (
-                      <div className={styles.boxPart1Right}>
-                        <div className={styles.boxRreview}>
-                          <Image.PreviewGroup>
-                            {svgProps.boxList.length ? (
-                              <div style={{ width: " 300px", height: "290px",lineHeight:'290px', backgroundColor: "#fff", borderRight: "1px solid #ccc" }}>
-                                <DynamicSVG {...svgProps} />
-                              </div>
-                            ) : (
-                              <div className={styles.noImg}>{noImage}</div>
-                            )}
-
-                            {/* <div className={styles.boxRreviewTitile}>展开图</div> */}
-                            {slaveRowData.sPackPath ? (
-                              // <Image width={300} src={slaveRowData.sPackPath} />
-
-                              <div style={{ width: "300px", height: "300px" }}>
-                                <Carousel dots style={{ width: "300px", height: "300px" }}>
-                                  {imagesData.map((image, index) => (
-                                    <div key={index} className="carousel-item">
-                                      <Image src={image.src} alt={image.alt} style={{ width: "300px", height: "290px" }}/>
-                                    </div>
-                                  ))}
-                                </Carousel>
-                              </div>
-                            ) : (
-                              <div className={styles.noImg}>{noImage}</div>
-                            )}
-                            {/* <div className={styles.boxRreviewTitile}>立体图</div> */}
-                          </Image.PreviewGroup>
-                        </div>
-                        {calcMethodDiv}
+                    <div className={styles.boxPart1Right}>
+                      <div className={styles.boxRreview}>
+                        <Image.PreviewGroup>
+                          {bBox ? (
+                            <>
+                              {svgProps.boxList.length ? (
+                                <div style={{ width: " 300px", height: "290px", backgroundColor: "#fff", borderRight: "1px solid #ccc" }}>
+                                  <DynamicSVG {...svgProps} />
+                                </div>
+                              ) : (
+                                <div className={styles.noImg}>{noImage}</div>
+                              )}
+                            </>
+                          ) : (
+                            ""
+                          )}
+                          {slaveRowData.sPackPath ? (
+                            <div style={{ width: "300px", height: "300px" }}>
+                              <Carousel dots style={{ width: "300px", height: "300px" }}>
+                                {imagesData.map((image, index) => (
+                                  <div key={index} className="carousel-item">
+                                    <Image src={image.src} alt={image.alt} style={{ width: "300px", height: "290px" }} />
+                                  </div>
+                                ))}
+                              </Carousel>
+                            </div>
+                          ) : (
+                            <div className={styles.noImg}>{noImage}</div>
+                          )}
+                        </Image.PreviewGroup>
                       </div>
-                    )}
-                    {/* <div style={{display:'block'}}>
-                  <Typesetting  {...boxProps} onSaveStates={handleSaveState} onSaveDPartsLength={onSaveDPartsLength}/>
-
-                    </div> */}
+                      {calcMethodDiv}
+                    </div>
                   </div>
                 </>
               );
@@ -2829,8 +2832,8 @@ const BoxModelSelectedModal = props =&gt; {
     const svgProps = {
       ...props,
       boxList,
-      dSvgBoxWidth: 150,
-      dSvgBoxHeight: 150,
+      dSvgBoxWidth: 100,
+      dSvgBoxHeight: 100,
       showNew: 1,
     };
     return svgProps;
@@ -2855,14 +2858,14 @@ const BoxModelSelectedModal = props =&gt; {
           column.render = (value, record, index) =>
             column.dataIndex === "sPackDetailPathUpLoad" ? (
               !value ? (
-                <div style={{ width: "auto", height: 150 }}>
+                <div style={{ width: "auto", height: 100 }}>
                   <DynamicSVG {...getSvgProps(selectBoxList[index])} />
                 </div>
               ) : (
-                <img src={value} alt="" width={150} height={150} />
+                <img src={value} alt="" width={100} height={100} />
               )
             ) : value ? (
-              <img src={value} alt="" width={150} height={150} />
+              <img src={value} alt="" width={100} height={100} />
             ) : (
               noImage
             );