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

手动新增检查记录

Browse Source
This commit is contained in:
wyw 2024-05-30 14:19:16 +08:00
parent 5a0cc9d31c
commit 97cd9090fe
8 changed files with 160 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/baseComponents/EditBaseComponent/index.js
View File

@ -2896,6 +2896,16 @@ params【字段属性】=值
}
];
tempData.rules = [...rule];
} else if (btnConfig.customParams != null && btnConfig.customParams.indexOf('parentRecord') > -1) {
//wyw BS057 弹窗 BS077 传递父项信息 到页面
let rule = [
{
field: "parentRecord",
operator: 1,
value: this.state.data
}
];
tempData.rules = [...rule];
}
} else {
let cParams = btnConfig.customParams.split('&');

8
src/baseComponents/EditComponent/index.js
View File

@ -1720,10 +1720,16 @@ class EditComponent extends EditBaseComponent {
else if (btnType === 7) {//自定义
const clickEventFun = this.getDynJsFunc(clickEventFunName);
const { validateFieldsAndScroll } = this.props.form;
var parentRecordSuit = parentRecord
if (btnConfig.customParams != null && btnConfig.customParams.indexOf('parentRecord') > -1 && this.state.data) {
// wyw 子表按钮添加主页面信息传参到子页面
//wyw BS057 弹窗 BS077 传递父项信息 到页面
parentRecordSuit = this.state.data
}
if (typeof clickEventFun === 'function') {
const btnParam = clickEventFun({
record,
parentRecord: parentRecord,
parentRecord: parentRecordSuit,
dispatch: this.props.dispatch,
loadData: () => { this.onLoadData() },
login: this.props.login,

4
src/components/CustomPages/BS/BS034ShowPrint.js
View File

@ -183,7 +183,7 @@ class BS034ShowPrint extends React.Component {
<td>问题等级</td>
<td>整改建议与措施</td>
<td>检查人员</td>
<td>备注</td>
{/* <td>备注</td> */}
<td>隐患地点</td>
<td>附件</td>
@ -213,7 +213,7 @@ class BS034ShowPrint extends React.Component {
return (j > 0 ? "," : "") + user.Nav_User?.NAME
})
}</td>
<td>{item.REMARK_RESULT}</td>
{/* <td>{item.REMARK_RESULT}</td> */}
<td>{item.ADDRESS}</td>
<td>{

2
src/components/CustomPages/BS/BS069ShowPrint.js
View File

@ -94,7 +94,7 @@ class BS069ShowPrint extends React.Component {
{
data ? <div style={{ width: '95%' }}>
<Descriptions title='' size='middle' bordered>
<Descriptions.Item label="退回人">{data.Nav_Reject?.Nav_User.NAME}</Descriptions.Item>
<Descriptions.Item label="退回人">{data.Nav_Reject?.Nav_User?.NAME}</Descriptions.Item>
<Descriptions.Item label="退回原因">{data.Nav_Reject?.REASON}</Descriptions.Item>
<Descriptions.Item label="附件">{
showFiles(data.Nav_Reject.Nav_Files, config.picServerHost)

12
src/files/edit/BS034.js
View File

@ -46,6 +46,7 @@ export default {
element.QUESTION_LEVEL = null
} else if (element.CHECKRESULT == 20) {
if (element.Nav_ListCheckDetailQuestion != null && element.Nav_ListCheckDetailQuestion.length > 0) {
strDEMAND = ''
//显示整改建议与措施
// strDEMAND = element.Nav_ListCheckDetailQuestion[0].Nav_Question.DEMAND
for (let i = 0; i < element.Nav_ListCheckDetailQuestion.length; i++) {
@ -163,13 +164,14 @@ export default {
//退回
btnBack: ({ record, setState, close, loadData, getLoadParam, login, btn, dispatch }) => {
const data={
content: <FormPage formCode={btn.FORM_CODE} data={{id:(record? record.ID:''),
homeReload:true,
close:()=>{
const data = {
content: <FormPage formCode={btn.FORM_CODE} data={{
id: (record ? record.ID : ''),
homeReload: true,
close: () => {
loadData();
},
}}/>,
}} />,
};
return {
content: <EditRowShowModal data={data} login={login} title={btn.LABEL}>

75
src/files/edit/BS057.js
View File

@ -3,7 +3,7 @@ import ConfirmButton from '../../components/common/ConfirmButton';
import { Button, Input, Modal, message } from 'antd'
import storage from '../../utils/storage'
import config from "../../config.js"
import { extendInclude, extendRule, getDataFieldValue, initFilter, empty, extendOrder, guid, getSubTableData, onBeforeSaveHandleRecordLog, auditOptionShow2, extend } from "../../utils/common";
import { extendInclude, extendRule, getDataFieldValue, initFilter, empty, extendOrder, guid, getSubTableData, onBeforeSaveHandleRecordLog, auditOptionShow2, GetRiskReasonShow } from "../../utils/common";
import Item from 'antd/lib/list/Item';
import styles from '../../components/CustomPages/HI/StepForm.css';
import ShowModal from '../../components/common/ShowModal';
@ -35,6 +35,7 @@ export default {
// params.record["Nav_CheckMain.Nav_CheckQuestion.DEMAND"] = params.getDataFieldValue("DEMAND_SAME");
var strDEMAND = ''
stateData.Nav_ListSafeCheckDetail.forEach(element => {
strDEMAND = ''
if (element.QUESTION_LEVEL != null && element.QUESTION_LEVEL == 0) {
element.QUESTION_LEVEL = null
}
@ -93,7 +94,6 @@ export default {
})
}
},
btnOK: ({ record, close, loadData, getLoadParam, login, btn, dispatch }) => {
const confirmRevert = () => {
if (record.Nav_ListCheckDetailUser.length > 0) {
@ -135,7 +135,6 @@ export default {
},
handleRenderRowControl(params) {
// debugger
// if (params.colConfig.field === 'Nav_Files') {
// } else
@ -164,8 +163,34 @@ export default {
return ""
}
}
} else {
} else if (params.record.CHECKRESULT == "20" && params.record.ISAUTOLOAD != null && params.record.ISAUTOLOAD == false) {
//只修改手动新增的检查记录
if (params.colConfig.field === 'Nav_ListCheckDetailQuestion') {
return <>
{params.record.CHECKRESULT_DESCRIPTION}
</>
} else if (params.colConfig.field == 'QUESTION_LEVEL') {
return <>
{params.record.QUESTION_LEVEL_DESCRIPTION}
</>
} else if (params.colConfig.field == 'ADDRESS') {
return <>
{params.record.ADDRESS}
</>
} else if (params.colConfig.field == 'Nav_ListCheckDetailReason') {
// params.record.Nav_ListCheckDetailReason?.forEach((item, i) => {
// return <>
// {item.Nav_RiskReason.NAME}
// </>
// })
return <>
{
GetRiskReasonShow(params.record.Nav_ListCheckDetailReason)
}
</>
}
}
else {
//填表 如果是 主要选择人 其他 => 控件 无 => 空 有问题 显示等级
// if (params.colConfig.field === 'QUESTION_LEVEL') {
// if (params.record.QUESTION_LEVEL == null && params.record.QUESTION_LEVEL == 0) {
@ -176,7 +201,6 @@ export default {
// return <></>
// }
// }
}
}
@ -416,5 +440,44 @@ export default {
// // record.QUESTION_LEVEL = 20
// // }
}
},
//新增记录
btnAdd: ({ record, data, setState, close, loadData, getLoadParam, login, btn, dispatch }) => {
// btnAdd: (params) => {
const data1 = {
content: <FormPage formCode={btn.FORM_CODE} data={{
id: (record ? record.ID : ''),
homeReload: true,
rules: [record],
onCancel: () => {
loadData();
},
}} />,
};
return {
content: <ShowModal data={data1} login={login} title={btn.LABEL}>
<Button type={btn.CSS} icon={btn.ICON}>{btn.LABEL}</Button>
</ShowModal>
}
},
//btnSubAdd: (params) => {
btnSubAdd: ({ record, parentRecord, setState, close, loadData, login, btn, dispatch }) => {
const dataSubForm = {
content: <FormPage formCode={btn.FORM_CODE} data={{
id: (record ? record.ID : ''),
homeReload: true,
rules: [parentRecord],
onCancel: () => {
loadData();
},
}} />,
};
return {
content: <ShowModal data={dataSubForm} login={login} title={btn.LABEL}>
<Button type={btn.CSS} icon={btn.ICON}>{btn.LABEL}</Button>
</ShowModal>
}
},
}

50
src/files/edit/BS077.js Normal file
View File

@ -0,0 +1,50 @@
import ConfirmButton from '../../components/common/ConfirmButton';
import { Button, message } from 'antd'
import storage from '../../utils/storage'
import config from "../../config.js"
import { extendInclude, extendRule, getDataFieldValue, initFilter, empty, extendOrder, guid, getSubTableData, onBeforeSaveHandleRecordLog, auditOptionShow2 } from "../../utils/common";
import Item from 'antd/lib/list/Item';
import styles from '../../components/CustomPages/HI/StepForm.css';
import EditRowShowModal from '../../components/common/EditRowShowModal';
import FormPage from '../../components/FormPage';
export default {
onBeforeEdit: ({ data, setFieldEditable, setFieldValueByBatch }) => {
if (data.rules && data.rules.length > 0) {
// var parentInfo = data.rules[0].value
var parentInfo = data.rules[0]//.value
if (parentInfo.Nav_ListCheckRiskArea && parentInfo.Nav_ListCheckProject && parentInfo.Nav_ListCheckProjectCategory) {
var AREA_IDS = ''
var PROJECT_IDS = ''
var CATEGORY_IDS = ''
for (var i = 0; i < parentInfo.Nav_ListCheckRiskArea.length; i++) {
AREA_IDS += ',' + parentInfo.Nav_ListCheckRiskArea[i].RISK_AREA_ID
}
for (var i = 0; i < parentInfo.Nav_ListCheckProject.length; i++) {
PROJECT_IDS += ',' + parentInfo.Nav_ListCheckProject[i].CHECK_PROJECT_ID
}
for (var i = 0; i < parentInfo.Nav_ListCheckProjectCategory.length; i++) {
CATEGORY_IDS += ',' + parentInfo.Nav_ListCheckProjectCategory[i].CHECK_PROJECT_CATEGORY_ID
}
let temps = [];
temps.push({ field: "ROW_NO", value: parentInfo.Nav_ListSafeCheckDetail.length });
temps.push({ field: "SAFE_CHECK_ID", value: parentInfo.ID });
temps.push({ field: "AREA_IDS", value: AREA_IDS });
temps.push({ field: "PROJECT_IDS", value: PROJECT_IDS });
temps.push({ field: "CATEGORY_IDS", value: CATEGORY_IDS });
temps.push({ field: "CHECK_TYPE_ID", value: parentInfo.CHECK_TYPE_ID });
temps.push({ field: "CHECK_TYPE_LEVEL_ID", value: parentInfo.CHECK_TYPE_LEVEL_ID });
temps.push({ field: "DEPARTMENT_ID", value: parentInfo.DEPARTMENTID });
temps.push({ field: "CHECKOBJECT", value: parentInfo.CHECKOBJECT });
temps.push({ field: "Nav_ListUserCheck", value: parentInfo.Nav_ListSafeCheckDetail[0].Nav_ListCheckDetailUser });
if (parentInfo.Nav_ListCheckRiskArea != null && parentInfo.Nav_ListCheckRiskArea.length == 1) {
temps.push({ field: "Nav_CheckArea.NAME", value: parentInfo.Nav_ListCheckRiskArea[0].Nav_RiskArea.NAME });
temps.push({ field: "RISK_AREA_ID", value: parentInfo.Nav_ListCheckRiskArea[0].RISK_AREA_ID });
setFieldEditable("Nav_CheckArea.NAME", false)
}
setFieldValueByBatch(temps);
}
}
},
}

11
src/utils/common.js
View File

@ -2031,3 +2031,14 @@ export function getSixMonth(number, yearString = "", monthString = "") {
return retrundate;
}
export function GetRiskReasonShow(ListCheckDetailReason) {
if (ListCheckDetailReason == null || ListCheckDetailReason.length < 1) {
return ''
} else {
let resultShow = ''
ListCheckDetailReason.forEach((item, i) => {
resultShow +=((i>0?' ':'')+ item.Nav_RiskReason.NAME)
})
return resultShow
}
}