默认使用刀版图

陈鑫涛
1 parent 7447756d
Showing 8 changed files with 74 additions and 48 deletions
src/components/Common/Typesetting/typesetting.js
src/components/QuickQuote/index.css
src/components/QuickQuote/index.jsx
src/components/QuickQuote/index.less
src/mobile/components/SelectInput.jsx
src/mobile/quotation/detailNew.jsx
src/mobile/quotation/quotationDetail.css
src/mobile/quotation/quotationDetail.less
@@ -5,7 +5,6 @@ import { VerticalRightOutlined, VerticalLeftOutlined, LeftOutlined, RightOutline
 import * as commonUtils from "@/utils/utils"; /* 通用方法 */
 import commonConfig from "@/utils/config";
 import styles from "./index.less";
-// import DynamicSVG from "../../Common/BoxDesign/index";
 import DynamicSVG from "../../Common/BoxDesignCompontent/svg";
 import * as commonFunc from "@/components/Common/commonFunc";
@@ -38,6 +37,7 @@ const Typesetting = props =&gt; {
     sPackDetailPath,
     sColumnNameConfig,
     bAdvancedSetting, // 高级设置
+    sSvgPath,
   } = slaveRowData;
   const { masterData, selectedNode, slaveData } = state;
@@ -336,10 +336,12 @@ const Typesetting = props =&gt; {
       }}
     >
       <div style={{ transform: `rotateZ(${offsetZ}deg)` }}>
-        <DynamicSVG {...svgProps} />
+        {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width="100%" height="100%" />}
+        {/* <DynamicSVG {...svgProps} /> */}
       </div>
     </div>
   );
+  
   const createBox = (col, row, index, leftPosition, topPosition, offsetZ, icon) => (
     <div
       key={`${col}-${row}-${index}`}
@@ -373,7 +375,7 @@ const Typesetting = props =&gt; {
         }}
       >
         <div style={{ transform: `rotateZ(${iFAngle}deg)` }}>
-          <DynamicSVG {...svgProps} />
+          {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width="100%" height="100%" />}
         </div>
       </div>
       <div
@@ -387,12 +389,12 @@ const Typesetting = props =&gt; {
           position: "absolute",
           left: `${isVertical ? dSLengthOffset + dYBJJ : jInnerWidth + dFLengthOffset + dSLengthOffset + dYBJJ}px`,
           top: `${
-            isVertical ? jInnerHeight + dXBJJ + dFWidthOffset + dSWidthOffset : iSAngle === 90 || iSAngle === 270 ? 0 : dSWidthOffset + dXBJJ
+            isVertical ? jInnerHeight + dXBJJ + dFWidthOffset + dSWidthOffset : iSAngle === 90 || iSAngle === 270 ? dSWidthOffset : dSWidthOffset + dXBJJ
           }px`,
         }}
       >
         <div style={{ transform: `rotateZ(${iSAngle}deg)` }}>
-          <DynamicSVG {...svgProps} />
+          {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width="100%" height="100%" />}
         </div>
       </div>
     </div>
@@ -432,7 +434,7 @@ const Typesetting = props =&gt; {
         {/* <img src={icon} width="100%" height="100%" /> */}
         {/* {isSvg ? <DynamicSVG {...props} /> : <img src={icon} width="100%" height="100%" />} */}
         <div style={{ transform: `rotateZ(${iFAngle}deg)` }}>
-          <DynamicSVG {...svgProps} />
+          {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width="100%" height="100%" />}
         </div>
       </div>
     </div>
@@ -63,13 +63,14 @@
 .quickQuote .content .rightContent .viewTable1 :global .ant-form-item-label {
   background-color: transparent !important;
   color: #000 !important;
-  flex: 0 0 100px !important;
-  max-width: 100px !important;
+  flex: 0 0 70px !important;
+  max-width: 70px !important;
+  text-align: right !important;
 }
 .quickQuote .content .rightContent .viewTable :global .ant-form-item-control,
 .quickQuote .content .rightContent .viewTable1 :global .ant-form-item-control {
   flex: 1;
-  max-width: calc(100% - 100px);
+  max-width: calc(100% - 70x);
 }
 .quickQuote .content .rightContent .viewTable :global .viewStyle .ant-input-number,
 .quickQuote .content .rightContent .viewTable1 :global .viewStyle .ant-input-number {
@@ -166,6 +167,10 @@
   display: flex;
   align-items: center;
 }
+.quickQuote .content .rightContent .boxPart1 .boxPart1Right .boxRreview :global .ant-carousel .slick-dots li button {
+  background-color: #000;
+  /* 未激活时的指示器颜色 */
+}
 .quickQuote .content .rightContent .boxPart1 .boxPart1Right .boxRreview :global .ant-image {
   padding: 15px;
 }
@@ -244,7 +249,7 @@
 }
 .quickQuote .content .rightContent .many {
   width: 100%;
-  height: 235px;
+  height: 185px;
   padding: 0 10px 0 10px;
   position: relative;
 }
 /* eslint-disable */
 import { useRef, useEffect, useState, useCallback, useMemo } from "react";
