diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js index 2a6fc1b..09aba11 100644 --- a/src/mes/common/commonModelComponent/index.js +++ b/src/mes/common/commonModelComponent/index.js @@ -440,21 +440,53 @@ const useCommonModelEvent = props => { } if (props.masterData.sBillNo) return if (!copyToConfig) return + const { app } = props; + const { token } = app; const addState = {}; // 始终初始化为对象 if (Array.isArray(copyToConfig) && copyToConfig.length > 0) { - copyToConfig.forEach(item => { + copyToConfig.forEach(async item => { if (item?.sControlName) { - const nameList = item.sControlName.split('.'); - if (nameList && nameList.length > 2) { - const name = nameList.pop() - addState[`${name}Data`] = [{ - ...commonFunc.getDefaultData(props[`${name}Config`]), - handleType: "add", - sId: commonUtils.createSid(), - sParentId: props.masterData.sId, - ...commonFunc.getAssignFieldValue(item.sAssignField, record) - }]; + if (item.sControlName.includes('tmpInfoBySql')) { + const dataUrl = `${commonConfig.server_host}salesorder/getTmpInfo/?sModelsId=${sModelsId}`; + const sConfigformId = commonUtils.isEmpty(copyToConfig) ? '' : copyToConfig[0].sParentId; + const sControlName = commonUtils.isNotEmptyObject(name) ? name : 'BtnCopyTo.tmpInfo'; + let sSqlCondition = ''; + let sRowData = [record] + const values = { sConfigformId, sControlName, sRowData }; + if (true) { + const dataReturn = (await commonServices.postValueService(token, values, dataUrl)).data; + if (dataReturn.code === 1) { + const returnData = dataReturn.dataset.rows[0]; + if (commonUtils.isNotEmptyObject(returnData)) { + for (const key of Object.keys(returnData)) { + const sName = `${key}Data`; + addState[sName] = returnData[key]; + } + if (commonUtils.isNotEmptyArr(addState.masterData) && Array.isArray(addState.masterData)) { + addState.masterData = addState.masterData[0]; + } + } + } else { + props.getServiceError(dataReturn); + } + } else { + message.warn('数据未配置!不能生成!'); + return; + } + } else { + const nameList = item.sControlName.split('.'); + if (nameList && nameList.length > 2) { + const name = nameList.pop() + addState[`${name}Data`] = [{ + ...commonFunc.getDefaultData(props[`${name}Config`]), + handleType: "add", + sId: commonUtils.createSid(), + sParentId: props.masterData.sId, + ...commonFunc.getAssignFieldValue(item.sAssignField, record) + }]; + } } + } }); } @@ -1181,8 +1213,8 @@ const useCommonModelEvent = props => { const sReturnArray = outData[0].sReturn.split('|'); if (outData[0].sReturn.split('-').length < 2) { // 正常业务提示,非审核模板 - // if (this.props.app.currentPane.refresh !== undefined) { - // this.props.app.currentPane.refresh(); + // if (props.app.currentPane.refresh !== undefined) { + // props.app.currentPane.refresh(); // } message.error(check + outData[0].sReturn); return; @@ -1208,12 +1240,12 @@ const useCommonModelEvent = props => { checkPersonData.forEach((item) => { item.key = commonUtils.createSid(); }); - this.props.onSaveState({ + props.onSaveState({ checkConditions, checkPersonData, sCheckModelId, visible: true, }); return true; } else { /* 失败 */ - this.props.getServiceError({ msg: check + dataReturn }); + props.getServiceError({ msg: check + dataReturn }); } } } else { @@ -1225,8 +1257,8 @@ const useCommonModelEvent = props => { if (commonUtils.isNotEmptyStr(outData[0].sReturn)) { message.error(outData[0].sReturn); } else { - // if (this.props.app.currentPane.refresh !== undefined) { - // this.props.app.currentPane.refresh(); + // if (props.app.currentPane.refresh !== undefined) { + // props.app.currentPane.refresh(); // } message.success(BtnCancelExamine + returnData.msg); } @@ -1238,7 +1270,7 @@ const useCommonModelEvent = props => { await handleGetOneMemoData('orderDetail', orderDetailConfig); } // if (props.app.currentPane.refresh !== undefined) { - // this.props.app.currentPane.refresh(); + // props.app.currentPane.refresh(); // } } else if (returnData.code === -8) { Modal.info({ diff --git a/src/mes/scheduledTasks/machineTasks/index.js b/src/mes/scheduledTasks/machineTasks/index.js index c27a862..fef6ff5 100644 --- a/src/mes/scheduledTasks/machineTasks/index.js +++ b/src/mes/scheduledTasks/machineTasks/index.js @@ -585,7 +585,7 @@ const MachineTasks = baseProps => { if (!bStartWork) { sDefault = "${false}"; } - + const outPut = bManual ? [actProduceReportConfig, { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] : [{ showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig }, { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }]