diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index a6eebc9..4a25e9f 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -479,9 +479,9 @@ const QuickQuoteEvent = props => { // 核价按钮 addState.handleCalcPrice = async () => { const { masterConfig, masterData = {}, slaveConfig, slaveData = [], selectedNode = {}, extraParts = {} } = state; - + const selectProduct = commonFunc.showLocalMessage(props, 'selectProduct', '请先选择产品'); if (commonUtils.isEmptyObject(selectedNode)) { - message.error("请先选择产品", 2); + message.error(selectProduct, 2); return; } @@ -1204,12 +1204,13 @@ const TreeComponent = props => { const ContentComponent = props => { const { selectedNode = {}, extraParts = {} } = props.state; const manyqtysInfo = props.getI18nName("manyqtysInfo", "多数量报价"); + const selectProduct = commonFunc.showLocalMessage(props, 'selectProduct', '请先选择产品'); const { showName } = selectedNode; const extraPartsList = extraParts[showName] || []; let { sAllPartsName = "" } = selectedNode; let bEmpty = false; if (commonUtils.isEmptyObject(selectedNode)) { - sAllPartsName = "请先选择产品"; + sAllPartsName = selectProduct; bEmpty = true; } else if (!sAllPartsName) { sAllPartsName = showName; @@ -1488,6 +1489,9 @@ const BoxComponent = props => { if (selectedNode.sProductType === "不干胶") { showNameKeyList = ["dZBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"]; } + const UlToolPosition = commonFunc.showLocalMessage(props, 'UlToolPosition', '上下刀位'); + const RLToolPosition = commonFunc.showLocalMessage(props, 'RLToolPosition', '左右刀位'); + const LeftMargin = commonFunc.showLocalMessage(props, 'LeftMargin', '左右刀位'); boxConfigList = boxConfig?.gdsconfigformslave?.filter(item => item.bVisible && showNameKeyList.includes(item.sName)) || []; if (selectedNode.sProductType === "不干胶") { const mappings = { @@ -1503,9 +1507,9 @@ const BoxComponent = props => { }); } else { const mappings = { - dZBLB: "左边留白", - dXBJJ: "上下刀位", - dYBJJ: "左右刀位", + dZBLB: LeftMargin, + dXBJJ: UlToolPosition, + dYBJJ: RLToolPosition, }; boxConfigList.forEach(item => { @@ -1983,6 +1987,11 @@ const BoxComponent = props => { }; const isShowImg = boxList.find(x => x.sName === "盒身")?.type !== "" || false; const PrintingParameters = props.getI18nName("PrintingParameters", "印刷参数"); + + const BoxInformation = commonFunc.showLocalMessage(props, 'Box-typeInformation', '拼版信息'); + const ImpositionInformation = commonFunc.showLocalMessage(props, 'ImpositionInformation', '拼版信息'); + + // props.setState(prevState => ({ // ...prevState, // svgBoxList: boxList, @@ -1992,7 +2001,7 @@ const BoxComponent = props => { key={boxModel} type="card" className={`noXlyTabs ${styles.tabs} ${!bBox ? styles.hideTab : ""}`} - items={["盒型信息", "拼版信息"].map((title, index) => { + items={[BoxInformation, ImpositionInformation].map((title, index) => { return { label: title, key: index, @@ -2585,17 +2594,22 @@ const BoxModelSelectedModal = props => { const [boxData, setBoxData] = useState([]); const [treeClassName, setTreeClassName] = useState(""); const [boxTypeSelected, setBoxTypeSelected] = useState("全部"); + const UniqueID = commonFunc.showLocalMessage(props, 'UniqueID', '唯一ID'); + const sName = commonFunc.showLocalMessage(props, 'jurCon', '名称'); + const KnifeLineChart = commonFunc.showLocalMessage(props, 'KnifeLineChart', '刀线图'); + const ThreeDGraph = commonFunc.showLocalMessage(props, '3DGraph', '3D图'); + const BtnOperations = commonFunc.showLocalMessage(props, 'BtnOperations', '操作'); useEffect(() => { const boxList = [ - ["sId", "唯一ID"], + ["sId", UniqueID], ["iOrder", "#", 60], // ["sBoxId", "盒型ID"], - ["sName", "名称", 119], - ["sPackDetailPathUpLoad", "刀线图", 300], + ["sName", sName, 119], + ["sPackDetailPathUpLoad", KnifeLineChart, 300], // ["sPackDetailPathUpLoad", "刀线图", 300], - ["sPackPath", "3D图", 300], - ["operation", "操作", 80], + ["sPackPath", ThreeDGraph, 300], + ["operation", BtnOperations, 80], ]; const config = { sId: commonUtils.createSid(), @@ -2770,16 +2784,17 @@ const BoxModelSelectedModal = props => { }); }, }; - + const BoxSelection = commonFunc.showLocalMessage(props, 'Box-TypeSelection', '盒型选择'); + const BtnClose = commonFunc.showLocalMessage(props, 'BtnClose', '关闭'); return ( - 关闭 + {BtnClose} } > diff --git a/src/mobile/quotation/detailNew.jsx b/src/mobile/quotation/detailNew.jsx index 5d71934..97ac8f2 100644 --- a/src/mobile/quotation/detailNew.jsx +++ b/src/mobile/quotation/detailNew.jsx @@ -451,11 +451,12 @@ const QuickQuoteEvent = props => { // 核价按钮 addState.handleCalcPrice = async () => { const { masterData = {}, slaveData = [], selectedNode = {}, extraParts = {} } = state; + const selectProduct = commonFunc.showLocalMessage(props, 'selectProduct', '请先选择产品'); if (commonUtils.isEmptyObject(selectedNode)) { // message.error("请先选择产品"); Toast.show({ icon: "fail", - content: "请先选择产品", + content: selectProduct, }); return; } @@ -1575,6 +1576,10 @@ const BoxComponent = props => { if (selectedNode.sProductType === "不干胶") { showNameKeyList = ["dZBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"]; } + const UlToolPosition = commonFunc.showLocalMessage(props, 'UlToolPosition', '上下刀位'); + const RLToolPosition = commonFunc.showLocalMessage(props, 'RLToolPosition', '左右刀位'); + const LeftMargin = commonFunc.showLocalMessage(props, 'LeftMargin', '左右刀位'); + boxConfigList = boxConfig?.gdsconfigformslave?.filter(item => item.bVisible && showNameKeyList.includes(item.sName)) || []; if (selectedNode.sProductType === "不干胶") { const mappings = { @@ -1590,9 +1595,9 @@ const BoxComponent = props => { }); } else { const mappings = { - dZBLB: "左边留白", - dXBJJ: "上下刀位", - dYBJJ: "左右刀位", + dZBLB: LeftMargin, + dXBJJ: UlToolPosition, + dYBJJ: RLToolPosition, }; boxConfigList.forEach(item => {