-import { Button, Divider, Tabs, Tree, Radio, Image, Modal, Input, message, Badge, Checkbox } from "antd-v4";
+import { Button, Divider, Tabs, Tree, Radio, Image, Modal, Input, message, Badge, Checkbox, Carousel } from "antd-v4";
 import { ArrowLeftOutlined, FolderFilled, FolderOpenFilled, FileTextFilled, PlusOutlined, MinusOutlined } from "@ant-design/icons";
 import { cloneDeep } from "lodash";
 import commonConfig from "@/utils/config";
@@ -479,7 +479,7 @@ const QuickQuoteEvent = props =&gt; {
   // 核价按钮
   addState.handleCalcPrice = async () => {
     const { masterConfig, masterData = {}, slaveConfig, slaveData = [], selectedNode = {}, extraParts = {} } = state;
-    const selectProduct = commonFunc.showLocalMessage(props, 'selectProduct', '请先选择产品');
+    const selectProduct = commonFunc.showLocalMessage(props, "selectProduct", "请先选择产品");
     if (commonUtils.isEmptyObject(selectedNode)) {
       message.error(selectProduct, 2);
       return;
@@ -1204,7 +1204,7 @@ const TreeComponent = props =&gt; {
 const ContentComponent = props => {
   const { selectedNode = {}, extraParts = {} } = props.state;
   const manyqtysInfo = props.getI18nName("manyqtysInfo", "多数量报价");
-  const selectProduct = commonFunc.showLocalMessage(props, 'selectProduct', '请先选择产品');
+  const selectProduct = commonFunc.showLocalMessage(props, "selectProduct", "请先选择产品");
   const { showName } = selectedNode;
   const extraPartsList = extraParts[showName] || [];
   let { sAllPartsName = "" } = selectedNode;
@@ -1316,7 +1316,7 @@ const ContentComponent = props =&gt; {
 // 主表组件
 const MasterComponent = props => {
   const { masterConfig, masterData = {}, selectedNode = {} } = props.state;
-  const { app }= props;
+  const { app } = props;
   if (!masterConfig) return "";
   const ableConfigs = masterConfig.gdsconfigformslave.filter(item => item.sName && item.bVisible);
@@ -1344,7 +1344,7 @@ const MasterComponent = props =&gt; {
       lengthData.showName = "高(D)";
       lengthData.sChinese = "高(D)";
       lengthData.sEnglish = "Height (D)";
-      if(app.userinfo?.sLanguage === 'sEnglish') {
+      if (app.userinfo?.sLanguage === "sEnglish") {
         lengthData.showName = lengthData.sEnglish;
       }
     }
@@ -1353,7 +1353,7 @@ const MasterComponent = props =&gt; {
       lengthData.showName = "长(L)";
       lengthData.sChinese = "长(L)";
       lengthData.sEnglish = "Length (L)";
-      if(app.userinfo?.sLanguage === 'sEnglish') {
+      if (app.userinfo?.sLanguage === "sEnglish") {
         lengthData.showName = lengthData.sEnglish;
       }
     }
@@ -1477,7 +1477,7 @@ const BoxComponent = props =&gt; {
         if (item.sName === "sPaperDirection" && selectedNode.sTypeKey === "huace") {
           return false;
         }
-       
+
         // 判断bPartsDimension 是否显示展长展宽，0不显示，1显示
         if (selectedNode.bPartsDimension === false && (item.sName === "dPartsLength" || item.sName === "dPartsWidth")) {
@@ -1496,9 +1496,9 @@ const BoxComponent = props =&gt; {
       if (selectedNode.sProductType === "不干胶") {
         showNameKeyList = ["dZBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"];
       }
-      const UlToolPosition = commonFunc.showLocalMessage(props, 'UlToolPosition', '上下刀位');
-      const RLToolPosition = commonFunc.showLocalMessage(props, 'RLToolPosition', '左右刀位');
-      const LeftMargin = commonFunc.showLocalMessage(props, 'LeftMargin', '左右刀位');
+      const UlToolPosition = commonFunc.showLocalMessage(props, "UlToolPosition", "上下刀位");
+      const RLToolPosition = commonFunc.showLocalMessage(props, "RLToolPosition", "左右刀位");
+      const LeftMargin = commonFunc.showLocalMessage(props, "LeftMargin", "左右刀位");
       boxConfigList = boxConfig?.gdsconfigformslave?.filter(item => item.bVisible && showNameKeyList.includes(item.sName)) || [];
       if (selectedNode.sProductType === "不干胶") {
         const mappings = {
@@ -1549,9 +1549,10 @@ const BoxComponent = props =&gt; {
       x.sName === "dPartsWidth" ||
       x.sName === "dRowGap" ||
       x.sName === "dColGap" ||
-       x.sName === "dBleed" ||
+      x.sName === "dBleed" ||
       x.sName === "sPaperDirection",
-    default: x => x.sName === "dBleed" || x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth" || x.sName === "dSumPQty",
+    default: x =>
+      x.sName === "dBleed" || x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth" || x.sName === "dSumPQty",
   };
   if (selectedNode.sProductType === "不干胶") {
     upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(filterConditions.juantong);
@@ -1559,7 +1560,7 @@ const BoxComponent = props =&gt; {
   if (!(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {
     upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(filterConditions.default);
   }
- 
+
   // 拼板信息表单
   const upViewProps20 = getUpViewPropsByITag(20);
   // 如果是卷筒类需要单独处理
@@ -1995,16 +1996,16 @@ const BoxComponent = props =&gt; {
   const isShowImg = boxList.find(x => x.sName === "盒身")?.type !== "" || false;
   const PrintingParameters = props.getI18nName("PrintingParameters", "印刷参数");
-  const BoxInformation = commonFunc.showLocalMessage(props, 'Box-typeInformation', '拼版信息');
-  const ImpositionInformation = commonFunc.showLocalMessage(props, 'ImpositionInformation', '拼版信息');
+  const BoxInformation = commonFunc.showLocalMessage(props, "Box-typeInformation", "拼版信息");
+  const ImpositionInformation = commonFunc.showLocalMessage(props, "ImpositionInformation", "拼版信息");
-  const noImage = commonFunc.showLocalMessage(props, 'ImpositionInformation', '暂无图片');
+  const noImage = commonFunc.showLocalMessage(props, "ImpositionInformation", "暂无图片");
-  // props.setState(prevState => ({
-  //   ...prevState,
-  //   svgBoxList: boxList,
-  // }));
+  const imagesData = [
+    { src: slaveRowData.sPackDetailPathUpLoad, alt: "展开图" },
+    { src: slaveRowData.sPackPath, alt: "立体图" },
+  ];
   return (
     <Tabs
       key={boxModel}
@@ -2079,9 +2080,7 @@ const BoxComponent = props =&gt; {
                       <div className={styles.boxPart1Right}>
                         <div className={styles.boxRreview}>
                           <Image.PreviewGroup>
-                            {!isShowImg ? (
-                              <Image width={300} src={slaveRowData.sPackDetailPathUpLoad} />
-                            ) : svgProps.boxList.length ? (
+                            {svgProps.boxList.length ? (
                               <div style={{ width: " 300px", height: "300px" }}>
                                 <DynamicSVG {...svgProps} />
                               </div>
@@ -2099,7 +2098,16 @@ const BoxComponent = props =&gt; {
                             )} */}
                             {/* <div className={styles.boxRreviewTitile}>展开图</div> */}
                             {slaveRowData.sPackPath ? (
-                              <Image width={300} src={slaveRowData.sPackPath} />
+                              // <Image width={300} src={slaveRowData.sPackPath} />
+                        
+                              <Carousel style={{ width: "300px", height: "300px" }} className={styles.carousel} dots>
+                               {   imagesData.map((image, index) => (
+                                  <div key={index} className="carousel-item">
+                                  <Image width={300} src={image.src} alt={image.alt} />
+                                  </div>
+                                ))
+                              }
+                              </Carousel>
                             ) : (
                               <div className={styles.noImg}>{noImage}</div>
                             )}
@@ -2603,11 +2611,11 @@ const BoxModelSelectedModal = props =&gt; {
   const [boxData, setBoxData] = useState([]);
   const [treeClassName, setTreeClassName] = useState("");
   const [boxTypeSelected, setBoxTypeSelected] = useState("全部");
-  const UniqueID = commonFunc.showLocalMessage(props, 'UniqueID', '唯一ID');
-  const sName = commonFunc.showLocalMessage(props, 'jurCon', '名称');
-  const KnifeLineChart = commonFunc.showLocalMessage(props, 'KnifeLineChart', '刀线图');
-  const ThreeDGraph = commonFunc.showLocalMessage(props, '3DGraph', '3D图');
-  const BtnOperations = commonFunc.showLocalMessage(props, 'BtnOperations', '操作');
+  const UniqueID = commonFunc.showLocalMessage(props, "UniqueID", "唯一ID");
+  const sName = commonFunc.showLocalMessage(props, "jurCon", "名称");
+  const KnifeLineChart = commonFunc.showLocalMessage(props, "KnifeLineChart", "刀线图");
+  const ThreeDGraph = commonFunc.showLocalMessage(props, "3DGraph", "3D图");
+  const BtnOperations = commonFunc.showLocalMessage(props, "BtnOperations", "操作");
   useEffect(() => {
     const boxList = [
@@ -2742,7 +2750,7 @@ const BoxModelSelectedModal = props =&gt; {
     return svgProps;
   };
   const selectBoxList = boxData.filter(item => (boxTypeSelected === "全部" ? true : (item.sBoxType || "其它") === boxTypeSelected));
-  const noImage = commonFunc.showLocalMessage(props, 'ImpositionInformation', '暂无图片');
+  const noImage = commonFunc.showLocalMessage(props, "ImpositionInformation", "暂无图片");
   const tableProps = {
     ...commonBusiness.getTableTypes("box", {
       ...props,
@@ -2757,10 +2765,11 @@ const BoxModelSelectedModal = props =&gt; {
       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" ? (
-              selectBoxList[index].sTypes ? (
+              !value ? (
                 <div style={{ width: "auto", height: 150 }}>
                   <DynamicSVG {...getSvgProps(selectBoxList[index])} />
                 </div>
@@ -2794,8 +2803,8 @@ const BoxModelSelectedModal = props =&gt; {
         });
     },
   };
-  const BoxSelection = commonFunc.showLocalMessage(props, 'Box-TypeSelection', '盒型选择');
-  const BtnClose = commonFunc.showLocalMessage(props, 'BtnClose', '关闭');
+  const BoxSelection = commonFunc.showLocalMessage(props, "Box-TypeSelection", "盒型选择");
+  const BtnClose = commonFunc.showLocalMessage(props, "BtnClose", "关闭");
   return (
     <AntdDraggableModal
       width="min(calc(100vw - 350px), 1100px)"
@@ -207,7 +207,9 @@
             height: auto;
             display: flex;
             align-items: center;
-
+            :global .ant-carousel .slick-dots li button  {
+              background-color: #000; /* 未激活时的指示器颜色 */
+            }
             :global {
               .ant-image {
                 padding: 15px;
@@ -373,7 +375,7 @@
 .boxTree {
   width: 250px;
   height: 100%;
-   background: var(--xly-skin-header-color, #383d41);
+  background: var(--xly-skin-header-color, #383d41);
   padding: 10px 0 0 10px;
   overflow: hidden;
@@ -73,6 +73,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, data.sId, coplyColumns);
     setVisible(false);
   };
@@ -151,6 +152,7 @@ const SelectInput = props =&gt; {
     } else {
       if (sDropDownType === "sql") {
         const { sSqlCondition } = itemDetail;
+        
         if (sSqlCondition) {
           const { viewRow } = props;
           const keys = sSqlCondition.split(",").map(sSqlCondition => sSqlCondition.split(".")[1]);
@@ -1109,7 +1109,6 @@ const QuotationDetail = props =&gt; {
       lengthData.showName = "长(L)";
       lengthData.sChinese = "长(L)";
       lengthData.sEnglish = "Length (L)";
-      console.log('23323', app);
       if(app.userinfo?.sLanguage === 'sEnglish') {
         lengthData.showName = lengthData.sEnglish;
       }
@@ -2303,7 +2302,7 @@ const PrintParamsComponent = props =&gt; {
   const result = [];
   for (let i = 0; i < printParams.length + 1; i++) {
     const printParamsItem = printParams[i - 1];
-    const viewRow = { ...(i === 0 ? slaveRowData : printParamsItem), sProductClassifyId: selectedNode.sId };
+    const viewRow = { ...(i === 0 ? slaveRowData : printParamsItem), sProductClassifyId: selectedNode.sId,sProcessId:i === 0 ? slaveRowData.sId : printParamsItem.sId};
     const viewProps = {
       ...props,
@@ -2481,7 +2480,10 @@ const MaterialsComponent = props =&gt; {
     return (
       <div>
-        材料信息
+        <div className={styles.boxTitle}>
+          材料信息
+          <EditFill color="#BFBFBF" style={{ marginLeft: "1rem" }} />
+        </div>
         <div className={styles.materialsLine}>
           <div className={styles.selectInput} style={{ width: "50%" }}>
             <SelectInput {...viewProps} itemDetail={materialsConfigNew[0]} />
@@ -4,6 +4,8 @@
 }
 .customer {
   margin-top: 0.5rem;
+  font-size: 1.25rem;
+  font-weight: 600;
 }
 .customer :global .adm-input-element {
   border: 1px solid #dededf;
@@ -6,6 +6,8 @@
 }
 .customer {
   margin-top: 0.5rem;
+  font-size: 1.25rem;
+  font-weight: 600;
   :global .adm-input-element {
     border: 1px solid #dededf;
     height: 3.125rem;