修改同步
This commit is contained in:
parent
cc837d08eb
commit
883b3698f7
@ -98,8 +98,8 @@ class BS042ShowPrint extends React.Component {
|
|||||||
url: 'BS/BSRiskSubmitNoticePerson/GetDetailCheck',
|
url: 'BS/BSRiskSubmitNoticePerson/GetDetailCheck',
|
||||||
onComplete: (ret) => {
|
onComplete: (ret) => {
|
||||||
if (ret) {
|
if (ret) {
|
||||||
var isCheckerCheck = true
|
var isCheckerCheck = true//是否 验收人 确认
|
||||||
var isDealUserCheck = true
|
var isDealUserCheck = true//是否 整改责任人 确认
|
||||||
var isActualDealCheck = true
|
var isActualDealCheck = true
|
||||||
if (this.props.data.tableKey == undefined || this.props.data.tableKey != "1") {
|
if (this.props.data.tableKey == undefined || this.props.data.tableKey != "1") {
|
||||||
isCheckerCheck = false
|
isCheckerCheck = false
|
||||||
@ -107,10 +107,11 @@ class BS042ShowPrint extends React.Component {
|
|||||||
isActualDealCheck = false
|
isActualDealCheck = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (isCheckerCheck)
|
if (isCheckerCheck)
|
||||||
isCheckerCheck = (this.state.loginid == ret.Nav_ListRiskSubmitContent[0].CHECK_USER_ID && ret.Nav_ListRiskSubmitContent[0].RiskContentState == 15) ? true : false
|
isCheckerCheck = (this.state.loginid == ret.Nav_ListRiskSubmitContent[0].DEAL_USER_ID && ret.Nav_ListRiskSubmitContent[0].RiskContentState == 15) ? true : false//CHECK_USER_ID
|
||||||
if (isDealUserCheck)
|
if (isDealUserCheck)
|
||||||
isDealUserCheck = (this.state.loginid == ret.Nav_ListRiskSubmitContent[0].DEAL_USER_ID && ret.Nav_ListRiskSubmitContent[0].RiskContentState == 17) ? true : false
|
isDealUserCheck = (this.state.loginid == ret.Nav_ListRiskSubmitContent[0].CHECK_USER_ID && ret.Nav_ListRiskSubmitContent[0].RiskContentState == 17) ? true : false//DEAL_USER_ID
|
||||||
if (isActualDealCheck)
|
if (isActualDealCheck)
|
||||||
isActualDealCheck = (this.state.loginid == ret.Nav_ListRiskSubmitContent[0].ACTUAL_DEAL_USER_ID && ret.Nav_ListRiskSubmitContent[0].RiskContentState == 32) ? true : false
|
isActualDealCheck = (this.state.loginid == ret.Nav_ListRiskSubmitContent[0].ACTUAL_DEAL_USER_ID && ret.Nav_ListRiskSubmitContent[0].RiskContentState == 32) ? true : false
|
||||||
|
|
||||||
@ -142,9 +143,10 @@ class BS042ShowPrint extends React.Component {
|
|||||||
this.state.DEALOPINION = val
|
this.state.DEALOPINION = val
|
||||||
}
|
}
|
||||||
sureCheck = (val) => {
|
sureCheck = (val) => {
|
||||||
|
debugger
|
||||||
var tmpData = this.props.data
|
var tmpData = this.props.data
|
||||||
if (val == 1 || val == 2) {
|
if (val == 1 || val == 2) {
|
||||||
//验收人 同意
|
//整改责任人 同意
|
||||||
// Parameter4 审批结果 1同意 2驳回
|
// Parameter4 审批结果 1同意 2驳回
|
||||||
// Parameter3 驳回理由
|
// Parameter3 驳回理由
|
||||||
if (val == 2 && (this.state.DEALOPINION == undefined || this.state.DEALOPINION == null || this.state.DEALOPINION == '')) {
|
if (val == 2 && (this.state.DEALOPINION == undefined || this.state.DEALOPINION == null || this.state.DEALOPINION == '')) {
|
||||||
@ -167,7 +169,7 @@ class BS042ShowPrint extends React.Component {
|
|||||||
});
|
});
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
//整改责任人 同意
|
//验收人 同意
|
||||||
if (val == 20 && (this.state.DEALOPINION == undefined || this.state.DEALOPINION == null || this.state.DEALOPINION == '')) {
|
if (val == 20 && (this.state.DEALOPINION == undefined || this.state.DEALOPINION == null || this.state.DEALOPINION == '')) {
|
||||||
// message.success('请填写驳回意见!')
|
// message.success('请填写驳回意见!')
|
||||||
message.error('请填写驳回意见!')
|
message.error('请填写驳回意见!')
|
||||||
@ -263,6 +265,7 @@ class BS042ShowPrint extends React.Component {
|
|||||||
<td style={{ minWidth: '90px' }}>整改责任人</td>
|
<td style={{ minWidth: '90px' }}>整改责任人</td>
|
||||||
<td style={{ minWidth: '70px' }}>验收人</td>
|
<td style={{ minWidth: '70px' }}>验收人</td>
|
||||||
{(isActualDealCheck || data.Nav_ListRiskSubmitContent[0].Nav_UserActualDeal != null) ? <td style={{ minWidth: '90px' }}>整改落实人</td> : null}
|
{(isActualDealCheck || data.Nav_ListRiskSubmitContent[0].Nav_UserActualDeal != null) ? <td style={{ minWidth: '90px' }}>整改落实人</td> : null}
|
||||||
|
<td style={{ minWidth: '70px' }}>附件</td>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
{data.Nav_ListRiskSubmitContent.map((item, i) => {
|
{data.Nav_ListRiskSubmitContent.map((item, i) => {
|
||||||
@ -284,6 +287,12 @@ class BS042ShowPrint extends React.Component {
|
|||||||
|
|
||||||
{/* <td>{isActualDealCheck ? item.Nav_UserActualDeal?.NAME : (<a className={styles.red} > {item.Nav_UserActualDeal?.NAME} </a>)} </td> */}
|
{/* <td>{isActualDealCheck ? item.Nav_UserActualDeal?.NAME : (<a className={styles.red} > {item.Nav_UserActualDeal?.NAME} </a>)} </td> */}
|
||||||
{(isActualDealCheck || data.Nav_ListRiskSubmitContent[0].Nav_UserActualDeal != null) ? (isActualDealCheck ? <td>{<a className={styles.red} > {item.Nav_UserActualDeal?.NAME} </a>}</td> : <td>{item.Nav_UserActualDeal?.NAME}</td>) : null}
|
{(isActualDealCheck || data.Nav_ListRiskSubmitContent[0].Nav_UserActualDeal != null) ? (isActualDealCheck ? <td>{<a className={styles.red} > {item.Nav_UserActualDeal?.NAME} </a>}</td> : <td>{item.Nav_UserActualDeal?.NAME}</td>) : null}
|
||||||
|
|
||||||
|
<td>{
|
||||||
|
item.Nav_Files && item.Nav_Files.map((item, i) => {
|
||||||
|
return <a width={'20%'} title={item.Nav_ImgFile.FILE_NAME} target='_blank' href={config.picServerHost + item.Nav_ImgFile.Nav_File.FILE_PATH} >{item.Nav_ImgFile.FILE_NAME} </a>
|
||||||
|
})
|
||||||
|
} </td>
|
||||||
</tr>
|
</tr>
|
||||||
})}
|
})}
|
||||||
|
|
||||||
@ -307,8 +316,8 @@ class BS042ShowPrint extends React.Component {
|
|||||||
<tr>
|
<tr>
|
||||||
<th></th>
|
<th></th>
|
||||||
<td >
|
<td >
|
||||||
<Button className={styles.agreedUser} type={'primary'} icon={'check'} loading={this.state.isOKLoad} onClick={() => this.sureCheck(riskContentState == 15 ? 10 : 1)} >同意</Button>
|
<Button className={styles.agreedUser} type={'primary'} icon={'check'} loading={this.state.isOKLoad} onClick={() => this.sureCheck(riskContentState == 15 ? 1 : 10)} >同意</Button> {/*10 : 1 */}
|
||||||
<Button className={styles.rejectedUser} type={'primary'} icon={'close'} loading={this.state.isRejectLoad} onClick={() => this.sureCheck(riskContentState == 15 ? 20 : 2)} >驳回</Button>
|
<Button className={styles.rejectedUser} type={'primary'} icon={'close'} loading={this.state.isRejectLoad} onClick={() => this.sureCheck(riskContentState == 15 ? 2 : 20)} >驳回</Button> {/* 20 : 2 */}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@ -8,6 +8,14 @@ export default {
|
|||||||
params.record.SUBMIT_STATUS = params.customParams;
|
params.record.SUBMIT_STATUS = params.customParams;
|
||||||
},
|
},
|
||||||
onBeforeEdit: ({ isNew, setFieldValue, stateData, data, setFieldEditable, getFieldValue, dispatch, ListCheckRiskArea, setFieldValueByBatch, setFieldVisible }) => {
|
onBeforeEdit: ({ isNew, setFieldValue, stateData, data, setFieldEditable, getFieldValue, dispatch, ListCheckRiskArea, setFieldValueByBatch, setFieldVisible }) => {
|
||||||
|
debugger
|
||||||
|
// BS006.js
|
||||||
|
if (stateData.SUBMIT_TYPE == undefined || stateData.SUBMIT_TYPE == 10 || (stateData.Nav_ListRiskSubmitContent.length > 0 && stateData.Nav_ListRiskSubmitContent[0].CHECK_PROJECT_ID != null)) {
|
||||||
|
//检查上报 隐藏 属性: 检查类型 检查层级 子表:检查项目 检查项目分类
|
||||||
|
setFieldVisible("Nav_Submit.Nav_CheckType.NAME", false)
|
||||||
|
setFieldVisible("Nav_Submit.Nav_CheckTypeLevel.Nav_Enums.NAME", false)
|
||||||
|
}
|
||||||
|
|
||||||
if (!isNew) {
|
if (!isNew) {
|
||||||
setFieldEditable('Nav_CheckType.NAME', false)
|
setFieldEditable('Nav_CheckType.NAME', false)
|
||||||
setFieldEditable('Nav_CheckTypeLevel.Nav_Enums.NAME', false)
|
setFieldEditable('Nav_CheckTypeLevel.Nav_Enums.NAME', false)
|
||||||
@ -49,6 +57,7 @@ export default {
|
|||||||
var dtNow = moment().format('YYYY-MM-DD HH:mm:ss');
|
var dtNow = moment().format('YYYY-MM-DD HH:mm:ss');
|
||||||
setFieldValue("CHECKTIME", dtNow)
|
setFieldValue("CHECKTIME", dtNow)
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
// 隐患上报
|
// 隐患上报
|
||||||
onChange: ({ value, colInfo, getFieldValue, setFieldValue, dispatch, setFieldValueByBatch, getSubTableData, updateSubTableData }) => {
|
onChange: ({ value, colInfo, getFieldValue, setFieldValue, dispatch, setFieldValueByBatch, getSubTableData, updateSubTableData }) => {
|
||||||
|
|||||||
@ -92,7 +92,6 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
btnOK: ({ record, close, loadData, getLoadParam, login, btn, dispatch }) => {
|
btnOK: ({ record, close, loadData, getLoadParam, login, btn, dispatch }) => {
|
||||||
@ -111,8 +110,6 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
handleCancel: () => { // 退出弹窗
|
handleCancel: () => { // 退出弹窗
|
||||||
this.getBaseInfoData(1, this.state.tableKey, 5);
|
this.getBaseInfoData(1, this.state.tableKey, 5);
|
||||||
this.clearData();
|
this.clearData();
|
||||||
@ -203,97 +200,317 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
onSubChange: ({ row, setDataState, pageCode, record, colInfo, dispatch, stateData, props }) => {
|
// onSubChange: ({ row, setDataState, pageCode, record, colInfo, dispatch, stateData, props }) => {
|
||||||
|
// //BS057
|
||||||
|
// if (colInfo.FIELD_NAME == "Nav_ListCheckDetailQuestion") {
|
||||||
|
// for (let i = 0; i < stateData.Nav_ListSafeCheckDetail.length; i++) {
|
||||||
|
// if (record.ID == stateData.Nav_ListSafeCheckDetail[i].ID) {
|
||||||
|
// var listQ = record.Nav_ListCheckDetailQuestion
|
||||||
|
// var strDEMAND = ''
|
||||||
|
// var LevelMain = ''
|
||||||
|
// var CHECK_MAIN_ID = ''
|
||||||
|
// var CHECKRESULT = 0 // 无 10 检查问题一致 20 其他 30
|
||||||
|
// debugger
|
||||||
|
// var checkedCount = 0
|
||||||
|
// for (let j = 0; j < listQ.length; j++) {
|
||||||
|
// if (listQ[j].IS_DELETED != undefined && listQ[j].IS_DELETED) {
|
||||||
|
// continue
|
||||||
|
// }
|
||||||
|
// checkedCount++
|
||||||
|
// // strDEMAND += (j > 0 ? ',' : '') + listQ[j].Nav_Question.DEMAND
|
||||||
|
// if (listQ[j].SAFE_CHECK_QUESTION_ID == '55555555-5555-5555-5555-555555555555') {
|
||||||
|
// // if (CHECKRESULT != 10 && CHECKRESULT != 0) {
|
||||||
|
// // message.error("无或其他只能单选!")
|
||||||
|
// // }
|
||||||
|
// CHECKRESULT = 10
|
||||||
|
// } else if (listQ[j].SAFE_CHECK_QUESTION_ID == '77777777-7777-7777-7777-777777777777') {
|
||||||
|
// // if (CHECKRESULT != 30 && CHECKRESULT != 0) {
|
||||||
|
// // message.error("无或其他只能单选!")
|
||||||
|
// // }
|
||||||
|
// CHECKRESULT = 30
|
||||||
|
// } else {
|
||||||
|
// strDEMAND += (strDEMAND.length > 0 ? ',' : '') + listQ[j].Nav_Question.DEMAND
|
||||||
|
// // if (CHECKRESULT != 20 && CHECKRESULT != 0) {
|
||||||
|
// // message.error("无或其他只能单选!")
|
||||||
|
// // }
|
||||||
|
// CHECKRESULT = 20
|
||||||
|
// //取值修改 (准确)
|
||||||
|
// if (LevelMain.length == '' && listQ[j].Nav_Main != null && listQ[j].Nav_Main.QUESTION_LEVEL != null) {
|
||||||
|
// LevelMain = listQ[j].Nav_Main.QUESTION_LEVEL
|
||||||
|
// CHECK_MAIN_ID = listQ[j].Nav_Main.ID
|
||||||
|
// } else if (LevelMain == '' && listQ[j].QUESTION_LEVEL != null) {
|
||||||
|
// LevelMain = listQ[j].QUESTION_LEVEL
|
||||||
|
// CHECK_MAIN_ID = ''
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// if (checkedCount > 1) {
|
||||||
|
// message.error("只能选择一个检查问题描述!")
|
||||||
|
// }
|
||||||
|
// if (CHECKRESULT == 10) {
|
||||||
|
// record["QUESTION_LEVEL"] = null
|
||||||
|
// record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
|
||||||
|
// record.QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
|
||||||
|
// } else if (CHECKRESULT == 20) {
|
||||||
|
// // 对应行 取第一个 未删除的 检查问题 显示 问题等级
|
||||||
|
// record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = strDEMAND
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].DEMANDS = strDEMAND
|
||||||
|
// if (LevelMain != '' && LevelMain > 0) {
|
||||||
|
// record["CHECK_MAIN_ID"] = CHECK_MAIN_ID
|
||||||
|
// record["QUESTION_LEVEL"] = LevelMain// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL_SAME
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = LevelMain// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL_SAME
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].CHECK_MAIN_ID = CHECK_MAIN_ID
|
||||||
|
// }
|
||||||
|
// } else if (CHECKRESULT == 30) {
|
||||||
|
// record["QUESTION_LEVEL"] = null
|
||||||
|
// record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
|
||||||
|
// record.QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
|
||||||
|
// } else if (CHECKRESULT == 0) {
|
||||||
|
// record["QUESTION_LEVEL"] = null
|
||||||
|
// record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
|
||||||
|
// record.QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
|
||||||
|
// }
|
||||||
|
// //保存信息
|
||||||
|
// record["CHECKRESULT"] = CHECKRESULT
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].CHECKRESULT = CHECKRESULT
|
||||||
|
// // record["Nav_CheckQuestion.DEMAND"] = stateData.Nav_ListSafeCheckDetail[i].DEMAND_SAME
|
||||||
|
// // params.stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = params.stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL_SAME
|
||||||
|
// // params.stateData.Nav_ListSafeCheckDetail[i].Nav_CheckMain.Nav_CheckQuestion.DEMAND = params.stateData.Nav_ListSafeCheckDetail[i].DEMAND_SAME
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// // record.Nav_ListCheckDetailQuestion.Nav_Question.DEMAND = strDEMAND
|
||||||
|
// // if (listQ != null && listQ.length > 0) {
|
||||||
|
// // // if (listQ) { }
|
||||||
|
// // record.QUESTION_LEVEL = 20
|
||||||
|
// // } else {
|
||||||
|
// // record.QUESTION_LEVEL = 20
|
||||||
|
// // }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
//新版 直接加信息 只有 无和对应信息
|
||||||
|
onSubChange: ({ row, setDataState, pageCode, record, colInfo, dispatch, stateData, props }) => {
|
||||||
//BS057
|
//BS057
|
||||||
if (colInfo.FIELD_NAME == "Nav_ListCheckDetailQuestion") {
|
if (colInfo.FIELD_NAME == "Nav_ListCheckDetailQuestion") {
|
||||||
|
var listQ = record.Nav_ListCheckDetailQuestion.filter(e => e.IS_DELETED == null || e.IS_DELETED == undefined || e.IS_DELETED != true)
|
||||||
|
if (listQ == null || listQ.length < 1) {
|
||||||
|
debugger
|
||||||
|
//数据清空
|
||||||
|
for (let i = 0; i < stateData.Nav_ListSafeCheckDetail.length; i++) {
|
||||||
|
if (record.ID == stateData.Nav_ListSafeCheckDetail[i].ID) {
|
||||||
|
stateData.Nav_ListSafeCheckDetail[i].CHECKRESULT = 10
|
||||||
|
stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
|
||||||
|
stateData.Nav_ListSafeCheckDetail[i].CHECK_MAIN_ID = null
|
||||||
|
stateData.Nav_ListSafeCheckDetail[i].DEMANDS = ''
|
||||||
|
message.error("请选择检查问题描述!")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (listQ != null && listQ.length > 1) {
|
||||||
|
var listQCheck = listQ.filter(e => e.SAFE_CHECK_QUESTION_ID == '55555555-5555-5555-5555-555555555555')
|
||||||
|
if (listQCheck != null && listQCheck.length > 0) {
|
||||||
|
message.error("无与检查问题不能同时选择!")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (let i = 0; i < stateData.Nav_ListSafeCheckDetail.length; i++) {
|
var CHECKRESULT = 10 // 无 10 检查问题一致 20 其他 30
|
||||||
if (record.ID == stateData.Nav_ListSafeCheckDetail[i].ID) {
|
if (listQ[0].SAFE_CHECK_QUESTION_ID != '55555555-5555-5555-5555-555555555555') {
|
||||||
var listQ = record.Nav_ListCheckDetailQuestion
|
CHECKRESULT = 20
|
||||||
var strDEMAND = ''
|
}
|
||||||
var LevelMain = ''
|
var strDEMAND = ''
|
||||||
var CHECK_MAIN_ID = ''
|
var LevelMain = ''
|
||||||
var CHECKRESULT = 0 // 无 10 检查问题一致 20 其他 30
|
var CHECK_MAIN_ID = ''
|
||||||
for (let j = 0; j < listQ.length; j++) {
|
|
||||||
if (listQ[j].IS_DELETED != undefined && listQ[j].IS_DELETED) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// strDEMAND += (j > 0 ? ',' : '') + listQ[j].Nav_Question.DEMAND
|
|
||||||
if (listQ[j].SAFE_CHECK_QUESTION_ID == '55555555-5555-5555-5555-555555555555') {
|
|
||||||
if (CHECKRESULT != 10 && CHECKRESULT != 0) {
|
|
||||||
message.error("无或其他只能单选!")
|
|
||||||
}
|
|
||||||
CHECKRESULT = 10
|
|
||||||
} else if (listQ[j].SAFE_CHECK_QUESTION_ID == '77777777-7777-7777-7777-777777777777') {
|
|
||||||
if (CHECKRESULT != 30 && CHECKRESULT != 0) {
|
|
||||||
message.error("无或其他只能单选!")
|
|
||||||
}
|
|
||||||
CHECKRESULT = 30
|
|
||||||
} else {
|
|
||||||
strDEMAND += (strDEMAND.length > 0 ? ',' : '') + listQ[j].Nav_Question.DEMAND
|
|
||||||
|
|
||||||
if (CHECKRESULT != 20 && CHECKRESULT != 0) {
|
if (listQ.length > 1) {
|
||||||
message.error("无或其他只能单选!")
|
//需要数据 组装
|
||||||
}
|
var ListSafeCheckDetailNew = []
|
||||||
CHECKRESULT = 20
|
for (let i = 0; i < stateData.Nav_ListSafeCheckDetail.length; i++) {
|
||||||
|
if (record.ID == stateData.Nav_ListSafeCheckDetail[i].ID) {
|
||||||
//取值修改 (准确)
|
for (let j = 0; j < listQ.length; j++) {
|
||||||
if (LevelMain.length == '' && listQ[j].Nav_Main != null && listQ[j].Nav_Main.QUESTION_LEVEL != null) {
|
//额外数据处理
|
||||||
LevelMain = listQ[j].Nav_Main.QUESTION_LEVEL
|
const detailNew = JSON.parse(JSON.stringify(stateData.Nav_ListSafeCheckDetail[i]))
|
||||||
|
strDEMAND = listQ[j].Nav_Question.DEMAND
|
||||||
CHECK_MAIN_ID = listQ[j].Nav_Main.ID
|
CHECK_MAIN_ID = listQ[j].Nav_Main.ID
|
||||||
} else if (LevelMain == '' && listQ[j].QUESTION_LEVEL != null) {
|
LevelMain = listQ[j].Nav_Main.QUESTION_LEVEL
|
||||||
LevelMain = listQ[j].QUESTION_LEVEL
|
if (j != 0) {
|
||||||
CHECK_MAIN_ID = ''
|
//第一条不处理
|
||||||
|
detailNew.ID = guid()
|
||||||
|
//检查人 处理
|
||||||
|
detailNew.Nav_ListCheckDetailUser.forEach(e => {
|
||||||
|
e.ID = guid()
|
||||||
|
e.SAFE_CHECK_DETAIL_ID = detailNew.ID
|
||||||
|
debugger
|
||||||
|
if (!e.ISMAINCHECK) {
|
||||||
|
e.FLOW_STATUS = 1
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
detailNew.Nav_ListCheckDetailQuestion = []
|
||||||
|
listQ[j].SAFE_CHECK_DETAIL_ID = detailNew.ID
|
||||||
|
detailNew.Nav_ListCheckDetailQuestion.push(listQ[j])
|
||||||
|
|
||||||
|
//统一数据处理
|
||||||
|
detailNew.CHECKRESULT
|
||||||
|
detailNew.QUESTION_LEVEL = LevelMain
|
||||||
|
detailNew.CHECK_MAIN_ID = CHECK_MAIN_ID
|
||||||
|
detailNew.DEMANDS = strDEMAND
|
||||||
|
|
||||||
|
ListSafeCheckDetailNew.push(detailNew)
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
//未操作 无需处理 直接 插入
|
||||||
|
ListSafeCheckDetailNew.push(stateData.Nav_ListSafeCheckDetail[i])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
stateData.Nav_ListSafeCheckDetail = ListSafeCheckDetailNew
|
||||||
|
} else {
|
||||||
|
//统一数据处理
|
||||||
|
strDEMAND = listQ[0].Nav_Question.DEMAND
|
||||||
|
CHECK_MAIN_ID = listQ[0].Nav_Main.ID
|
||||||
|
LevelMain = listQ[0].QUESTION_LEVEL
|
||||||
|
//保存信息
|
||||||
|
record["CHECKRESULT"] = CHECKRESULT
|
||||||
|
|
||||||
if (CHECKRESULT == 10) {
|
if (CHECKRESULT == 10) {
|
||||||
record["QUESTION_LEVEL"] = null
|
record["QUESTION_LEVEL"] = null
|
||||||
record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
|
record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
|
||||||
record.QUESTION_LEVEL = null
|
record.QUESTION_LEVEL = null
|
||||||
stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
|
record["DEMANDS"] = ""
|
||||||
stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
|
record["CHECK_MAIN_ID"] = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
|
||||||
} else if (CHECKRESULT == 20) {
|
} else if (CHECKRESULT == 20) {
|
||||||
// 对应行 取第一个 未删除的 检查问题 显示 问题等级
|
// 对应行 取第一个 未删除的 检查问题 显示 问题等级
|
||||||
record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = strDEMAND
|
record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = strDEMAND
|
||||||
stateData.Nav_ListSafeCheckDetail[i].DEMANDS = strDEMAND
|
// stateData.Nav_ListSafeCheckDetail[i].DEMANDS = strDEMAND
|
||||||
|
|
||||||
if (LevelMain != '' && LevelMain > 0) {
|
if (LevelMain != '' && LevelMain > 0) {
|
||||||
|
record["DEMANDS"] = strDEMAND
|
||||||
record["CHECK_MAIN_ID"] = CHECK_MAIN_ID
|
record["CHECK_MAIN_ID"] = CHECK_MAIN_ID
|
||||||
record["QUESTION_LEVEL"] = LevelMain// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL_SAME
|
record["QUESTION_LEVEL"] = LevelMain// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL_SAME
|
||||||
stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = LevelMain// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL_SAME
|
// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = LevelMain// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL_SAME
|
||||||
stateData.Nav_ListSafeCheckDetail[i].CHECK_MAIN_ID = CHECK_MAIN_ID
|
// stateData.Nav_ListSafeCheckDetail[i].CHECK_MAIN_ID = CHECK_MAIN_ID
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (CHECKRESULT == 30) {
|
} else if (CHECKRESULT == 30) {
|
||||||
record["QUESTION_LEVEL"] = null
|
record["QUESTION_LEVEL"] = null
|
||||||
record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
|
record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
|
||||||
record.QUESTION_LEVEL = null
|
record.QUESTION_LEVEL = null
|
||||||
stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
|
// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
|
||||||
stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
|
// stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
|
||||||
} else if (CHECKRESULT == 0) {
|
} else if (CHECKRESULT == 0) {
|
||||||
record["QUESTION_LEVEL"] = null
|
record["QUESTION_LEVEL"] = null
|
||||||
record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
|
record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
|
||||||
record.QUESTION_LEVEL = null
|
record.QUESTION_LEVEL = null
|
||||||
stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
|
record["DEMANDS"] = ""
|
||||||
stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
|
record["CHECK_MAIN_ID"] = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var i = 0; i < stateData.Nav_ListSafeCheckDetail.length; i++) {
|
||||||
|
if (stateData.Nav_ListSafeCheckDetail[i].ID == record.ID) {
|
||||||
|
stateData.Nav_ListSafeCheckDetail[i] = record
|
||||||
|
break
|
||||||
|
}
|
||||||
}
|
}
|
||||||
//保存信息
|
|
||||||
record["CHECKRESULT"] = CHECKRESULT
|
|
||||||
stateData.Nav_ListSafeCheckDetail[i].CHECKRESULT = CHECKRESULT
|
|
||||||
// record["Nav_CheckQuestion.DEMAND"] = stateData.Nav_ListSafeCheckDetail[i].DEMAND_SAME
|
|
||||||
// params.stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = params.stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL_SAME
|
|
||||||
// params.stateData.Nav_ListSafeCheckDetail[i].Nav_CheckMain.Nav_CheckQuestion.DEMAND = params.stateData.Nav_ListSafeCheckDetail[i].DEMAND_SAME
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// record.Nav_ListCheckDetailQuestion.Nav_Question.DEMAND = strDEMAND
|
|
||||||
// if (listQ != null && listQ.length > 0) {
|
// for (let i = 0; i < stateData.Nav_ListSafeCheckDetail.length; i++) {
|
||||||
// // if (listQ) { }
|
// if (record.ID == stateData.Nav_ListSafeCheckDetail[i].ID) {
|
||||||
// record.QUESTION_LEVEL = 20
|
// var strDEMAND = ''
|
||||||
// } else {
|
// var LevelMain = ''
|
||||||
// record.QUESTION_LEVEL = 20
|
// var CHECK_MAIN_ID = ''
|
||||||
|
// var CHECKRESULT = 0 // 无 10 检查问题一致 20 其他 30
|
||||||
|
// debugger
|
||||||
|
// var checkedCount = 0
|
||||||
|
// for (let j = 0; j < listQ.length; j++) {
|
||||||
|
// if (listQ[j].IS_DELETED != undefined && listQ[j].IS_DELETED) {
|
||||||
|
// continue
|
||||||
|
// }
|
||||||
|
// checkedCount++
|
||||||
|
// // strDEMAND += (j > 0 ? ',' : '') + listQ[j].Nav_Question.DEMAND
|
||||||
|
// if (listQ[j].SAFE_CHECK_QUESTION_ID == '55555555-5555-5555-5555-555555555555') {
|
||||||
|
// // if (CHECKRESULT != 10 && CHECKRESULT != 0) {
|
||||||
|
// // message.error("无或其他只能单选!")
|
||||||
|
// // }
|
||||||
|
// CHECKRESULT = 10
|
||||||
|
// } else if (listQ[j].SAFE_CHECK_QUESTION_ID == '77777777-7777-7777-7777-777777777777') {
|
||||||
|
// // if (CHECKRESULT != 30 && CHECKRESULT != 0) {
|
||||||
|
// // message.error("无或其他只能单选!")
|
||||||
|
// // }
|
||||||
|
// CHECKRESULT = 30
|
||||||
|
// } else {
|
||||||
|
// strDEMAND += (strDEMAND.length > 0 ? ',' : '') + listQ[j].Nav_Question.DEMAND
|
||||||
|
// // if (CHECKRESULT != 20 && CHECKRESULT != 0) {
|
||||||
|
// // message.error("无或其他只能单选!")
|
||||||
|
// // }
|
||||||
|
// CHECKRESULT = 20
|
||||||
|
// //取值修改 (准确)
|
||||||
|
// if (LevelMain.length == '' && listQ[j].Nav_Main != null && listQ[j].Nav_Main.QUESTION_LEVEL != null) {
|
||||||
|
// LevelMain = listQ[j].Nav_Main.QUESTION_LEVEL
|
||||||
|
// CHECK_MAIN_ID = listQ[j].Nav_Main.ID
|
||||||
|
// } else if (LevelMain == '' && listQ[j].QUESTION_LEVEL != null) {
|
||||||
|
// LevelMain = listQ[j].QUESTION_LEVEL
|
||||||
|
// CHECK_MAIN_ID = ''
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// if (checkedCount > 1) {
|
||||||
|
// message.error("只能选择一个检查问题描述!")
|
||||||
|
// }
|
||||||
|
// if (CHECKRESULT == 10) {
|
||||||
|
// record["QUESTION_LEVEL"] = null
|
||||||
|
// record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
|
||||||
|
// record.QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
|
||||||
|
// } else if (CHECKRESULT == 20) {
|
||||||
|
// // 对应行 取第一个 未删除的 检查问题 显示 问题等级
|
||||||
|
// record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = strDEMAND
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].DEMANDS = strDEMAND
|
||||||
|
// if (LevelMain != '' && LevelMain > 0) {
|
||||||
|
// record["CHECK_MAIN_ID"] = CHECK_MAIN_ID
|
||||||
|
// record["QUESTION_LEVEL"] = LevelMain// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL_SAME
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = LevelMain// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL_SAME
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].CHECK_MAIN_ID = CHECK_MAIN_ID
|
||||||
|
// }
|
||||||
|
// } else if (CHECKRESULT == 30) {
|
||||||
|
// record["QUESTION_LEVEL"] = null
|
||||||
|
// record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
|
||||||
|
// record.QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
|
||||||
|
// } else if (CHECKRESULT == 0) {
|
||||||
|
// record["QUESTION_LEVEL"] = null
|
||||||
|
// record["Nav_ListCheckDetailQuestion.Nav_Question.DEMAND"] = null
|
||||||
|
// record.QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = null
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].DEMANDS = null
|
||||||
|
// }
|
||||||
|
// //保存信息
|
||||||
|
// record["CHECKRESULT"] = CHECKRESULT
|
||||||
|
// stateData.Nav_ListSafeCheckDetail[i].CHECKRESULT = CHECKRESULT
|
||||||
|
// // record["Nav_CheckQuestion.DEMAND"] = stateData.Nav_ListSafeCheckDetail[i].DEMAND_SAME
|
||||||
|
// // params.stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL = params.stateData.Nav_ListSafeCheckDetail[i].QUESTION_LEVEL_SAME
|
||||||
|
// // params.stateData.Nav_ListSafeCheckDetail[i].Nav_CheckMain.Nav_CheckQuestion.DEMAND = params.stateData.Nav_ListSafeCheckDetail[i].DEMAND_SAME
|
||||||
|
// }
|
||||||
// }
|
// }
|
||||||
|
// // record.Nav_ListCheckDetailQuestion.Nav_Question.DEMAND = strDEMAND
|
||||||
|
// // if (listQ != null && listQ.length > 0) {
|
||||||
|
// // // if (listQ) { }
|
||||||
|
// // record.QUESTION_LEVEL = 20
|
||||||
|
// // } else {
|
||||||
|
// // record.QUESTION_LEVEL = 20
|
||||||
|
// // }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user