diff --git a/src/components/Common/CommonSubBillEvent.js b/src/components/Common/CommonSubBillEvent.js index abc7bad..4844dc1 100644 --- a/src/components/Common/CommonSubBillEvent.js +++ b/src/components/Common/CommonSubBillEvent.js @@ -2204,7 +2204,7 @@ export default (ChildComponent) => { return; } if (slaveChildConfig && slaveChildConfig.bNotCanEmpty && commonUtils.isEmptyArr(slaveChildData)) { - message.error(`${slaveChildConfig.sChinese || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空! + message.error(`${slaveChildConfig.showName || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空! this.props.onSaveState({ loading: false, }); diff --git a/src/components/Common/SlaveMemo.js b/src/components/Common/SlaveMemo.js index a68df53..e314d2f 100644 --- a/src/components/Common/SlaveMemo.js +++ b/src/components/Common/SlaveMemo.js @@ -56,10 +56,10 @@ export default class SlaveMemo extends Component { const sMemoField = sCurrMemoProps.sMemoField; const sRecord = sCurrMemoProps.sRecord; const btnName = sCurrMemoProps.btnName ? sCurrMemoProps.btnName : ''; - + const fillContent = commonFunc.showLocalMessage(this.props, 'fillContent', '请填写内容'); if (!Array.isArray(slaveMemoConfig) || !slaveMemoConfig.length) { if (!sCurrMemoProps?.bNoMemo && sMemoField !== undefined && !btnName.toLowerCase().endsWith('choosedate') && !this.state.textareaValue?.trim()) { - return message.warning('请填写内容'); + return message.warning(fillContent); } }