Commit 3efe009bc2aba0069258c4626df7dbb71d1bd613

Authored by Min
1 parent baf4a6d6

1.完善报价提示翻译

src/components/Common/CommonBillEvent.js
... ... @@ -5111,6 +5111,7 @@ export default (ChildComponent) => {
5111 5111 slaveDataNew.push(tableDataRow);
5112 5112 });
5113 5113 addState.slaveData = slaveDataNew;
  5114 + addState.slaveDelData = slaveDelData;
5114 5115 } else {
5115 5116 this.props.getServiceError(dataReturn);
5116 5117 }
... ...
src/components/Common/Typesetting/typesetting.js
... ... @@ -7,6 +7,7 @@ import commonConfig from "@/utils/config";
7 7 import styles from "./index.less";
8 8 // import DynamicSVG from "../../Common/BoxDesign/index";
9 9 import DynamicSVG from "../../Common/BoxDesignCompontent/svg";
  10 +import * as commonFunc from "@/components/Common/commonFunc";
10 11  
11 12 const Typesetting = props => {
12 13 const {
... ... @@ -666,10 +667,11 @@ const Typesetting = props => {
666 667 isShow,
667 668 "isMax"
668 669 );
  670 + const confirmParam = commonFunc.showLocalMessage(props, 'confirmParam', '排版尺寸大于上机尺寸,请确认参数!');
669 671  
670 672 if (isCustomized && !isShow) {
671 673 if (isMobile) return;
672   - message.error("排版尺寸大于上机尺寸,请确认参数!");
  674 + message.error( confirmParam);
673 675 }
674 676 const onClick = () => {
675 677 if (isMobile) return;
... ... @@ -996,7 +998,7 @@ const Typesetting = props => {
996 998 wordBreak: "break-all", // 确保长单词换行
997 999 }}
998 1000 >
999   - 排版尺寸大于上机尺寸,请确认参数!
  1001 + {confirmParam}
1000 1002 </span>
1001 1003 </div>
1002 1004 )}
... ...
src/components/QuickQuote/index.jsx
... ... @@ -1316,6 +1316,7 @@ const ContentComponent = props =&gt; {
1316 1316 // 主表组件
1317 1317 const MasterComponent = props => {
1318 1318 const { masterConfig, masterData = {}, selectedNode = {} } = props.state;
  1319 + const { app }= props;
1319 1320 if (!masterConfig) return "";
1320 1321  
1321 1322 const ableConfigs = masterConfig.gdsconfigformslave.filter(item => item.sName && item.bVisible);
... ... @@ -1343,12 +1344,18 @@ const MasterComponent = props =&gt; {
1343 1344 lengthData.showName = "高(D)";
1344 1345 lengthData.sChinese = "高(D)";
1345 1346 lengthData.sEnglish = "Height (D)";
  1347 + if(app.userinfo?.sLanguage === 'sEnglish') {
  1348 + lengthData.showName = lengthData.sEnglish;
  1349 + }
1346 1350 }
1347 1351 } else {
1348 1352 if (lengthData) {
1349 1353 lengthData.showName = "长(L)";
1350 1354 lengthData.sChinese = "长(L)";
1351 1355 lengthData.sEnglish = "Length (L)";
  1356 + if(app.userinfo?.sLanguage === 'sEnglish') {
  1357 + lengthData.showName = lengthData.sEnglish;
  1358 + }
1352 1359 }
1353 1360 }
1354 1361 const viewProps = {
... ... @@ -1991,6 +1998,8 @@ const BoxComponent = props =&gt; {
1991 1998 const BoxInformation = commonFunc.showLocalMessage(props, 'Box-typeInformation', '拼版信息');
1992 1999 const ImpositionInformation = commonFunc.showLocalMessage(props, 'ImpositionInformation', '拼版信息');
1993 2000  
  2001 + const noImage = commonFunc.showLocalMessage(props, 'ImpositionInformation', '暂无图片');
  2002 +
1994 2003  
1995 2004 // props.setState(prevState => ({
1996 2005 // ...prevState,
... ... @@ -2077,7 +2086,7 @@ const BoxComponent = props =&gt; {
2077 2086 <DynamicSVG {...svgProps} />
2078 2087 </div>
2079 2088 ) : (
2080   - <div className={styles.noImg}>暂无图片</div>
  2089 + <div className={styles.noImg}>{noImage}</div>
2081 2090 )}
2082 2091 {/* {svgProps.boxList.length ? (
2083 2092 slaveRowData.sPackDetailPathUpLoad ?
... ... @@ -2092,7 +2101,7 @@ const BoxComponent = props =&gt; {
2092 2101 {slaveRowData.sPackPath ? (
2093 2102 <Image width={300} src={slaveRowData.sPackPath} />
2094 2103 ) : (
2095   - <div className={styles.noImg}>暂无图片</div>
  2104 + <div className={styles.noImg}>{noImage}</div>
2096 2105 )}
2097 2106 {/* <div className={styles.boxRreviewTitile}>立体图</div> */}
2098 2107 </Image.PreviewGroup>
... ... @@ -2733,6 +2742,7 @@ const BoxModelSelectedModal = props =&gt; {
2733 2742 return svgProps;
2734 2743 };
2735 2744 const selectBoxList = boxData.filter(item => (boxTypeSelected === "全部" ? true : (item.sBoxType || "其它") === boxTypeSelected));
  2745 + const noImage = commonFunc.showLocalMessage(props, 'ImpositionInformation', '暂无图片');
2736 2746 const tableProps = {
2737 2747 ...commonBusiness.getTableTypes("box", {
2738 2748 ...props,
... ... @@ -2760,7 +2770,7 @@ const BoxModelSelectedModal = props =&gt; {
2760 2770 ) : value ? (
2761 2771 <img src={value} alt="" width={150} height={150} />
2762 2772 ) : (
2763   - "暂无图片"
  2773 + noImage
2764 2774 );
2765 2775 });
2766 2776  
... ...
src/mobile/quotation/detailNew.jsx
... ... @@ -1077,6 +1077,7 @@ const QuotationAllprogressDetail = baseProps =&gt; {
1077 1077  
1078 1078 const QuotationDetail = props => {
1079 1079 const { masterConfig, masterData = {}, selectedNode = {} } = props.state;
  1080 + const { app } = props;
1080 1081 if (!masterConfig) return "";
1081 1082 const ableConfigs = masterConfig.gdsconfigformslave.filter(item => item.sName && item.bVisible);
1082 1083 // 处理长宽样式
... ... @@ -1101,12 +1102,19 @@ const QuotationDetail = props =&gt; {
1101 1102 lengthData.showName = "高(D)";
1102 1103 lengthData.sChinese = "高(D)";
1103 1104 lengthData.sEnglish = "Height (D)";
  1105 + if(app.userinfo?.sLanguage === 'sEnglish') {
  1106 + lengthData.showName = lengthData.sEnglish;
  1107 + }
1104 1108 }
1105 1109 } else {
1106 1110 if (lengthData) {
1107 1111 lengthData.showName = "长(L)";
1108 1112 lengthData.sChinese = "长(L)";
1109 1113 lengthData.sEnglish = "Length (L)";
  1114 + console.log('23323', app);
  1115 + if(app.userinfo?.sLanguage === 'sEnglish') {
  1116 + lengthData.showName = lengthData.sEnglish;
  1117 + }
1110 1118 }
1111 1119 }
1112 1120 const viewProps = {
... ...