diff --git a/src/components/CustomPages/SK/SK010ShowPrint.js b/src/components/CustomPages/SK/SK010ShowPrint.js
index 91e4ca8..9cc591c 100644
--- a/src/components/CustomPages/SK/SK010ShowPrint.js
+++ b/src/components/CustomPages/SK/SK010ShowPrint.js
@@ -151,6 +151,7 @@ class SK010ShowPrint extends React.Component {
隐患等级 |
隐患地点 |
隐患原因 |
+ 备注 |
隐患照片 |
{
@@ -227,6 +228,11 @@ class SK010ShowPrint extends React.Component {
})
}
+
+ {
+ item.REMARK
+ }
+ |
{
showFiles(item?.Nav_CheckRecordDetailFiles, config.picServerHost, this)
diff --git a/src/components/CustomPages/SK/SK012ShowPrint.js b/src/components/CustomPages/SK/SK012ShowPrint.js
index 8f5dcb6..817d4b7 100644
--- a/src/components/CustomPages/SK/SK012ShowPrint.js
+++ b/src/components/CustomPages/SK/SK012ShowPrint.js
@@ -172,6 +172,7 @@ class SK012ShowPrint extends React.Component {
| 隐患等级 |
隐患地点 |
隐患原因 |
+ 备注 |
隐患照片 |
{
@@ -248,6 +249,11 @@ class SK012ShowPrint extends React.Component {
})
}
+
+ {
+ item.REMARK
+ }
+ |
{
showFiles(item?.Nav_CheckRecordDetailFiles, config.picServerHost, this)
diff --git a/src/components/CustomPages/SK/SK014ShowPrint.js b/src/components/CustomPages/SK/SK014ShowPrint.js
index abc2ba8..ffb0330 100644
--- a/src/components/CustomPages/SK/SK014ShowPrint.js
+++ b/src/components/CustomPages/SK/SK014ShowPrint.js
@@ -149,6 +149,7 @@ class SK014ShowPrint extends React.Component {
| 隐患原因 |
整改责任人 |
整改期限 |
+ 备注 |
隐患照片 |
{
@@ -207,6 +208,11 @@ class SK014ShowPrint extends React.Component {
moment(item.RECITIFY_TIME).format('YYYY-MM-DD')
}
+
+ {
+ item.REMARK
+ }
+ |
{
showFiles(item?.Nav_ReportDetailFiles, config.picServerHost, this)
diff --git a/src/components/CustomPages/SK/SK018ShowPrint.js b/src/components/CustomPages/SK/SK018ShowPrint.js
index 9ea02c3..c6b15ea 100644
--- a/src/components/CustomPages/SK/SK018ShowPrint.js
+++ b/src/components/CustomPages/SK/SK018ShowPrint.js
@@ -176,7 +176,7 @@ class SK018ShowPrint extends React.Component {
{
showFiles(data?.Nav_Files, config.picServerHost, this)
}
- {/* {enums.SKIsStoreEnum.enums[data.IS_STORE]} */}
+ {data.REMARK}
: null
}
diff --git a/src/components/CustomPages/SK/SK020ShowPrint.js b/src/components/CustomPages/SK/SK020ShowPrint.js
index 4368e10..347007b 100644
--- a/src/components/CustomPages/SK/SK020ShowPrint.js
+++ b/src/components/CustomPages/SK/SK020ShowPrint.js
@@ -151,6 +151,7 @@ class SK020ShowPrint extends React.Component {
| 整改期限 |
整改落实人 |
验收人 |
+ 备注 |
隐患照片 |
{
@@ -214,6 +215,11 @@ class SK020ShowPrint extends React.Component {
item.Nav_AcceptUser?.NAME
}
+
+ {
+ item.REMARK
+ }
+ |
{
showFiles(item?.Nav_RectifyDetailFiles, config.picServerHost, this)
diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js
index 2dbd29b..b36637c 100644
--- a/src/components/CustomPages/SK/SK022ShowPrint.js
+++ b/src/components/CustomPages/SK/SK022ShowPrint.js
@@ -176,6 +176,7 @@ class SK022ShowPrint extends React.Component {
showUserSign(data.Nav_AcceptUser, config.picServerHost)
: data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
}
+ {data.REMARK}
: null
}
diff --git a/src/components/CustomPages/SK/SK033ShowPrint.js b/src/components/CustomPages/SK/SK033ShowPrint.js
index a250c49..e2c1718 100644
--- a/src/components/CustomPages/SK/SK033ShowPrint.js
+++ b/src/components/CustomPages/SK/SK033ShowPrint.js
@@ -134,7 +134,8 @@ class SK033ShowPrint extends React.Component {
| 风险类别 |
管控措施 |
应急处置 |
- 状态 |
+ 新增标识 |
+ 是否有效 |
{
data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@@ -172,6 +173,9 @@ class SK033ShowPrint extends React.Component {
// })
}
+
+ {enums.SKMarkEnum.enums[item.MARK]}
+ |
{enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]}
|
diff --git a/src/components/CustomPages/SK/SK035ShowPrint.js b/src/components/CustomPages/SK/SK035ShowPrint.js
index 798638a..46cad7a 100644
--- a/src/components/CustomPages/SK/SK035ShowPrint.js
+++ b/src/components/CustomPages/SK/SK035ShowPrint.js
@@ -130,7 +130,8 @@ class SK035ShowPrint extends React.Component {
辨识岗位 |
管控措施 |
应急处置 |
- 状态 |
+ 新增标识 |
+ 是否有效 |
{
data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@@ -188,6 +189,9 @@ class SK035ShowPrint extends React.Component {
// })
}
+
+ {enums.SKMarkEnum.enums[item.MARK]}
+ |
{enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]}
|
diff --git a/src/components/CustomPages/SK/SK037ShowPrint.js b/src/components/CustomPages/SK/SK037ShowPrint.js
index efc41a6..4918b9f 100644
--- a/src/components/CustomPages/SK/SK037ShowPrint.js
+++ b/src/components/CustomPages/SK/SK037ShowPrint.js
@@ -131,7 +131,8 @@ class SK037ShowPrint extends React.Component {
辨识岗位 |
管控措施 |
应急处置 |
- 状态 |
+ 新增标识 |
+ 是否有效 |
{
data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@@ -189,6 +190,9 @@ class SK037ShowPrint extends React.Component {
// })
}
+
+ {enums.SKMarkEnum.enums[item.MARK]}
+ |
{enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]}
|
diff --git a/src/components/CustomPages/SK/SK039ShowPrint.js b/src/components/CustomPages/SK/SK039ShowPrint.js
index 46eecd8..3c8df6d 100644
--- a/src/components/CustomPages/SK/SK039ShowPrint.js
+++ b/src/components/CustomPages/SK/SK039ShowPrint.js
@@ -136,6 +136,8 @@ class SK039ShowPrint extends React.Component {
管控层级 |
管控部门 |
管控责任人 |
+ 新增标识 |
+ 是否有效 |
{
data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@@ -209,10 +211,16 @@ class SK039ShowPrint extends React.Component {
{
//item.IDENTIFY_USER
item?.Nav_DetailDeparts && item?.Nav_DetailDeparts.map((item2, i) => {
- return {item2?.Nav_User?.NAME}
+ return {item2?.Nav_Department?.Nav_User?.NAME}
})
}
+
+ {enums.SKMarkEnum.enums[item.MARK]}
+ |
+
+ {enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]}
+ |
})
}
diff --git a/src/components/CustomPages/SK/SK041ShowPrint.js b/src/components/CustomPages/SK/SK041ShowPrint.js
index c5314e0..dc75c39 100644
--- a/src/components/CustomPages/SK/SK041ShowPrint.js
+++ b/src/components/CustomPages/SK/SK041ShowPrint.js
@@ -136,6 +136,8 @@ class SK041ShowPrint extends React.Component {
管控层级 |
管控部门 |
管控责任人 |
+ 新增标识 |
+ 是否有效 |
{
data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@@ -209,10 +211,16 @@ class SK041ShowPrint extends React.Component {
{
//item.IDENTIFY_USER
item?.Nav_DetailDeparts && item?.Nav_DetailDeparts.map((item2, i) => {
- return {item2?.Nav_User?.NAME}
+ return {item2?.Nav_Department?.Nav_User?.NAME}
})
}
+
+ {enums.SKMarkEnum.enums[item.MARK]}
+ |
+
+ {enums.SKEnableStatusEnum.enums[item.ENABLE_STATUS]}
+ |
})
}
diff --git a/src/files/edit/SK035.js b/src/files/edit/SK035.js
index 9eb4685..9f1e297 100644
--- a/src/files/edit/SK035.js
+++ b/src/files/edit/SK035.js
@@ -2,6 +2,7 @@ import { message } from "antd/lib/index";
import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
import moment from 'moment';
import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd';
+import Item from "antd/lib/list/Item";
/**
* @return {string}
*/
@@ -51,6 +52,10 @@ export default {
Nav_Area: item.Nav_Area,
Nav_Type: item.Nav_Type,
Nav_RiskName: item.Nav_RiskName,
+ PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID,
+ Nav_ProductionUnit:item.Nav_ProductionUnit,
+ MARK:item.MARK,
+ ENABLE_STATUS:item.ENABLE_STATUS,
}
if(stateData && stateData.Nav_Details)
{