diff --git a/src/components/CustomPages/SK/SK010CheckList.js b/src/components/CustomPages/SK/SK010CheckList.js
index 6e181a8..41963ed 100644
--- a/src/components/CustomPages/SK/SK010CheckList.js
+++ b/src/components/CustomPages/SK/SK010CheckList.js
@@ -16,7 +16,7 @@ class SK010CheckList extends React.Component {
selectedRowKeys:[],
taskSelects: [],
dataList: [],
- MineType:0,
+ PRODUCTION_UNIT_ID:null,
CHECK_CYCLE:0,
CHECK_TYPE:0,
CHECK_CYCLE_ID:null,
@@ -103,8 +103,8 @@ class SK010CheckList extends React.Component {
},
{
title: "生产单元",
- dataIndex: "Nav_ProductionUnit.NAME",
- key: "Nav_ProductionUnit.NAME",
+ dataIndex: "MINE_NAME",
+ key: "MINE_NAME",
// render: (text, record, index) => {
// return
// }
@@ -204,7 +204,7 @@ class SK010CheckList extends React.Component {
this.setState({
showDetail: true,
},()=>{
- let json = initFilter(this.props.login.OrgId,item.MineType,'','','',item.CHECK_TYPE_ID,item.CHECK_CYCLE,item.CHECK_TYPE);
+ let json = initFilter(this.props.login.OrgId,item.PRODUCTION_UNIT_ID,'','','',item.CHECK_TYPE_ID,item.CHECK_CYCLE,item.CHECK_TYPE);
extendIgnoreDataRule(json)
this.props.dispatch({
type: 'app/getDataByPost',
@@ -213,7 +213,7 @@ class SK010CheckList extends React.Component {
onComplete: (ret) => {
if (ret) {
this.setState({ Details: ret,
- MineType:item.MineType,
+ PRODUCTION_UNIT_ID :item.PRODUCTION_UNIT_ID,
CHECK_CYCLE:item.CHECK_CYCLE,
CHECK_TYPE:item.CHECK_TYPE,
CHECK_TYPE_ID:item.CHECK_TYPE_ID, });
diff --git a/src/components/CustomPages/SK/SK033ShowPrint.js b/src/components/CustomPages/SK/SK033ShowPrint.js
index b1dd206..f57f3c6 100644
--- a/src/components/CustomPages/SK/SK033ShowPrint.js
+++ b/src/components/CustomPages/SK/SK033ShowPrint.js
@@ -115,11 +115,10 @@ class SK033ShowPrint extends React.Component {
{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}
{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}
{data.YEAR}
- {data.CONTENTS}
{moment(data.START_DATE).format('YYYY-MM-DD')}
{data.END_DATE ? moment(data.END_DATE).format('YYYY-MM-DD') : null}
+ {data.CONTENTS}
{data.Nav_Require ? data.Nav_Require.NAME : ''}
-
{
showFiles(data?.Nav_Files, config.picServerHost, this)
}
diff --git a/src/files/edit/SK033.js b/src/files/edit/SK033.js
index 7b7f2a3..c185586 100644
--- a/src/files/edit/SK033.js
+++ b/src/files/edit/SK033.js
@@ -86,7 +86,7 @@ export default {
Nav_Type: item.Nav_Type,
Nav_RiskName: item.Nav_RiskName,
EVALUATE_LEVEL:item.EVALUATE_LEVEL,
- MARK:0,
+ MARK:10,
ENABLE_STATUS:0,
Nav_ProductionUnit: item.Nav_ProductionUnit,
}