ccy/mh-sms-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh-sms-web

Browse Source
This commit is contained in:
yunkexin 2024-03-22 09:25:57 +08:00
commit e6da597053
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/CustomPages/CM/CM026Edit.js
View File

@ -63,7 +63,7 @@ class CM026Edit extends React.Component {
this.props.dispatch({ this.props.dispatch({
type: 'app/getDataByPost', type: 'app/getDataByPost',
payload: json, 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) => { onComplete: (ret) => {
if (ret) { if (ret) {
this.state.data = ret this.state.data = ret
@ -216,6 +216,9 @@ class CM026Edit extends React.Component {
it.REMARK = newData.REMARK; it.REMARK = newData.REMARK;
} }
}) })
if (this.props.data && this.props.data.TaskID) {
data.TaskID = this.props.data.TaskID
}
this.props.dispatch({ this.props.dispatch({
type: 'app/getDataByPost', type: 'app/getDataByPost',
payload: data, payload: data,

2
src/components/CustomPages/CM/CM026ShowPrint.js
View File

@ -157,7 +157,7 @@ class CM026ShowPrint extends React.Component {
<table className={styles.PrintFormLight}> <table className={styles.PrintFormLight}>
<tbody> <tbody>
<tr> <tr>
<td colSpan={4} className={styles.showPrintHead2}>应急能力评估项目中间表</td> <td colSpan={4} className={styles.showPrintHead2}>应急能力评估项目</td>
</tr> </tr>
<tr className={styles.PrintFormLightTh}> <tr className={styles.PrintFormLightTh}>
<td>评估项目</td> <td>评估项目</td>

19
src/files/edit/SC028.js
View File

@ -7,6 +7,16 @@ import { connect } from 'dva';
// 编辑 制定任务 // 编辑 制定任务
export default { 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 }) => { onBeforeEdit: ({ isNew, dispatch, stateData, setFieldVisible, setFieldValue, setFieldValueByBatch, setFieldEditable, login }) => {
setFieldVisible("Nav_ListPReView", false); setFieldVisible("Nav_ListPReView", false);
@ -29,8 +39,6 @@ export default {
}); });
} }
// 如果是跑批需要召开的会议 会议类型不能修改 // 如果是跑批需要召开的会议 会议类型不能修改
if (stateData.CREACTTYPE == 10) { if (stateData.CREACTTYPE == 10) {
setFieldEditable('MEETINGTYPE', false) 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 // STATUS
onChange: ({ value, colInfo, dispatch, setFieldValueByBatch, record, stateData, data, getFieldValue, setFieldVisible, setFieldValue }) => { onChange: ({ value, colInfo, dispatch, setFieldValueByBatch, record, stateData, data, getFieldValue, setFieldVisible, setFieldValue }) => {
if (colInfo != null && colInfo.FIELD_NAME == "MEETINGTYPE") { if (colInfo != null && colInfo.FIELD_NAME == "MEETINGTYPE") {
//会议类型 修改 人员自动 判断加载 //会议类型 修改 人员自动 判断加载