Commit 23137225234f644f04b4aeff0dd91412dceaab91

Authored by 陈鑫涛
1 parent 192d288a

倍率

src/components/QuickQuote/index.jsx
@@ -274,7 +274,7 @@ const QuickQuoteEvent = props => { @@ -274,7 +274,7 @@ const QuickQuoteEvent = props => {
274 dProductQty: changeValue.dProductQty, 274 dProductQty: changeValue.dProductQty,
275 })); 275 }));
276 } 276 }
277 - 277 +
278 if (sFieldName === "dLength" || sFieldName === "dWidth" || sFieldName === "dHeight") { 278 if (sFieldName === "dLength" || sFieldName === "dWidth" || sFieldName === "dHeight") {
279 if (props.currentBoxModel) { 279 if (props.currentBoxModel) {
280 const boxModel = props.currentBoxModel.replace("slaveUp", "").replace("slaveDown", ""); 280 const boxModel = props.currentBoxModel.replace("slaveUp", "").replace("slaveDown", "");
@@ -1628,10 +1628,10 @@ const BoxComponent = props => { @@ -1628,10 +1628,10 @@ const BoxComponent = props => {
1628 { id: 1, name: "每本张数" }, 1628 { id: 1, name: "每本张数" },
1629 { id: 2, name: "片数" }, 1629 { id: 2, name: "片数" },
1630 ]; 1630 ];
1631 - if (Number(selectedNode.iRateType) === 0 && item.sName === "sMagnification") { 1631 + if (Number(selectedNode.iRateType) === 0 && item.sName === "iPage") {
1632 return false; 1632 return false;
1633 } else { 1633 } else {
1634 - if (item.sName === "sMagnification") { 1634 + if (item.sName === "iPage") {
1635 item.showName = rateList.find(rate => rate.id === Number(selectedNode.iRateType))?.name || "倍率"; 1635 item.showName = rateList.find(rate => rate.id === Number(selectedNode.iRateType))?.name || "倍率";
1636 } 1636 }
1637 } 1637 }
@@ -1709,7 +1709,7 @@ const BoxComponent = props => { @@ -1709,7 +1709,7 @@ const BoxComponent = props => {
1709 1709
1710 const filterConditions = { 1710 const filterConditions = {
1711 juantong: x => 1711 juantong: x =>
1712 - x.sName === "sMagnification" || 1712 + x.sName === "iPage" ||
1713 x.sName === "dPartsLength" || 1713 x.sName === "dPartsLength" ||
1714 x.sName === "dPartsWidth" || 1714 x.sName === "dPartsWidth" ||
1715 x.sName === "dRowGap" || 1715 x.sName === "dRowGap" ||
@@ -1719,7 +1719,7 @@ const BoxComponent = props => { @@ -1719,7 +1719,7 @@ const BoxComponent = props => {
1719 default: x => 1719 default: x =>
1720 x.sName === "sPaperDirection" || 1720 x.sName === "sPaperDirection" ||
1721 x.sName === "dBleed" || 1721 x.sName === "dBleed" ||
1722 - x.sName === "sMagnification" || 1722 + x.sName === "iPage" ||
1723 x.sName === "dPartsLength" || 1723 x.sName === "dPartsLength" ||
1724 x.sName === "dPartsWidth" || 1724 x.sName === "dPartsWidth" ||
1725 x.sName === "dSumPQty", 1725 x.sName === "dSumPQty",
src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
@@ -2664,6 +2664,7 @@ class QuotationPackTableTree extends Component { @@ -2664,6 +2664,7 @@ class QuotationPackTableTree extends Component {
2664 materialsConfig, materialsData, materialsDelData, processConfig, processData, processDelData, colorConfig, 2664 materialsConfig, materialsData, materialsDelData, processConfig, processData, processDelData, colorConfig,
2665 colorData, colorDelData, packConfig, packData, packDelData, 2665 colorData, colorDelData, packConfig, packData, packDelData,
2666 } = this.props; 2666 } = this.props;
  2667 + console.log("🚀 ~ QuotationPackTableTree ~ handleButtonClick= ~ slaveData:", slaveData)
2667 const data = []; 2668 const data = [];
2668 slaveConfig.gdsconfigformslave.forEach((itemConfig) => { 2669 slaveConfig.gdsconfigformslave.forEach((itemConfig) => {
2669 slaveData.filter(itemData => itemData.handleType === 'add' || itemData.handleType === 'update').forEach((itemData) => { 2670 slaveData.filter(itemData => itemData.handleType === 'add' || itemData.handleType === 'update').forEach((itemData) => {