diff --git a/src/components/Common/CommonInstructSet.js b/src/components/Common/CommonInstructSet.js index dc0643a..eb7b3fa 100644 --- a/src/components/Common/CommonInstructSet.js +++ b/src/components/Common/CommonInstructSet.js @@ -865,7 +865,7 @@ const handleSave = (props, instruct) => { const data = []; Object.keys(allSlaveData).forEach(key => { const config = props[`${key}Config`]; - const saveTmpData = key === "master" ? (Array.isArray(masterData) ? masterData: [masterData]) : props[`${key}Data`]; + const saveTmpData = key === "master" ? (Array.isArray(masterData) ? masterData : [masterData]) : props[`${key}Data`]; const delTmpData = key === "master" ? null : props[`${key}DelData`] || null; data.push( commonBusiness.mergeData(key, config.sTbName, saveTmpData, delTmpData) diff --git a/src/components/Common/commonBusiness.js b/src/components/Common/commonBusiness.js index 39fdbf9..308926e 100644 --- a/src/components/Common/commonBusiness.js +++ b/src/components/Common/commonBusiness.js @@ -185,6 +185,34 @@ export async function saveData(param) { } else { message.success(optName + dataReturn.msg); } + /* 保存成功后自动审核:直接调用 doExamine 接口 + 用保存载荷 value 里的 sSysLogSrcId(= masterData.sId)作为 sGuid; + 没有该字段的调用方(如列表保存)会跳过,不影响原行为 */ + const bAutoCheck = value?.data?.find(x => x.name === 'master')?.column?.[0]?.bAutoCheck || false + if (bAutoCheck) { + const sGuid = value.sSysLogSrcId; + if (commonUtils.isNotEmptyStr(sGuid)) { + try { + await commonServices.postValueService( + token, + { + sClientType: '1', + paramsMap: { + iFlag: 1, + iTmpCheck: 0, + sFormGuid: sModelsId, + sGuid, + sSlaveId: '', + sBillNo: '', + }, + }, + `${commonConfig.server_host}business/doExamine?sModelsId=${sModelsId}`, + ); + } catch (e) { + console.error('保存后自动审核失败:', e); + } + } + } return dataReturn; } else if (dataReturn.code === 2) { Modal.info({ @@ -195,7 +223,7 @@ export async function saveData(param) { {dataReturn.msg} ), - onOk() {}, + onOk() { }, }); } else if (dataReturn.code === -7) { /* 防呆校验 返回是-7 */ return dataReturn; @@ -314,7 +342,7 @@ export function getShowTypes(name, props) { getFloatNum: props.getFloatNum, getDateFormat: props.getDateFormat, // onChange: props.onChange, - onChange: () => {}, + onChange: () => { }, formRoute: props.formRoute, } } @@ -1051,7 +1079,7 @@ export function handleUnitType(app, resultValue) { } export function showLocalMessage(props, sName, sChineseName) { let sTitle = ''; - if(commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) && commonUtils.isNotEmptyArr(props.app.commonConst)) { + if (commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) && commonUtils.isNotEmptyArr(props.app.commonConst)) { const gdsformconst = props.app.commonConst; sTitle = showMessage(gdsformconst, sName) } else { @@ -1256,7 +1284,7 @@ export async function clearSocketData(param) { message.destroy(); const { token, value, sModelsId } = param; const { optName } = value; - const dataReturn = (await commonServices.postValueService( token, value, `${commonConfig.server_host}sysWebsocket/clearUserOperationRecord?sModelsId=${sModelsId}` )).data; + const dataReturn = (await commonServices.postValueService(token, value, `${commonConfig.server_host}sysWebsocket/clearUserOperationRecord?sModelsId=${sModelsId}`)).data; /* 成功的话返回数据 */ if (dataReturn.code === 1) { /* 成功 */ if (!commonUtils.isEmpty(optName)) { diff --git a/src/mes/common/commonOperationBarComponent/index.js b/src/mes/common/commonOperationBarComponent/index.js index 0cb4258..ed26cbf 100644 --- a/src/mes/common/commonOperationBarComponent/index.js +++ b/src/mes/common/commonOperationBarComponent/index.js @@ -71,7 +71,7 @@ const useCommonOperationBarComponentEvent = props => { token, value: valuesNew, sModelsId, - bMachineTask: true + bMachineTask: true, }); return returnData;