diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js index 8d5f4ce..ded9044 100644 --- a/src/components/Common/CommonBillEvent.js +++ b/src/components/Common/CommonBillEvent.js @@ -5111,6 +5111,7 @@ export default (ChildComponent) => { slaveDataNew.push(tableDataRow); }); addState.slaveData = slaveDataNew; + addState.slaveDelData = slaveDelData; } else { this.props.getServiceError(dataReturn); } diff --git a/src/components/Common/Typesetting/typesetting.js b/src/components/Common/Typesetting/typesetting.js index e071556..0b2d3dc 100644 --- a/src/components/Common/Typesetting/typesetting.js +++ b/src/components/Common/Typesetting/typesetting.js @@ -7,6 +7,7 @@ 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"; const Typesetting = props => { const { @@ -666,10 +667,11 @@ const Typesetting = props => { isShow, "isMax" ); + const confirmParam = commonFunc.showLocalMessage(props, 'confirmParam', '排版尺寸大于上机尺寸,请确认参数!'); if (isCustomized && !isShow) { if (isMobile) return; - message.error("排版尺寸大于上机尺寸,请确认参数!"); + message.error( confirmParam); } const onClick = () => { if (isMobile) return; @@ -996,7 +998,7 @@ const Typesetting = props => { wordBreak: "break-all", // 确保长单词换行 }} > - 排版尺寸大于上机尺寸,请确认参数! + {confirmParam} )} diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index 4a25e9f..dad2437 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -1316,6 +1316,7 @@ const ContentComponent = props => { // 主表组件 const MasterComponent = props => { const { masterConfig, masterData = {}, selectedNode = {} } = props.state; + const { app }= props; if (!masterConfig) return ""; const ableConfigs = masterConfig.gdsconfigformslave.filter(item => item.sName && item.bVisible); @@ -1343,12 +1344,18 @@ const MasterComponent = props => { lengthData.showName = "高(D)"; lengthData.sChinese = "高(D)"; lengthData.sEnglish = "Height (D)"; + if(app.userinfo?.sLanguage === 'sEnglish') { + lengthData.showName = lengthData.sEnglish; + } } } else { if (lengthData) { lengthData.showName = "长(L)"; lengthData.sChinese = "长(L)"; lengthData.sEnglish = "Length (L)"; + if(app.userinfo?.sLanguage === 'sEnglish') { + lengthData.showName = lengthData.sEnglish; + } } } const viewProps = { @@ -1991,6 +1998,8 @@ const BoxComponent = props => { const BoxInformation = commonFunc.showLocalMessage(props, 'Box-typeInformation', '拼版信息'); const ImpositionInformation = commonFunc.showLocalMessage(props, 'ImpositionInformation', '拼版信息'); + const noImage = commonFunc.showLocalMessage(props, 'ImpositionInformation', '暂无图片'); + // props.setState(prevState => ({ // ...prevState, @@ -2077,7 +2086,7 @@ const BoxComponent = props => { ) : ( -
暂无图片
+
{noImage}
)} {/* {svgProps.boxList.length ? ( slaveRowData.sPackDetailPathUpLoad ? @@ -2092,7 +2101,7 @@ const BoxComponent = props => { {slaveRowData.sPackPath ? ( ) : ( -
暂无图片
+
{noImage}
)} {/*
立体图
*/} @@ -2733,6 +2742,7 @@ const BoxModelSelectedModal = props => { return svgProps; }; const selectBoxList = boxData.filter(item => (boxTypeSelected === "全部" ? true : (item.sBoxType || "其它") === boxTypeSelected)); + const noImage = commonFunc.showLocalMessage(props, 'ImpositionInformation', '暂无图片'); const tableProps = { ...commonBusiness.getTableTypes("box", { ...props, @@ -2760,7 +2770,7 @@ const BoxModelSelectedModal = props => { ) : value ? ( ) : ( - "暂无图片" + noImage ); }); diff --git a/src/components/QuickQuote/index.less b/src/components/QuickQuote/index.less index f246597..03d9e36 100644 --- a/src/components/QuickQuote/index.less +++ b/src/components/QuickQuote/index.less @@ -81,13 +81,14 @@ .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; } .ant-form-item-control { flex: 1; - max-width: calc(100% - 100px); + max-width: calc(100% - 70x); } .viewStyle { diff --git a/src/mobile/quotation/detailNew.jsx b/src/mobile/quotation/detailNew.jsx index 8cc38d8..2eee390 100644 --- a/src/mobile/quotation/detailNew.jsx +++ b/src/mobile/quotation/detailNew.jsx @@ -1077,6 +1077,7 @@ const QuotationAllprogressDetail = baseProps => { const QuotationDetail = props => { const { masterConfig, masterData = {}, selectedNode = {} } = props.state; + const { app } = props; if (!masterConfig) return ""; const ableConfigs = masterConfig.gdsconfigformslave.filter(item => item.sName && item.bVisible); // 处理长宽样式 @@ -1099,12 +1100,19 @@ const QuotationDetail = props => { lengthData.showName = "高(D)"; lengthData.sChinese = "高(D)"; lengthData.sEnglish = "Height (D)"; + if(app.userinfo?.sLanguage === 'sEnglish') { + lengthData.showName = lengthData.sEnglish; + } } } else { if (lengthData) { lengthData.showName = "长(L)"; lengthData.sChinese = "长(L)"; lengthData.sEnglish = "Length (L)"; + console.log('23323', app); + if(app.userinfo?.sLanguage === 'sEnglish') { + lengthData.showName = lengthData.sEnglish; + } } } const viewProps = {