diff --git a/src/components/CustomPages/FO/FO043ShowPrint.js b/src/components/CustomPages/FO/FO043ShowPrint.js
index 942f5ee..5844415 100644
--- a/src/components/CustomPages/FO/FO043ShowPrint.js
+++ b/src/components/CustomPages/FO/FO043ShowPrint.js
@@ -141,7 +141,7 @@ class FO043ShowPrint extends React.Component {
{data.JOB_CONTENT}
{data.Nav_Type?.NAME}
{data.JOB_CONTENT}
- {data.Nav_MonitorUser?.NAME}
+ {/* {data.Nav_MonitorUser?.NAME} */}
{data.JOB_DATE}
{data.JOB_END_DATE}
{ data.Nav_Risks && data.Nav_Risks.map((item, i) => {
@@ -259,7 +259,7 @@ class FO043ShowPrint extends React.Component {
}
- = 10?'block':'none'}}>
+ 15?'block':'none'}}>
{
data.COMPLETED_CONTENT
}
diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js
index 5ad6582..39986a2 100644
--- a/src/components/CustomPages/SK/SK022ShowPrint.js
+++ b/src/components/CustomPages/SK/SK022ShowPrint.js
@@ -1,7 +1,7 @@
import { message } from "antd/lib/index";
import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles,showUserSign, GetFileModel } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles,showUserSign,showFileImg, GetFileModel } from "../../../utils/common";
import ReactToPrint from "react-to-print";
import config from "../../../config";
import XLSX from 'xlsx';
@@ -163,10 +163,10 @@ class SK022ShowPrint extends React.Component {
{data.RECTIFICATION_MONEY}
{data.COMPLETE_DATE?moment(data.COMPLETE_DATE).format('YYYY-MM-DD'):null}
{
- showFiles(data?.Nav_RectifyPhotoas, config.picServerHost, this)
+ showFileImg(data?.Nav_RectifyPhotoas, config.picServerHost, this)
}
{
- showFiles(data?.Nav_RectifyPhotobs, config.picServerHost, this)
+ showFileImg(data?.Nav_RectifyPhotobs, config.picServerHost, this)
}
{
showFiles(data?.Nav_RectifyFiles, config.picServerHost, this)
@@ -175,13 +175,12 @@ class SK022ShowPrint extends React.Component {
{enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]}
{data.ACCEPT_OPINION}
{
- data.STATUS == 20 &&
data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
showUserSign(data.Nav_RecitifyUser, config.picServerHost)
: data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''
}
{
- data.STATUS == 30 && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
+ (data.STATUS == 20 ||data.STATUS == 30)&& data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
showUserSign(data.Nav_RecitifyUser, config.picServerHost)
: data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
}