diff --git a/src/components/Common/CommonListSelect/index.js b/src/components/Common/CommonListSelect/index.js index 79ec03f..b9e1e60 100644 --- a/src/components/Common/CommonListSelect/index.js +++ b/src/components/Common/CommonListSelect/index.js @@ -349,6 +349,9 @@ class CommonList extends Component { token, sModelsId, slaveFilterCondition, slaveConfig, slavePagination, slaveOrderBy, app, } = this.props; const { userinfo } = app; + const BtnSure = commonFunc.showLocalMessage(this.props, 'BtnSure', '确定'); + const FriendlyReminder = commonFunc.showLocalMessage(this.props, 'FriendlyReminder', '温馨提示'); + const onSendSocketMessage = this.props.handleSendSocketMessage; const returnData = await commonBusiness.saveData({ token, value: params, sModelsId }); this.props.onSaveState({ @@ -360,7 +363,7 @@ class CommonList extends Component { // eslint-disable-next-line no-underscore-dangle const _this = this; confirm({ - title: '单据校验', /* 防呆校验 */ + title: FriendlyReminder, /* 防呆校验 */ content: returnData.msg, onOk() { params.iFlag = 1; @@ -368,8 +371,6 @@ class CommonList extends Component { }, onCancel() { }, - okText: '保存', - cancelText: '不保存', }); this.props.onSaveState({ loading: false, @@ -377,13 +378,12 @@ class CommonList extends Component { return true; } else if (returnData.code === 2 || returnData.code === -8) { Modal.info({ - title: '温馨提示:', + title: FriendlyReminder, content: (
{commonFunc.getReturnMsg(returnData.msg)}
), - okText: '确认', onOk() {}, }); } else { @@ -855,8 +855,8 @@ const CommonListComponent = Form.create({ }; const upInvoiceName = commonUtils.isNotEmptyArr(btnUploadApi) ? btnUploadApi[0].showName : '发票上传(金税)'; - const BtnSure = commonFunc.showLocalMessage(this.props, 'BtnSure', '确定'); - const BtnCancel = commonFunc.showLocalMessage(this.props, 'BtnCancel', '取消'); + const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确定'); + const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消'); return (
diff --git a/src/components/Common/CommonListSelectMulti/index.js b/src/components/Common/CommonListSelectMulti/index.js index 3f1496e..367cdf2 100644 --- a/src/components/Common/CommonListSelectMulti/index.js +++ b/src/components/Common/CommonListSelectMulti/index.js @@ -832,6 +832,8 @@ const CommonListComponent = Form.create({ const sProcessParams = commonFunc.showMessage(app.commonConst, 'sProcessParams');/* 选择工艺参数标题 */ const displayLeft = (sModelsType !== 'search/sisColor' && sModelsType !== 'search/commonPopup'); const realizeHeight = commonUtils.isNotEmptyNumber(props.realizeHeight) ? props.realizeHeight : 0; + const BtnSure = commonFunc.showLocalMessage(this.props, 'BtnSure', '确定'); + const BtnCancel = commonFunc.showLocalMessage(this.props, 'BtnCancel', '取消'); const btnClick = (btn) => { const { sControlName } = btn; const picArr = slaveConfig.gdsconfigformslave.filter(item => (item.sName === 'picArr')); @@ -915,8 +917,8 @@ const CommonListComponent = Form.create({ width: '50%', textAlign: 'right', marginRight: '9px', marginBottom: '9px', }} > - - + + diff --git a/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js b/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js index c78415c..a3d33f6 100644 --- a/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js +++ b/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js @@ -1906,6 +1906,7 @@ class ProcessCardPackTableTree extends Component { gdsformconst, slaveData, controlData, controlSelectedRowKeys, slaveSelectedRowKeys, [`${name}Data`]: tableData, } = this.props; let { packData }=this.props; + const selectProduct = commonFunc.showLocalMessage(this.props, 'selectProduct', '请先选择产品!'); if (name === 'control') { /* 增加子部件 */ const { @@ -1979,7 +1980,7 @@ class ProcessCardPackTableTree extends Component { if(iIndex ===-1){ if(commonUtils.isEmptyObject(slaveSelectedRow.sProductId)) { - message.error('请先选择产品!'); + message.error(selectProduct); return; } if(slaveSelectedRow){ diff --git a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js index 54560f9..cbab0dc 100644 --- a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js +++ b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js @@ -3158,10 +3158,12 @@ const controlProps = props => { if (commonUtils.isEmptyArr(packData)) { packData = []; } + const selectProduct = commonFunc.showLocalMessage(props, 'selectProduct', '请先选择产品'); + const iIndex = packData.findIndex(item => item.sControlId === tableDataRow.sId); if (iIndex === -1) { if (commonUtils.isEmptyObject(slaveSelectedRow.sProductId)) { - message.error("请先选择产品!"); + message.error(selectProduct); return; } if (slaveSelectedRow) {