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/Common/SlaveMemo.js b/src/components/Common/SlaveMemo.js index c047963..a68df53 100644 --- a/src/components/Common/SlaveMemo.js +++ b/src/components/Common/SlaveMemo.js @@ -11,6 +11,7 @@ import ShowType from './CommonComponent';/* 通用方法 */ import AntdDraggableModal from '../Common/AntdDraggableModal'; import moment from 'moment'; import * as commonFunc from "@/components/Common/commonFunc"; +import * as commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */ const { TextArea } = Input; const FormItem = Form.Item; @@ -64,6 +65,12 @@ export default class SlaveMemo extends Component { let valueKey = ''; if (commonUtils.isNotEmptyArr(slaveMemoConfig) && commonUtils.isNotEmptyObject(masterData)) { + const newConfig = { + gdsconfigformslave :slaveMemoConfig + } + if (!commonBusiness.validateTable(newConfig, [masterData], this.props)) { + return; + } // eslint-disable-next-line array-callback-return slaveMemoConfig.map((item) => { /** diff --git a/src/components/CommonSystemSettingEvent/CommonSystemSetting.js b/src/components/CommonSystemSettingEvent/CommonSystemSetting.js index 81899e1..2fc712b 100644 --- a/src/components/CommonSystemSettingEvent/CommonSystemSetting.js +++ b/src/components/CommonSystemSettingEvent/CommonSystemSetting.js @@ -88,6 +88,11 @@ const CommonSystemSettingComponent = Form.create({ onFilterData: props.onFilterData, tableProps: { AutoTableHeight: 200 }, }; + const AccountingPeriod = commonFunc.showLocalMessage(props, 'AccountingPeriod', '会计期间'); + const SalesProductionParameters = commonFunc.showLocalMessage(props, 'SalesProductionParameters', '销售采购生产参数'); + const FinancialWarehouseParameters = commonFunc.showLocalMessage(props, 'FinancialWarehouseParameters', '财务仓库报价参数'); + const DocumentNumberSetup= commonFunc.showLocalMessage(props, 'DocumentNumberSetup', '单据编号设置'); + const SystemSetting = commonFunc.showLocalMessage(props, 'SystemSetting', '系统参数'); return ( @@ -98,16 +103,16 @@ const CommonSystemSettingComponent = Form.create({
- + - + - + - +
@@ -118,7 +123,7 @@ const CommonSystemSettingComponent = Form.create({
: '' } - + 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) { diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index bea684d..8c20b58 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -764,6 +764,19 @@ const QuickQuoteEvent = props => { processAfterDataRow.sId = commonUtils.createSid(); processAfterDataRow.sParentId = masterData.sId; processAfterDataRow.sControlId = partsDataRow.sId; + + const sBackendParams = process.sBackendParams || []; + if (sBackendParams.length) { + const sQuoParams = sBackendParams.map(item => ({ + sParamKey: item.sParamKey, + sParamKeyNew: item.sParamKeyNew, + sParamName: item.sParam, + sParamValue: item.value !== undefined ? item.value : "", + bSelfCbx: !(item.value === "" || item.value === undefined), + })); + processAfterDataRow.sQuoParams = JSON.stringify(sQuoParams); + } + // processAfterDataRow.sSlaveId = ' '; processData.push(processAfterDataRow); // 配套工序 @@ -2484,7 +2497,8 @@ const BackendParamsExtraComponent = props => { const viewConfigs = backendParamsConfig.map((item, index) => ({ ...item, - sName: item.sFieldName || `sParams${index}`, + sName0: `sParams${index + 1}`, + sName: item.sFieldName || `sParams${index + 1}`, showName: item.sParam, sDropDownType: item.sParamDropDown ? "sql" : "", iColValue: 4, @@ -2504,7 +2518,7 @@ const BackendParamsExtraComponent = props => { tableName: `sBackendParams${boxModel}`, getSqlDropDownData: (...args) => { const showConfig = args[2]; - const { sParamDropDown = "", sName } = showConfig; + const { sParamDropDown = "", sName0, sName } = showConfig; const dropDownData = sParamDropDown.split(","); if (dropDownData?.length) { return { @@ -2513,6 +2527,8 @@ const BackendParamsExtraComponent = props => { value: item, sParam: showConfig.sParam, [sName]: item, + sParamKey: sName0, + sParamKeyNew: sName, })), totalPageCount: 1, currentPageNo: 1, @@ -2533,6 +2549,8 @@ const BackendParamsExtraComponent = props => { value: changeValue[sFieldName], sParam: showConfig.sParam, [sFieldName]: changeValue[sFieldName], + sParamKey: showConfig.sName0, + sParamKeyNew: sFieldName, }; const { sParam } = dropDownDataSelected; const { sBackendParams = [] } = slaveData[iIndex].sBackProcessData[iIndex1];