diff --git a/src/components/Common/CommonBill/index.js b/src/components/Common/CommonBill/index.js index 2c9fe27..ead27fc 100644 --- a/src/components/Common/CommonBill/index.js +++ b/src/components/Common/CommonBill/index.js @@ -2529,9 +2529,12 @@ const BillComponent = Form.create({ } return Object.keys(controlGroup).map((tabNameKey) => { - const tabName = tabNameKey.replace(/\d+/g, ""); + let tabName = tabNameKey.replace(/\d+/g, ""); const num = tabNameKey.replace(/[^\d]/g, "").trim(); - + const tableConfigArr = config?.gdsconfigformslave.filter(row => row.sControlName === tabNameKey.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName= tableConfigArr[0].showName; + } const viewProps = { ...props, viewConfigs: controlGroup[tabNameKey], diff --git a/src/components/Common/ToolBar/ToolBarNew.js b/src/components/Common/ToolBar/ToolBarNew.js index 5d18db0..bcdfbd8 100644 --- a/src/components/Common/ToolBar/ToolBarNew.js +++ b/src/components/Common/ToolBar/ToolBarNew.js @@ -2154,8 +2154,9 @@ class ToolBarComponent extends Component { } } else if (key === "BtnDel") { /* 删除 */ + const sureDelTitle = commonUtils.isNotEmptyObject(this.props?.app) ? commonFunc.showMessage(this.props.app.commonConst, "SureDel") : "SureDel"; obj = { - title: "确定要删除", + title: sureDelTitle, }; this.props.onDel(obj); } else if (key === "BtnGetGoods") { diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index 6f5ebae..0eb6942 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -1105,6 +1105,7 @@ const TreeComponent = props => { // 内容组件 const ContentComponent = props => { const { selectedNode = {}, extraParts = {} } = props.state; + const manyqtysInfo= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'manyqtysInfo') : '多数量报价' ; const { showName } = selectedNode; const extraPartsList = extraParts[showName] || []; let { sAllPartsName = "" } = selectedNode; @@ -1207,7 +1208,7 @@ const ContentComponent = props => { })} /> - 多数量报价 + {manyqtysInfo} ); @@ -1727,6 +1728,8 @@ const BoxComponent = props => { showNew: 1, }; const isShowImg = boxList.find(x => x.sName === "盒身")?.type !== "" || false; + const PrintingParameters = commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'PrintingParameters') : '印刷参数' ; + return ( { const cailiaoyinshuaDiv = ( <> - 印刷参数 + {PrintingParameters}
@@ -2027,6 +2030,16 @@ const ManyComponent = props => { const [submitLoading, setSubmitLoading] = useState(false); const [processPercent, setProcessPercent] = useState(0); + const BtnNewQuotation= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'BtnNewQuotation') : '新报价' ; + + const BtnDraft= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'BtnDraft') : '存草稿' ; + + const BtnPriceverification= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'BtnPriceverification') : '核价' ; + + const BtnConfirmQuantity= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'BtnConfirmQuantity') : '确认下单数量' ; + + const btnOrdering= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'btnOrdering') : '下单中...' ; + // 核价事件 const onCalcPrice = () => { const addState = { @@ -2115,7 +2128,7 @@ const ManyComponent = props => { {enabled && (
)}