diff --git a/src/components/CustomPages/BS/BS006View.js b/src/components/CustomPages/BS/BS006View.js index 8b95689..b37b4a8 100644 --- a/src/components/CustomPages/BS/BS006View.js +++ b/src/components/CustomPages/BS/BS006View.js @@ -121,7 +121,7 @@ class BS006View extends React.Component { data ?
{data.CODE} - {data.NAME} + {data.NAME} {data.Nav_Check != null ? data.Nav_Check.NAME : ""} {data.Nav_CheckType != null ? data.Nav_CheckType.NAME : ""} {data.Nav_CheckTypeLevel != null ? data.Nav_CheckTypeLevel.Nav_Enums.NAME : ""} diff --git a/src/components/CustomPages/CM/CM002ShowPrint.js b/src/components/CustomPages/CM/CM002ShowPrint.js index ef95ddf..aad711d 100644 --- a/src/components/CustomPages/CM/CM002ShowPrint.js +++ b/src/components/CustomPages/CM/CM002ShowPrint.js @@ -56,7 +56,7 @@ class CM002ShowPrint extends React.Component { extendInclude(json, 'Nav_Department') extendInclude(json, 'Nav_listPlanDetail.Nav_Department') extendInclude(json, 'Nav_listPlanDetail.Nav_User') - extendInclude(json, 'Nav_listPlanDetail.Nav_ListStandard.Nav_StandardCreate') + // extendInclude(json, 'Nav_listPlanDetail.Nav_ListStandard.Nav_StandardCreate') extendIgnoreDataRule(json) this.props.dispatch({ type: 'app/getDataByPost', @@ -119,7 +119,7 @@ class CM002ShowPrint extends React.Component { 应急演练时间 应急演练名称 - 关联应急预案 + {/* 关联应急预案 */} 组织演练部门 责任人 演练方案触发时间 @@ -128,11 +128,11 @@ class CM002ShowPrint extends React.Component { return {item.DRLL_DATE?.substring(0, 7)} {item.NAME} - { + {/* { item.Nav_ListStandard?.map((itmc, j) => { return (j > 0 ? "," : "") + itmc.Nav_StandardCreate.NAME }) - } + } */} {item.Nav_Department?.NAME} {item.Nav_User?.NAME} {item.TRIGGER_TIME?.split(' ')[0]} diff --git a/src/components/CustomPages/CM/CM034ShowPrint.js b/src/components/CustomPages/CM/CM034ShowPrint.js index 618b5bf..afdb90c 100644 --- a/src/components/CustomPages/CM/CM034ShowPrint.js +++ b/src/components/CustomPages/CM/CM034ShowPrint.js @@ -61,6 +61,7 @@ class CM034ShowPrint extends React.Component { extendInclude(json, 'Nav_ListDepartment.Nav_Department') extendInclude(json, 'Nav_FilesSummary.Nav_ImgFile.Nav_File') extendInclude(json, 'Nav_FilesRecord.Nav_ImgFile.Nav_File') + extendInclude(json, 'Nav_FilesStander.Nav_ImgFile.Nav_File') extendInclude(json, 'Nav_Approve.Nav_ApproveDetails.Nav_ApproveUser.Nav_UserSignFiles.Nav_ImgFile.Nav_File'); this.props.dispatch({ type: 'app/getDataByPost', @@ -131,6 +132,7 @@ class CM034ShowPrint extends React.Component { })} {showFiles(data.Nav_FilesSummary, config.picServerHost)} {showFiles(data.Nav_FilesRecord, config.picServerHost)} + {showFiles(data.Nav_FilesStander, config.picServerHost)} { data.STATUS >= 10 ? {