ccy/mh-lcmk-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-lcmk-sms-web

Browse Source
This commit is contained in:
wjn 2024-07-03 11:27:43 +08:00
commit 23a817bf77
9 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,7 @@ class BS026ShowPrint extends React.Component {
// paddingLeft: '50px'
data ? <div>
<Descriptions title="" size="middle" bordered>
<Descriptions.Item label="检查范围">{data.CHECKOBJECT_DESCRIPTION}</Descriptions.Item>
{/* <Descriptions.Item label="检查范围">{data.CHECKOBJECT_DESCRIPTION}</Descriptions.Item> */}
<Descriptions.Item label="检查类型">{data.Nav_CheckType?.NAME}</Descriptions.Item>
<Descriptions.Item label="检查层级">{data.Nav_CheckTypeLevel?.Nav_Enums.NAME}</Descriptions.Item>
<Descriptions.Item label="检查区域">{data.Nav_RiskArea?.NAME}</Descriptions.Item>

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

@ -197,7 +197,7 @@ class BS032ShowPrint extends React.Component {
<Descriptions.Item span={2} label="安全检查名称">{data.NAME}</Descriptions.Item>
<Descriptions.Item span={2} label="安全检查编号">{data.CODE}</Descriptions.Item>
<Descriptions.Item span={2} label="检查类型">{data.Nav_CheckType.NAME}</Descriptions.Item>
<Descriptions.Item span={2} label="检查范围">{enums.BSMineTypeEnum.enums[data.CHECKOBJECT]}</Descriptions.Item>
{/* <Descriptions.Item span={2} label="检查范围">{enums.BSMineTypeEnum.enums[data.CHECKOBJECT]}</Descriptions.Item> */}
<Descriptions.Item span={2} label="检查层级">{levelNameShow}</Descriptions.Item>
{/* data.Nav_CheckTypeLevel.Nav_Enums.NAME */}
<Descriptions.Item span={2} label="检查时间">{data.CHECKTIME}</Descriptions.Item>

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

@ -152,7 +152,7 @@ class BS034ShowPrint extends React.Component {
<Descriptions.Item label="安全检查名称">{data.NAME?.replace('任务表', '记录表')}</Descriptions.Item>
<Descriptions.Item label="安全检查编号">{data.CODE}</Descriptions.Item>
<Descriptions.Item label="检查类型">{data.Nav_CheckType.NAME}</Descriptions.Item>
<Descriptions.Item label="检查范围">{data.CHECKOBJECT_DESCRIPTION}</Descriptions.Item>
{/* <Descriptions.Item label="检查范围">{data.CHECKOBJECT_DESCRIPTION}</Descriptions.Item> */}
<Descriptions.Item label="检查层级">{data.Nav_CheckTypeLevel.Nav_Enums.NAME}</Descriptions.Item>
<Descriptions.Item label="检查时间">{data.CHECKTIME}</Descriptions.Item>
<Descriptions.Item label="检查区域">{data.RiskAreaNAME}</Descriptions.Item>

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

@ -184,7 +184,7 @@ class BS034View extends React.Component {
<Descriptions.Item span={2} label="安全检查名称">{data.NAME?.replace('任务表', '记录表')}</Descriptions.Item>
<Descriptions.Item span={2} label="安全检查编号">{data.CODE}</Descriptions.Item>
<Descriptions.Item span={2} label="检查类型">{data.Nav_CheckType.NAME}</Descriptions.Item>
<Descriptions.Item span={2} label="检查范围">{data.CHECKOBJECT_DESCRIPTION}</Descriptions.Item>
{/* <Descriptions.Item span={2} label="检查范围">{data.CHECKOBJECT_DESCRIPTION}</Descriptions.Item> */}
<Descriptions.Item span={2} label="检查层级">{data.Nav_CheckTypeLevel.Nav_Enums.NAME}</Descriptions.Item>
<Descriptions.Item span={2} label="检查时间">{data.CHECKTIME}</Descriptions.Item>
<Descriptions.Item span={2} label="检查区域">{

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

@ -92,7 +92,7 @@ class BS048ShowPrint extends React.Component {
//, paddingLeft: '50px'
data ? <div>
<Descriptions title="" size="middle" bordered>
<Descriptions.Item label="检查范围">{this.props.app.enums.BSMineTypeEnum.enums[data.CHECKOBJECT]}</Descriptions.Item>
{/* <Descriptions.Item label="检查范围">{this.props.app.enums.BSMineTypeEnum.enums[data.CHECKOBJECT]}</Descriptions.Item> */}
<Descriptions.Item label="检查项目">{data.Nav_CheckProject.NAME}</Descriptions.Item>
<Descriptions.Item label="检查问题描述">{data.DESCREPTION}</Descriptions.Item>

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

@ -118,7 +118,7 @@ class BS070ShowPrint extends React.Component {
{
Nav_SafeCheck ? <div>
<Descriptions title="" size="middle" bordered>
<Descriptions.Item label="检查范围">{enums.BSMineTypeEnum.enums[Nav_SafeCheck.CHECKOBJECT]}</Descriptions.Item>
{/* <Descriptions.Item label="检查范围">{enums.BSMineTypeEnum.enums[Nav_SafeCheck.CHECKOBJECT]}</Descriptions.Item> */}
<Descriptions.Item label="检查类型">{Nav_SafeCheck?.Nav_CheckType?.NAME}</Descriptions.Item>
<Descriptions.Item label="检查层级">{Nav_SafeCheck?.Nav_CheckTypeLevel?.Nav_Enums?.NAME}</Descriptions.Item>
<Descriptions.Item label="检查区域"><p >{

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

@ -119,7 +119,7 @@ class BS073ShowPrint extends React.Component {
{
data ? <div >
<Descriptions title="" size="middle" bordered>
<Descriptions.Item label="检查范围">{enums.BSMineTypeEnum.enums[data.Nav_Submit?.CHECKOBJECT]}</Descriptions.Item>
{/* <Descriptions.Item label="检查范围">{enums.BSMineTypeEnum.enums[data.Nav_Submit?.CHECKOBJECT]}</Descriptions.Item> */}
<Descriptions.Item label="检查类型">{data.Nav_Submit?.Nav_CheckType?.NAME}</Descriptions.Item>
<Descriptions.Item label="检查层级">{data.Nav_Submit?.Nav_CheckTypeLevel?.Nav_Enums?.NAME}</Descriptions.Item>
<Descriptions.Item label="提交人">{data.Nav_Submit?.Nav_User?.NAME}</Descriptions.Item>

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

@ -470,20 +470,31 @@ export default {
homeReload: true,
rules: [parentRecord],
close: () => {
loadData();//onCancel 会被 重新赋值 在此做刷新
loadData();//wyw onCancel 会被 重新赋值 在此做刷新
},
onCancel: () => {
//此方法要有不能被删除 别处会重写
//wyw 此方法要有不能被删除 别处会重写
},
onSave: (data, clearData, setStateData) => {
//wyw 昌老师写的这个不能加，因为这样传参被修改了，限定逻辑不对了（onBeforeEdit 不执行，不知道拿什么去限制不然也是可以传入parentRecord）
// let tmpData = {
// SAFE_CHECK_ID: data.SAFE_CHECK_ID,
// ORG_ID: data.ORG_ID,
// Nav_ListUserCheck: data.Nav_ListUserCheck
// }
// setStateData(tmpData);
//第二次页面打开时 使页面编辑为空 保留别的信息传入
let tmpData = {
ORG_ID: data.ORG_ID,
ROW_NO: data.ROW_NO + (data.Nav_ListCheckDetail == null || data.Nav_ListCheckDetail.length == 0 ? 0 : data.Nav_ListCheckDetail.length),
SAFE_CHECK_ID: data.SAFE_CHECK_ID,
AREA_IDS: data.AREA_IDS,
PROJECT_IDS: data.PROJECT_IDS,
CATEGORY_IDS: data.CATEGORY_IDS,
CHECK_TYPE_ID: data.CHECK_TYPE_ID,
CHECK_TYPE_LEVEL_ID: data.CHECK_TYPE_LEVEL_ID,
DEPARTMENT_ID: data.DEPARTMENT_ID,
CHECKOBJECT: data.CHECKOBJECT,
Nav_ListUserCheck: data.Nav_ListUserCheck,
Nav_ListCheckDetail: [],
CHECKCONTENT: '',
// Nav_CheckArea: [],
// RISK_AREA_ID: null
}
setStateData(tmpData);
}
}} />,
};

6
src/routes/Home.js
View File

@ -650,8 +650,10 @@ class Home extends React.Component {
};
clearData = () => {
let newtmpData = { ...this.state.tmpData };
newtmpData["data"].id = "";
newtmpData["data"].homeReload = false;
if (newtmpData["data"] != null) {
newtmpData["data"].id = "";
newtmpData["data"].homeReload = false;
}
newtmpData.formCode = "";
this.setState({
formVisible: false,