From cb2f69c5f841d6bfd5bd45fabecc7e27d02b69f5 Mon Sep 17 00:00:00 2001
From: 陈鑫涛 <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Fri, 4 Jul 2025 09:02:18 +0800
Subject: [PATCH] 修改材料
---
src/components/Common/BoxDesignCompontent/svg.js | 4 ++++
src/components/Common/Typesetting/typesetting.js | 4 +---
src/components/QuickQuote/index.css | 28 ++++++++++++++++++++++++++--
src/components/QuickQuote/index.jsx | 15 +++++++++------
src/components/QuickQuote/index.less | 7 ++++++-
5 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/src/components/Common/BoxDesignCompontent/svg.js b/src/components/Common/BoxDesignCompontent/svg.js
index 5e09d3b..6691083 100644
--- a/src/components/Common/BoxDesignCompontent/svg.js
+++ b/src/components/Common/BoxDesignCompontent/svg.js
@@ -288,6 +288,10 @@ const SvgBox = props => {
svgContainerRef.current.style.transformOrigin = "top left";
svgContainerRef.current.style.paddingTop = dSvgBoxWidth ? "0" : "25px";
svgContainerRef.current.style.backgroundColor = props.isMobile ? "#EDF4FF" : "";
+ // svgContainerRef.current.style.position = 'absolute';
+ // svgContainerRef.current.style.left = '50%';
+ // svgContainerRef.current.style.top = '50%';
+ // svgContainerRef.current.style.transform = 'translate(-50%, -50%)';
} else if (props.showNew === 2) {
// g.setAttribute("transform", `rotate(${iFAngle, dSvgBoxWidth/2,dSvgBoxHeight*2})`);
let ySvg = topOffect(boxList, boxLength, boxWidth, boxHeight) * scale;
diff --git a/src/components/Common/Typesetting/typesetting.js b/src/components/Common/Typesetting/typesetting.js
index 3515f81..853220b 100644
--- a/src/components/Common/Typesetting/typesetting.js
+++ b/src/components/Common/Typesetting/typesetting.js
@@ -612,8 +612,7 @@ const Typesetting = props => {
newMaterialWidth !== materialWidth ||
materialName !== sMaterialsName ||
newDHorizontalType !== dHorizontalType ||
- newDPortraitType !== dPortraitType ||
- oldVariables !== JSON.stringify(slaveRowData)
+ newDPortraitType !== dPortraitType
) {
setMaterialLength(newMaterialLength);
setMaterialWidth(newMaterialWidth);
@@ -622,7 +621,6 @@ const Typesetting = props => {
setDPartsLength(innerWidth);
setNewDHorizontalType(dHorizontalType);
setNewDPortraitType(dPortraitType);
- setOldVariables(JSON.stringify(slaveRowData));
// setDMaterialsKQty(newDMaterialsKQty)
const scaleX = (clientWidth - 50) / (outerWidth + 110);
const scaleY = (clientHeight - 5) / (outerHeight + 90);
diff --git a/src/components/QuickQuote/index.css b/src/components/QuickQuote/index.css
index 1377d6d..6c68d99 100644
--- a/src/components/QuickQuote/index.css
+++ b/src/components/QuickQuote/index.css
@@ -15,6 +15,10 @@
.quickQuote .content :global .ant-col-23 {
display: flex !important;
}
+.quickQuote .content :global .ant-divider {
+ margin: 0 0 5px 0;
+ height: 26px;
+}
.quickQuote .content .back {
position: absolute;
top: 5px;
@@ -39,6 +43,9 @@
.quickQuote .content .rightContent .tabs {
height: auto;
}
+.quickQuote .content .rightContent .tabs :global .ant-tabs .ant-tabs-nav {
+ margin-bottom: 0;
+}
.quickQuote .content .rightContent .tabs :global .ant-tabs-nav-wrap {
padding-left: 20px;
}
@@ -82,6 +89,7 @@
}
.quickQuote .content .rightContent .viewTableDownView :global .viewStyle,
.quickQuote .content .rightContent .viewTableDownView1 :global .viewStyle {
+ margin-top: 0 !important;
padding-right: 14px;
}
.quickQuote .content .rightContent .viewTableDownView :global .viewStyle .ant-form-item-label,
@@ -139,13 +147,16 @@
.quickQuote .content .rightContent .viewTableDownView2 {
background-color: #3275b734;
}
+.quickQuote .content .rightContent .viewTableDownView2 :global .viewStyle {
+ margin-top: 5px !important;
+}
.quickQuote .content .rightContent .viewTable1 {
padding: 0 20px 0 0;
}
.quickQuote .content .rightContent .boxRadio {
width: 100%;
height: 30px;
- padding: 10px 0 0 10px;
+ padding: 5px 0 0 10px;
}
.quickQuote .content .rightContent .boxPart1 {
width: 100%;
@@ -166,6 +177,12 @@
height: auto;
display: flex;
}
+.quickQuote .content .rightContent .boxPart1 .boxPart1Right .boxRreview .svgBox {
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+}
.quickQuote .content .rightContent .boxPart1 .boxPart1Right .boxRreview :global .ant-carousel .slick-dots li button {
background-color: #000;
/* 未激活时的指示器颜色 */
@@ -251,7 +268,7 @@
}
.quickQuote .content .rightContent .many .btns {
position: absolute;
- top: -50px;
+ top: -40px;
right: 10px;
height: 40px;
min-width: 40px;
@@ -275,6 +292,9 @@
.quickQuote .content .rightContent .materialsLine .materialsViewTable {
flex: 1;
}
+.quickQuote .content .rightContent .materialsLine .materialsViewTable :global .viewStyle {
+ margin-top: 0 !important;
+}
.quickQuote .content .rightContent .materialsLine .materialsViewTable :global .ant-col-4 .ant-col-7 {
flex-basis: 50px !important;
}
@@ -357,6 +377,10 @@
width: calc(100% - 200px);
height: 100%;
}
+.boxModal .boxTable :global .ant-table-body tr .ant-table-cell:nth-child(3),
+.boxModal .boxTable :global .ant-table-body tr .ant-table-cell:nth-child(4) {
+ text-align: center;
+}
.downOperations {
position: absolute;
top: 6px;
diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx
index f6bf646..ae7cd49 100644
--- a/src/components/QuickQuote/index.jsx
+++ b/src/components/QuickQuote/index.jsx
@@ -763,7 +763,7 @@ const QuickQuoteEvent = props => {
slaveRowData.dMachineQty = item.dMachineQty;
slaveRowData.dAuxiliaryQty = item.materialsInfo?.[0]?.dAuxiliaryQty;
slaveRowData.sPrint = item.sProcessName;
- if (bCalculatingArea) {
+ if (!bCalculatingArea) {
// todo 核价成功后 判断bSpecialRules 为false 就要给材料长材料款赋值
// partsNewInfo
slaveRowData.dWlcd = item.dMaterialsLength;
@@ -1922,8 +1922,8 @@ const BoxComponent = props => {
100
).toFixed(2)
),
- dWlcd:slaveData[index].dWlcd || dWlcd,
- dWlkd: slaveData[index].dWlkd || dWlkd,
+ dWlcd: dWlcd,
+ dWlkd: dWlkd,
dMachineQty: Math.floor(dProductQty / dSinglePQty),
dSinglePQty: dSinglePQty,
dMaterialsKQty: dMaterialsKQty,
@@ -2095,7 +2095,7 @@ const BoxComponent = props => {
...props,
boxList,
dSvgBoxWidth: 300,
- dSvgBoxHeight: 290,
+ dSvgBoxHeight: 200,
showNew: 1,
};
// upViewProps.viewRow =
@@ -2192,12 +2192,15 @@ const BoxComponent = props => {
style={{
width: " 300px",
height: "290px",
- lineHeight: "290px",
backgroundColor: "#fff",
borderRight: "1px solid #ccc",
+ position:'relative'
}}
>
-
+
+
+
+
) : (
{noImage}
diff --git a/src/components/QuickQuote/index.less b/src/components/QuickQuote/index.less
index 757e595..bcb1b84 100644
--- a/src/components/QuickQuote/index.less
+++ b/src/components/QuickQuote/index.less
@@ -226,7 +226,12 @@
height: auto;
display: flex;
// align-items: center;
-
+ .svgBox{
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+ }
:global .ant-carousel .slick-dots li button {
background-color: #000;
/* 未激活时的指示器颜色 */
--
libgit2 0.22.2