diff --git a/src/components/CustomPages/SK/SK016ShowPrint.js b/src/components/CustomPages/SK/SK016ShowPrint.js index 2ce5f5d..7ce2574 100644 --- a/src/components/CustomPages/SK/SK016ShowPrint.js +++ b/src/components/CustomPages/SK/SK016ShowPrint.js @@ -46,6 +46,7 @@ class SK016ShowPrint extends React.Component { // extendRule(json, 'TASK_ID', 1, taskID); extendInclude(json, 'Nav_ApplyUser'); extendInclude(json, 'Nav_ApplyDepartment'); + extendInclude(json, 'Nav_ProductionUnit'); extendInclude(json, 'Nav_RiskArea'); extendInclude(json, 'Nav_ReportFiles'); extendInclude(json, 'Nav_ReportFiles.Nav_ImgFile'); diff --git a/src/components/CustomPages/SK/SK018ShowPrint.js b/src/components/CustomPages/SK/SK018ShowPrint.js index c7aea07..64bb8a6 100644 --- a/src/components/CustomPages/SK/SK018ShowPrint.js +++ b/src/components/CustomPages/SK/SK018ShowPrint.js @@ -63,6 +63,7 @@ class SK018ShowPrint extends React.Component { extendInclude(json, 'Nav_Report'); extendInclude(json, 'Nav_ApplyUser'); extendInclude(json, 'Nav_ApplyDepartment'); + extendInclude(json, 'Nav_ProductionUnit'); extendInclude(json, 'Nav_RiskArea'); extendInclude(json, 'Nav_Photos'); extendInclude(json, 'Nav_Photos.Nav_ImgFile'); diff --git a/src/components/CustomPages/SK/SK080ShowPrint.js b/src/components/CustomPages/SK/SK080ShowPrint.js index b994287..633d3e5 100644 --- a/src/components/CustomPages/SK/SK080ShowPrint.js +++ b/src/components/CustomPages/SK/SK080ShowPrint.js @@ -105,7 +105,14 @@ class SK080ShowPrint extends React.Component { {data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''} {data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''} {data.Nav_RectifyRecord?data.Nav_RectifyRecord?.CODE:''} - + {data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_ProductionUnit?data.Nav_RectifyRecord.Nav_ProductionUnit.NAME:''} + {data.Nav_RectifyRecord?data.Nav_RectifyRecord.HIDDEN_PLACE:''} + { + showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotoas ? data.Nav_RectifyRecord.Nav_RectifyPhotoas:null, config.picServerHost, this) + } + { + showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotobs ? data.Nav_RectifyRecord.Nav_RectifyPhotobs:null, config.picServerHost, this) + } {data.HIDDEN_DESCRIPTION} {data.HIDDEN_REASON} {data.Nav_ChargeUser ? data.Nav_ChargeUser.NAME : ''} @@ -117,7 +124,7 @@ class SK080ShowPrint extends React.Component { }) } {data.REVIEW_DESCRIPTION} - { + { showFileImg(data?.Nav_Files, config.picServerHost, this) } {enums.SKReviewResultEnum.enums[data.REVIEW_RESULT]}