矩形选择

陈鑫涛
1 parent b3ddd4a4
Showing 2 changed files with 16 additions and 75 deletions
src/components/Common/Typesetting/typesetting.js
src/components/QuickQuote/index.jsx
@@ -612,6 +612,8 @@ const Typesetting = props =&gt; {
     }
     const newDProductQty = masterData.dProductQty;
     const dMaterialsKQty = slaveDataDetail.dMaterialsKQty || 1;
+
+    
     if (
       dPartsLength !== innerWidth ||
       newMaterialLength !== materialLength ||
@@ -621,6 +623,8 @@ const Typesetting = props =&gt; {
       newDPortraitType !== dPortraitType ||
       (!dWlcd && sBillNo)
     ) {
+    console.log(slaveRowData.dMachineLength,'slaveRowData.dMachineLengthss');
+
       setMaterialLength(newMaterialLength);
       setMaterialWidth(newMaterialWidth);
       setMaterialName(sMaterialsName);
@@ -274,7 +274,7 @@ const QuickQuoteEvent = props =&gt; {
           dProductQty: changeValue.dProductQty,
         }));
       }
-
+    
       if (sFieldName === "dLength" || sFieldName === "dWidth" || sFieldName === "dHeight") {
         if (props.currentBoxModel) {
           const boxModel = props.currentBoxModel.replace("slaveUp", "").replace("slaveDown", "");
@@ -445,23 +445,7 @@ const QuickQuoteEvent = props =&gt; {
           materialWidth: sFieldName === "dWlkd" ? changeValue[sFieldName] : slaveData[saveIndex]?.dWlkd,
         };
       }
-      // 如果是卡牌那么赋值sMachineStyle
-      // if (selectedNode.sTypeKey === 'kapai' || selectedNode.sTypeKey === 'juantong') {
-      //   console.log(slaveData[saveIndex].dMaxLength,'juantong');
-        
-      //   if (slaveData[saveIndex].dMaxLength === undefined) {
-      //     slaveData[saveIndex] = {
-      //       ...slaveData[saveIndex],
-      //       dMaxLength: Number(selectedNode.sMachineStyle.split("*")[0]),
-      //     };
-      //   } 
-      //   if (slaveData[saveIndex].dMaxWidth === undefined) {
-      //     slaveData[saveIndex] = {
-      //       ...slaveData[saveIndex],
-      //       dMaxWidth: Number(selectedNode.sMachineStyle.split("*")[1]),
-      //     };
-      //   }
-      // }
+
       if (sFieldName === "sName") {
         slaveData[saveIndex] = {
           ...slaveData[saveIndex],
@@ -1162,6 +1146,7 @@ const QuickQuoteEvent = props =&gt; {
 // 入口
 const QuickQuote = baseProps => {
   const props = QuickQuoteEvent(baseProps);
+  console.log("🚀 ~ QuickQuote:", props);
   const [treeClassName, setTreeClassName] = useState("");
  
   // 监听页面滚动事件
@@ -1320,7 +1305,6 @@ const TreeComponent = props =&gt; {
         return {
           ...pre,
           ...addState,
-          sPrintConfig: downAbleConfigs.find(item => item.sType === "1" && item.sName === "胶印"),
           downAbleConfigs: downAbleConfigs
             .filter(item => item.sType === "2")
             .map((item, index) => ({
@@ -1516,7 +1500,7 @@ const MasterComponent = props =&gt; {
         item.iColValue = 4;
       }
     });
-  }
+  } 
   const lengthData = viewConfigs.find(x => x.sName === "dLength");
  
   if (selectedNode && selectedNode.sTypeKey && selectedNode.sTypeKey !== "danye") {
@@ -1572,10 +1556,13 @@ const BoxComponent = props =&gt; {
   const { bBox } = selectedNode;
   const [boxTypeList, setBoxTypeList] = useState([]);
   // 卡牌类卷筒类默认使用矩形 当是核价保存过的需要在主表数据加载完后在赋值
+  console.log(props, "asdadasd");
   const slaveRowData = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel) || {};
   const { sBillNo } = slaveRowData;
   useEffect(() => {
     if (selectedNode.sTypeKey === "kapai" || selectedNode.sTypeKey === "juantong") {
+        const {sBillNo} = slaveRowData
+      if(sBillNo) return
       let dropDownData = [];
       dropDownData.push(KapaiJson);
       const boxData = (dropDownData || []).map((item, index) => ({
@@ -2415,19 +2402,14 @@ const PrintParamsComponent = props =&gt; {
     const printParamsItem = printParams[i - 1];
     const viewRow = { ...(i === 0 ? slaveRowData : printParamsItem), sProductClassifyId: selectedNode.sId };
  
-    const viewTableId = "viewTableId_" + viewRow.sId;
     const viewProps = {
       ...props,
-      viewConfigs: printParamsConfig.map(item => ({ ...item, costomStyle: `xlyPrintParams${i}` })),
+      viewConfigs: printParamsConfig,
       tableConfig: { ...slaveConfig, gdsconfigformslave: printParamsConfig },
       iColValueView: 24,
       viewRow,
       tableName: `${i === 0 ? "slaveUp" : "slaveDown"}${boxModel}`,
       onDataChange: (...args) => {
-        setTimeout(() => {
-          const oLabel = document.querySelector(`#${viewTableId}`)?.querySelector(`.xlyPrintParams${i}`)?.querySelector(".ant-form-item-label");
-          oLabel?.click();
-        }, 200);
         if (i === 0) {
           props.onDataChange(...args);
           return;
@@ -2440,37 +2422,11 @@ const PrintParamsComponent = props =&gt; {
           return { ...pre, slaveData };
         });
       },
-      onCostomClick: (showConfig, { target }) => {
-        if (showConfig.sName !== "sPrint") return;
-        const className = target.getAttribute("class");
-        const nodeName = target.nodeName;
-        if (className?.includes("select") && nodeName === "DIV") return;
-
-        const { sPrintConfig } = state;
-
-        if (!sPrintConfig) return;
-        const backendConfigNew = {
-          sParentFieldsName: "sPrint",
-          sBoxModel: boxModel,
-          printParamsId: viewRow.sId,
-        };
-
-        const dropDownData = commonUtils.convertStrToObj(sPrintConfig.sChineseDropDown, []);
-        const dropDownDataSelected = dropDownData.find(item => item.sId === viewRow.sProcessId);
-        if (!dropDownDataSelected) return;
-        const backendParamsConfigNew = commonUtils.convertStrToObj(dropDownDataSelected.sParamConfig, []);
-
-        props.setState(pre => ({
-          ...pre,
-          backendParamsConfig: backendParamsConfigNew,
-          backendConfig: backendConfigNew,
-        }));
-      },
     };
  
     result.push(
       <div className={styles.materialsLine}>
-        <div className={styles.materialsViewTable} id={viewTableId}>
+        <div className={styles.materialsViewTable}>
           <CommonViewTable {...viewProps} />
         </div>
         <div className={styles.materialsBtns} style={{ width: "10%" }}>
@@ -3082,11 +3038,11 @@ const BoxModelSelectedModal = props =&gt; {
  
 // 后道参数额外配置
 const BackendParamsExtraComponent = props => {
-  const { state, slaveConfig } = props;
+  const { state, slaveConfig, boxModel } = props;
   const { backendParamsConfig = [], backendConfig = {}, slaveData, selectedNode } = state;
   if (!backendParamsConfig.length) return "";
  
-  const { sParentFieldsName, sBoxModel, printParamsId } = backendConfig;
+  const { sParentFieldsName, sBoxModel } = backendConfig;
  
   const slaveRowData = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === sBoxModel) || {};
   const { sBackProcessData = [] } = slaveRowData;
@@ -3108,12 +3064,9 @@ const BackendParamsExtraComponent = props =&gt; {
     tableConfig: { ...slaveConfig, gdsconfigformslave: viewConfigs },
     iColValueView: 24,
     getViewRow: config => {
-      if (sParentFieldsName === "sPrint") {
-        return [slaveRowData, ...sBackProcessData].find(item => item.sId === printParamsId);
-      }
       return sBackProcessData.find(item => item[sParentFieldsName])?.sBackendParams?.find(item => item.sParam === config.showName) || {};
     },
-    tableName: `sBackendParams${sBoxModel}`,
+    tableName: `sBackendParams${boxModel}`,
     getSqlDropDownData: (...args) => {
       const showConfig = args[2];
       const { sParamDropDown = "", sName } = showConfig;
@@ -3137,22 +3090,6 @@ const BackendParamsExtraComponent = props =&gt; {
     },
     onDataChange: (name, sFieldName, changeValue, sId, dropDownData, isWait) => {
       const iIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId);
-
-      if (sParentFieldsName === "sPrint") {
-        if (slaveData[iIndex].sId === printParamsId) {
-          let slaveDataNew = [...slaveData];
-          slaveDataNew[iIndex] = { ...slaveDataNew[iIndex], ...changeValue };
-          props.setState(pre => ({ ...pre, slaveData: slaveDataNew }));
-        } else {
-          const iIndex1 = sBackProcessData.findIndex(item => item.sId === printParamsId);
-          let sBackProcessDataNew = [...sBackProcessData];
-          sBackProcessDataNew[iIndex1] = { ...sBackProcessDataNew[iIndex1], ...changeValue };
-          slaveData[iIndex].sBackProcessData = sBackProcessDataNew;
-          props.setState(pre => ({ ...pre, slaveData }));
-        }
-        return;
-      }
-
       const iIndex1 = slaveData[iIndex].sBackProcessData.findIndex(item => item[sParentFieldsName]);
       const showConfig = viewConfigs.find(item => item.sName === sFieldName);
       const dropDownDataSelected = dropDownData?.length