Commit 95f8f43c25036cd29336909aca829554cabb17a7
1 parent
dc546730
1.补充多语言翻译
Showing
3 changed files
with
26 additions
and
9 deletions
src/components/Common/CommonBill/index.js
| @@ -2529,9 +2529,12 @@ const BillComponent = Form.create({ | @@ -2529,9 +2529,12 @@ const BillComponent = Form.create({ | ||
| 2529 | } | 2529 | } |
| 2530 | 2530 | ||
| 2531 | return Object.keys(controlGroup).map((tabNameKey) => { | 2531 | return Object.keys(controlGroup).map((tabNameKey) => { |
| 2532 | - const tabName = tabNameKey.replace(/\d+/g, ""); | 2532 | + let tabName = tabNameKey.replace(/\d+/g, ""); |
| 2533 | const num = tabNameKey.replace(/[^\d]/g, "").trim(); | 2533 | const num = tabNameKey.replace(/[^\d]/g, "").trim(); |
| 2534 | - | 2534 | + const tableConfigArr = config?.gdsconfigformslave.filter(row => row.sControlName === tabNameKey.trim()); |
| 2535 | + if(commonUtils.isNotEmptyArr(tableConfigArr)) { | ||
| 2536 | + tabName= tableConfigArr[0].showName; | ||
| 2537 | + } | ||
| 2535 | const viewProps = { | 2538 | const viewProps = { |
| 2536 | ...props, | 2539 | ...props, |
| 2537 | viewConfigs: controlGroup[tabNameKey], | 2540 | viewConfigs: controlGroup[tabNameKey], |
src/components/Common/ToolBar/ToolBarNew.js
| @@ -2154,8 +2154,9 @@ class ToolBarComponent extends Component { | @@ -2154,8 +2154,9 @@ class ToolBarComponent extends Component { | ||
| 2154 | } | 2154 | } |
| 2155 | } else if (key === "BtnDel") { | 2155 | } else if (key === "BtnDel") { |
| 2156 | /* 删除 */ | 2156 | /* 删除 */ |
| 2157 | + const sureDelTitle = commonUtils.isNotEmptyObject(this.props?.app) ? commonFunc.showMessage(this.props.app.commonConst, "SureDel") : "SureDel"; | ||
| 2157 | obj = { | 2158 | obj = { |
| 2158 | - title: "确定要删除", | 2159 | + title: sureDelTitle, |
| 2159 | }; | 2160 | }; |
| 2160 | this.props.onDel(obj); | 2161 | this.props.onDel(obj); |
| 2161 | } else if (key === "BtnGetGoods") { | 2162 | } else if (key === "BtnGetGoods") { |
src/components/QuickQuote/index.jsx
| @@ -1105,6 +1105,7 @@ const TreeComponent = props => { | @@ -1105,6 +1105,7 @@ const TreeComponent = props => { | ||
| 1105 | // 内容组件 | 1105 | // 内容组件 |
| 1106 | const ContentComponent = props => { | 1106 | const ContentComponent = props => { |
| 1107 | const { selectedNode = {}, extraParts = {} } = props.state; | 1107 | const { selectedNode = {}, extraParts = {} } = props.state; |
| 1108 | + const manyqtysInfo= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'manyqtysInfo') : '多数量报价' ; | ||
| 1108 | const { showName } = selectedNode; | 1109 | const { showName } = selectedNode; |
| 1109 | const extraPartsList = extraParts[showName] || []; | 1110 | const extraPartsList = extraParts[showName] || []; |
| 1110 | let { sAllPartsName = "" } = selectedNode; | 1111 | let { sAllPartsName = "" } = selectedNode; |
| @@ -1207,7 +1208,7 @@ const ContentComponent = props => { | @@ -1207,7 +1208,7 @@ const ContentComponent = props => { | ||
| 1207 | })} | 1208 | })} |
| 1208 | /> | 1209 | /> |
| 1209 | <BackendParamsExtraComponent {...props} /> | 1210 | <BackendParamsExtraComponent {...props} /> |
| 1210 | - <Divider {...dividerProps}>多数量报价</Divider> | 1211 | + <Divider {...dividerProps}>{manyqtysInfo}</Divider> |
| 1211 | <ManyComponent {...props} /> | 1212 | <ManyComponent {...props} /> |
| 1212 | </> | 1213 | </> |
| 1213 | ); | 1214 | ); |
| @@ -1727,6 +1728,8 @@ const BoxComponent = props => { | @@ -1727,6 +1728,8 @@ const BoxComponent = props => { | ||
| 1727 | showNew: 1, | 1728 | showNew: 1, |
| 1728 | }; | 1729 | }; |
| 1729 | const isShowImg = boxList.find(x => x.sName === "盒身")?.type !== "" || false; | 1730 | const isShowImg = boxList.find(x => x.sName === "盒身")?.type !== "" || false; |
| 1731 | + const PrintingParameters = commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'PrintingParameters') : '印刷参数' ; | ||
| 1732 | + | ||
| 1730 | return ( | 1733 | return ( |
| 1731 | <Tabs | 1734 | <Tabs |
| 1732 | key={boxModel} | 1735 | key={boxModel} |
| @@ -1743,7 +1746,7 @@ const BoxComponent = props => { | @@ -1743,7 +1746,7 @@ const BoxComponent = props => { | ||
| 1743 | const cailiaoyinshuaDiv = ( | 1746 | const cailiaoyinshuaDiv = ( |
| 1744 | <> | 1747 | <> |
| 1745 | <Divider {...dividerProps} orientationMargin="10px"> | 1748 | <Divider {...dividerProps} orientationMargin="10px"> |
| 1746 | - 印刷参数 | 1749 | + {PrintingParameters} |
| 1747 | </Divider> | 1750 | </Divider> |
| 1748 | <div className={styles.viewTable1}> | 1751 | <div className={styles.viewTable1}> |
| 1749 | <CommonViewTable {...upViewProps12} /> | 1752 | <CommonViewTable {...upViewProps12} /> |
| @@ -2027,6 +2030,16 @@ const ManyComponent = props => { | @@ -2027,6 +2030,16 @@ const ManyComponent = props => { | ||
| 2027 | const [submitLoading, setSubmitLoading] = useState(false); | 2030 | const [submitLoading, setSubmitLoading] = useState(false); |
| 2028 | const [processPercent, setProcessPercent] = useState(0); | 2031 | const [processPercent, setProcessPercent] = useState(0); |
| 2029 | 2032 | ||
| 2033 | + const BtnNewQuotation= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'BtnNewQuotation') : '新报价' ; | ||
| 2034 | + | ||
| 2035 | + const BtnDraft= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'BtnDraft') : '存草稿' ; | ||
| 2036 | + | ||
| 2037 | + const BtnPriceverification= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'BtnPriceverification') : '核价' ; | ||
| 2038 | + | ||
| 2039 | + const BtnConfirmQuantity= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'BtnConfirmQuantity') : '确认下单数量' ; | ||
| 2040 | + | ||
| 2041 | + const btnOrdering= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'btnOrdering') : '下单中...' ; | ||
| 2042 | + | ||
| 2030 | // 核价事件 | 2043 | // 核价事件 |
| 2031 | const onCalcPrice = () => { | 2044 | const onCalcPrice = () => { |
| 2032 | const addState = { | 2045 | const addState = { |
| @@ -2115,7 +2128,7 @@ const ManyComponent = props => { | @@ -2115,7 +2128,7 @@ const ManyComponent = props => { | ||
| 2115 | {enabled && ( | 2128 | {enabled && ( |
| 2116 | <div className={styles.btns}> | 2129 | <div className={styles.btns}> |
| 2117 | <Button type="primary" size="large" loading={loading} onClick={props.onAdd}> | 2130 | <Button type="primary" size="large" loading={loading} onClick={props.onAdd}> |
| 2118 | - 新报价 | 2131 | + {BtnNewQuotation} |
| 2119 | </Button> | 2132 | </Button> |
| 2120 | <Button | 2133 | <Button |
| 2121 | type="primary" | 2134 | type="primary" |
| @@ -2125,10 +2138,10 @@ const ManyComponent = props => { | @@ -2125,10 +2138,10 @@ const ManyComponent = props => { | ||
| 2125 | props.onSaveDraft(); | 2138 | props.onSaveDraft(); |
| 2126 | }} | 2139 | }} |
| 2127 | > | 2140 | > |
| 2128 | - 存草稿 | 2141 | + {BtnDraft} |
| 2129 | </Button> | 2142 | </Button> |
| 2130 | <Button type="primary" size="large" loading={loading || calcPriceLoading} className={styles.calcPrice} onClick={onCalcPrice}> | 2143 | <Button type="primary" size="large" loading={loading || calcPriceLoading} className={styles.calcPrice} onClick={onCalcPrice}> |
| 2131 | - {calcPriceLoading ? `核价中【进度${processPercent}%】...` : "核价"} | 2144 | + {calcPriceLoading ? `核价中【进度${processPercent}%】...` : BtnPriceverification} |
| 2132 | </Button> | 2145 | </Button> |
| 2133 | <Button | 2146 | <Button |
| 2134 | type="primary" | 2147 | type="primary" |
| @@ -2155,7 +2168,7 @@ const ManyComponent = props => { | @@ -2155,7 +2168,7 @@ const ManyComponent = props => { | ||
| 2155 | ); | 2168 | ); |
| 2156 | }} | 2169 | }} |
| 2157 | > | 2170 | > |
| 2158 | - {submitLoading ? `下单中...` : "确认下单数量"} | 2171 | + {submitLoading ? btnOrdering : BtnConfirmQuantity} |
| 2159 | </Button> | 2172 | </Button> |
| 2160 | </div> | 2173 | </div> |
| 2161 | )} | 2174 | )} |