diff --git a/src/components/CustomPages/CM/CM026Edit.js b/src/components/CustomPages/CM/CM026Edit.js index 17c173e..e8e5853 100644 --- a/src/components/CustomPages/CM/CM026Edit.js +++ b/src/components/CustomPages/CM/CM026Edit.js @@ -63,7 +63,7 @@ class CM026Edit extends React.Component { this.props.dispatch({ type: 'app/getDataByPost', payload: json, - url: id.length > 0 ? 'CM/AbilityEvaluate/Get' : 'CM/CMAbilityEvaluate/GetNew', + url: (id && id.length > 0) ? 'CM/AbilityEvaluate/Get' : 'CM/CMAbilityEvaluate/GetNew', onComplete: (ret) => { if (ret) { this.state.data = ret @@ -216,6 +216,9 @@ class CM026Edit extends React.Component { it.REMARK = newData.REMARK; } }) + if (this.props.data && this.props.data.TaskID) { + data.TaskID = this.props.data.TaskID + } this.props.dispatch({ type: 'app/getDataByPost', payload: data, diff --git a/src/components/CustomPages/CM/CM026ShowPrint.js b/src/components/CustomPages/CM/CM026ShowPrint.js index 3b97954..7fc57a3 100644 --- a/src/components/CustomPages/CM/CM026ShowPrint.js +++ b/src/components/CustomPages/CM/CM026ShowPrint.js @@ -157,7 +157,7 @@ class CM026ShowPrint extends React.Component { - + diff --git a/src/files/edit/SC028.js b/src/files/edit/SC028.js index 532bf09..157f986 100644 --- a/src/files/edit/SC028.js +++ b/src/files/edit/SC028.js @@ -7,6 +7,16 @@ import { connect } from 'dva'; // 编辑 制定任务 export default { + onBeforeSaveHandleRecord(params) { + params.record.TaskID = params.data.TaskID //TaskID传递消息表ID + params.record.STATUS = params.customParams; + if (!params.record.CONTENT && params.record.Nav_ListMeetingContent != null && params.record.Nav_ListMeetingContent.length > 0) { + params.record.CONTENT32 = "," + params.record.Nav_ListMeetingContent.map(item => { if (item.IS_DELETED) { return '' } else { return item.Nav_ContentName.NAME } }).join(',') + "," + } else { + params.record.CONTENT32 = params.record.CONTENT + } + onBeforeSaveHandleRecordLog(params, 'SC032', '前端日志') + }, onBeforeEdit: ({ isNew, dispatch, stateData, setFieldVisible, setFieldValue, setFieldValueByBatch, setFieldEditable, login }) => { setFieldVisible("Nav_ListPReView", false); @@ -29,8 +39,6 @@ export default { }); } - - // 如果是跑批需要召开的会议 会议类型不能修改 if (stateData.CREACTTYPE == 10) { setFieldEditable('MEETINGTYPE', false) @@ -84,16 +92,9 @@ export default { } //判断是否 配置 可以发送短信 - }, - onBeforeSaveHandleRecord(params) { - params.record.TaskID = params.data.TaskID //TaskID传递消息表ID - params.record.STATUS = params.customParams; - onBeforeSaveHandleRecordLog(params, 'SC032', '前端日志') - }, // STATUS - onChange: ({ value, colInfo, dispatch, setFieldValueByBatch, record, stateData, data, getFieldValue, setFieldVisible, setFieldValue }) => { if (colInfo != null && colInfo.FIELD_NAME == "MEETINGTYPE") { //会议类型 修改 人员自动 判断加载
应急能力评估项目中间表应急能力评估项目
评估项目