Commit 4b02667b866220503c1dffb0fe7eb4a17ef99672
1 parent
498f739c
补充英文翻译
Showing
2 changed files
with
3 additions
and
3 deletions
src/components/Common/CommonSubBillEvent.js
| ... | ... | @@ -2204,7 +2204,7 @@ export default (ChildComponent) => { |
| 2204 | 2204 | return; |
| 2205 | 2205 | } |
| 2206 | 2206 | if (slaveChildConfig && slaveChildConfig.bNotCanEmpty && commonUtils.isEmptyArr(slaveChildData)) { |
| 2207 | - message.error(`${slaveChildConfig.sChinese || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空! | |
| 2207 | + message.error(`${slaveChildConfig.showName || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空! | |
| 2208 | 2208 | this.props.onSaveState({ |
| 2209 | 2209 | loading: false, |
| 2210 | 2210 | }); | ... | ... |
src/components/Common/SlaveMemo.js
| ... | ... | @@ -56,10 +56,10 @@ export default class SlaveMemo extends Component { |
| 56 | 56 | const sMemoField = sCurrMemoProps.sMemoField; |
| 57 | 57 | const sRecord = sCurrMemoProps.sRecord; |
| 58 | 58 | const btnName = sCurrMemoProps.btnName ? sCurrMemoProps.btnName : ''; |
| 59 | - | |
| 59 | + const fillContent = commonFunc.showLocalMessage(props, 'fillContent', '请填写内容'); | |
| 60 | 60 | if (!Array.isArray(slaveMemoConfig) || !slaveMemoConfig.length) { |
| 61 | 61 | if (!sCurrMemoProps?.bNoMemo && sMemoField !== undefined && !btnName.toLowerCase().endsWith('choosedate') && !this.state.textareaValue?.trim()) { |
| 62 | - return message.warning('请填写内容'); | |
| 62 | + return message.warning(fillContent); | |
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | ... | ... |