diff --git a/src/components/CustomPages/SK/SK002CheckList.js b/src/components/CustomPages/SK/SK002CheckList.js index aa5528d..cc218d0 100644 --- a/src/components/CustomPages/SK/SK002CheckList.js +++ b/src/components/CustomPages/SK/SK002CheckList.js @@ -31,11 +31,8 @@ class SK002CheckList extends React.Component { }, { title: "生产单元", - dataIndex: "MineType", - key: "MineType", - render: (text, record, index) => { - return - } + dataIndex: "Nav_ProductionUnit.NAME", + key: "Nav_ProductionUnit.NAME", }, { title: "风险名称", diff --git a/src/components/CustomPages/SK/SK002ShowPrint.js b/src/components/CustomPages/SK/SK002ShowPrint.js index a994519..7192f8c 100644 --- a/src/components/CustomPages/SK/SK002ShowPrint.js +++ b/src/components/CustomPages/SK/SK002ShowPrint.js @@ -261,7 +261,7 @@ class SK002ShowPrint extends React.Component { data ?
- {enums.SKProductionUnit.enums[data.MineType]} + {data.Nav_ProductionUnit?.NAME} {data.Nav_RiskArea?.NAME} {data.RISK_NAME} {data.RISK_DESCRIPTION} diff --git a/src/components/CustomPages/SK/SK002ShowSummary.js b/src/components/CustomPages/SK/SK002ShowSummary.js index bc47a4c..b881a41 100644 --- a/src/components/CustomPages/SK/SK002ShowSummary.js +++ b/src/components/CustomPages/SK/SK002ShowSummary.js @@ -107,7 +107,7 @@ class SK002ShowSummary extends React.Component { {i+1} - {enums.SKProductionUnit.enums[item.MineType]} + {item.Nav_ProductionUnit?.NAME} {item.Nav_Area?.NAME} diff --git a/src/components/CustomPages/SK/SK004CheckList.js b/src/components/CustomPages/SK/SK004CheckList.js index 2c762d7..32ffc09 100644 --- a/src/components/CustomPages/SK/SK004CheckList.js +++ b/src/components/CustomPages/SK/SK004CheckList.js @@ -112,11 +112,11 @@ class SK004CheckList extends React.Component { }, { title: "生产单元", - dataIndex: "MineType", - key: "MineType", - render: (text, record, index) => { - return - } + dataIndex: "Nav_ProductionUnit.NAME", + key: "Nav_ProductionUnit.NAME", + // render: (text, record, index) => { + // return + // } }, { title: "检查层级", diff --git a/src/components/CustomPages/SK/SK004CheckListNew.js b/src/components/CustomPages/SK/SK004CheckListNew.js index b76bc34..0f02075 100644 --- a/src/components/CustomPages/SK/SK004CheckListNew.js +++ b/src/components/CustomPages/SK/SK004CheckListNew.js @@ -79,8 +79,8 @@ class SK004CheckListNew extends React.Component { }, { title: "生产单元", - dataIndex: "MineType", - key: "MineType", + dataIndex: "Nav_ProductionUnit.NAME", + key: "Nav_ProductionUnit.NAME", }, { title: "检查层级", diff --git a/src/components/CustomPages/SK/SK004CheckPost.js b/src/components/CustomPages/SK/SK004CheckPost.js index 995cf2b..98d8700 100644 --- a/src/components/CustomPages/SK/SK004CheckPost.js +++ b/src/components/CustomPages/SK/SK004CheckPost.js @@ -48,11 +48,11 @@ class SK004CheckPost extends React.Component { }, { title: "生产单元", - dataIndex: "MineType", - key: "MineType", - render: (text, record, index) => { - return - } + dataIndex: "Nav_ProductionUnit.NAME", + key: "Nav_ProductionUnit.NAME", + // render: (text, record, index) => { + // return + // } }, { title: "辨识区域", diff --git a/src/components/CustomPages/SK/SK004ShowPrint.js b/src/components/CustomPages/SK/SK004ShowPrint.js index b9debce..d8f26bc 100644 --- a/src/components/CustomPages/SK/SK004ShowPrint.js +++ b/src/components/CustomPages/SK/SK004ShowPrint.js @@ -329,7 +329,7 @@ class SK004ShowPrint extends React.Component { data ?
- {enums.SKProductionUnit.enums[data.MineType]} + {data.Nav_ProductionUnit?.NAME} {data.Nav_Area? data.Nav_Area?.NAME : ''} {data.RISK_NAME} {data.RISK_DESCRIPTION} diff --git a/src/components/CustomPages/SK/SK004ShowSummary.js b/src/components/CustomPages/SK/SK004ShowSummary.js index 70402f9..f288d10 100644 --- a/src/components/CustomPages/SK/SK004ShowSummary.js +++ b/src/components/CustomPages/SK/SK004ShowSummary.js @@ -119,7 +119,7 @@ class SK004ShowSummary extends React.Component { {i+1} - {enums.SKProductionUnit.enums[item.MineType]} + {item.Nav_ProductionUnit?.NAME} {item.Nav_Area?.NAME} diff --git a/src/components/CustomPages/SK/SK006ShowPrint.js b/src/components/CustomPages/SK/SK006ShowPrint.js index 3eb8cd3..9f544a6 100644 --- a/src/components/CustomPages/SK/SK006ShowPrint.js +++ b/src/components/CustomPages/SK/SK006ShowPrint.js @@ -158,7 +158,7 @@ class SK006ShowPrint extends React.Component { {moment(data.CREATE_TIME).format('YYYY-MM-DD')} {data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''} {data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''} - {enums.SKProductionUnit.enums[data.MineType]} + {data.Nav_ProductionUnit?.NAME} {data.Nav_CheckType ? data.Nav_CheckType.NAME : ''} {enums.SKPLANCHECKFREQUENCYEnum.enums[data.PLANCHECKFREQUENCY]} {enums.SKDepartmentTypeEnum.enums[data.DEPARTMENT_TYPE]} diff --git a/src/components/CustomPages/SK/SK010CheckList.js b/src/components/CustomPages/SK/SK010CheckList.js index 01d6cf1..0813268 100644 --- a/src/components/CustomPages/SK/SK010CheckList.js +++ b/src/components/CustomPages/SK/SK010CheckList.js @@ -103,11 +103,11 @@ class SK010CheckList extends React.Component { }, { title: "生产单元", - dataIndex: "MineType", - key: "MineType", - render: (text, record, index) => { - return - } + dataIndex: "Nav_ProductionUnit.NAME", + key: "Nav_ProductionUnit.NAME", + // render: (text, record, index) => { + // return + // } }, { title: "检查层级", diff --git a/src/components/CustomPages/SK/SK010ShowPrint.js b/src/components/CustomPages/SK/SK010ShowPrint.js index 2d4d9fd..50fe925 100644 --- a/src/components/CustomPages/SK/SK010ShowPrint.js +++ b/src/components/CustomPages/SK/SK010ShowPrint.js @@ -134,7 +134,7 @@ class SK010ShowPrint extends React.Component { {moment(data.CREATE_TIME).format('YYYY-MM-DD')} {data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''} {data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''} - {enums.SKProductionUnit.enums[data.MineType]} + {data.Nav_ProductionUnit?.NAME} {data.Nav_CheckType ? data.Nav_CheckType.NAME : ''} {enums.SKPLANCHECKFREQUENCYEnum.enums[data.PLANCHECKFREQUENCY]} {enums.SKDepartmentTypeEnum.enums[data.DEPARTMENT_TYPE]} diff --git a/src/components/CustomPages/SK/SK012ShowPrint.js b/src/components/CustomPages/SK/SK012ShowPrint.js index 866e0b1..5e74c3e 100644 --- a/src/components/CustomPages/SK/SK012ShowPrint.js +++ b/src/components/CustomPages/SK/SK012ShowPrint.js @@ -134,7 +134,7 @@ class SK012ShowPrint extends React.Component { {moment(data.CREATE_TIME).format('YYYY-MM-DD')} {data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''} {data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''} - {enums.SKProductionUnit.enums[data.MineType]} + {data.Nav_ProductionUnit?.NAME} {data.Nav_CheckType ? data.Nav_CheckType.NAME : ''} {enums.SKPLANCHECKFREQUENCYEnum.enums[data.PLANCHECKFREQUENCY]} {enums.SKDepartmentTypeEnum.enums[data.DEPARTMENT_TYPE]} diff --git a/src/components/CustomPages/SK/SK014ShowPrint.js b/src/components/CustomPages/SK/SK014ShowPrint.js index 2a1870f..1076d9e 100644 --- a/src/components/CustomPages/SK/SK014ShowPrint.js +++ b/src/components/CustomPages/SK/SK014ShowPrint.js @@ -134,7 +134,7 @@ class SK014ShowPrint extends React.Component { {moment(data.CREATE_TIME).format('YYYY-MM-DD')} {data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''} {data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''} - {enums.SKProductionUnit.enums[data.MineType]} + {data.Nav_ProductionUnit?.NAME} {data.Nav_CheckType ? data.Nav_CheckType.NAME : ''} {enums.SKPLANCHECKFREQUENCYEnum.enums[data.PLANCHECKFREQUENCY]} {enums.SKDepartmentTypeEnum.enums[data.DEPARTMENT_TYPE]} diff --git a/src/components/CustomPages/SK/SK016ShowPrint.js b/src/components/CustomPages/SK/SK016ShowPrint.js index 3597edd..21bf5f4 100644 --- a/src/components/CustomPages/SK/SK016ShowPrint.js +++ b/src/components/CustomPages/SK/SK016ShowPrint.js @@ -114,7 +114,7 @@ class SK016ShowPrint extends React.Component { {moment(data.CREATE_TIME).format('YYYY-MM-DD')} {data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''} {data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''} - {enums.SKProductionUnit.enums[data.MineType]} + {data.Nav_ProductionUnit?.NAME} {data.Nav_RiskArea ? data.Nav_RiskArea.NAME : ''} {data.HIDDEN_PLACE} {data.HIDDEN_DESCRIPTION} diff --git a/src/components/CustomPages/SK/SK018ShowPrint.js b/src/components/CustomPages/SK/SK018ShowPrint.js index 3e4635f..541eda3 100644 --- a/src/components/CustomPages/SK/SK018ShowPrint.js +++ b/src/components/CustomPages/SK/SK018ShowPrint.js @@ -127,7 +127,7 @@ class SK018ShowPrint extends React.Component { {moment(data.CREATE_TIME).format('YYYY-MM-DD')} {data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''} {data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''} - {enums.SKProductionUnit.enums[data.MineType]} + {data.Nav_ProductionUnit?.NAME} {data.Nav_RiskArea ? data.Nav_RiskArea.NAME : ''} {data.HIDDEN_PLACE} {data.HIDDEN_DESCRIPTION} diff --git a/src/components/CustomPages/SK/SK020ShowPrint.js b/src/components/CustomPages/SK/SK020ShowPrint.js index 58eaf87..800235b 100644 --- a/src/components/CustomPages/SK/SK020ShowPrint.js +++ b/src/components/CustomPages/SK/SK020ShowPrint.js @@ -134,7 +134,7 @@ class SK020ShowPrint extends React.Component { {moment(data.CREATE_TIME).format('YYYY-MM-DD')} {data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''} {data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''} - {enums.SKProductionUnit.enums[data.MineType]} + {data.Nav_ProductionUnit?.NAME} {data.Nav_CheckType ? data.Nav_CheckType.NAME : ''} {enums.SKPLANCHECKFREQUENCYEnum.enums[data.PLANCHECKFREQUENCY]} {enums.SKDepartmentTypeEnum.enums[data.DEPARTMENT_TYPE]} diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js index 88dd20c..76a4661 100644 --- a/src/components/CustomPages/SK/SK022ShowPrint.js +++ b/src/components/CustomPages/SK/SK022ShowPrint.js @@ -119,7 +119,7 @@ class SK022ShowPrint extends React.Component { {moment(data.CREATE_TIME).format('YYYY-MM-DD')} {data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''} {data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''} - {enums.SKProductionUnit.enums[data.MineType]} + {data.Nav_ProductionUnit?.NAME} {data.Nav_RiskArea ? data.Nav_RiskArea.NAME : ''} {data.HIDDEN_PLACE} {data.Nav_Question?.DESCREPTION?data.Nav_Question.DESCREPTION:data.HIDDEN_DESCRIPTION} diff --git a/src/components/CustomPages/SK/SK026ShowPrint.js b/src/components/CustomPages/SK/SK026ShowPrint.js index 54ba431..bf256d5 100644 --- a/src/components/CustomPages/SK/SK026ShowPrint.js +++ b/src/components/CustomPages/SK/SK026ShowPrint.js @@ -496,7 +496,7 @@ class SK026ShowPrint extends React.Component { {i + 1} - {enums.SKProductionUnit.enums[item.MineType]} + {item.Nav_ProductionUnit?.NAME} {item.Nav_Area ? item.Nav_Area.NAME : ''} diff --git a/src/components/CustomPages/SK/SK033ShowPrint.js b/src/components/CustomPages/SK/SK033ShowPrint.js index d1f5c63..012d016 100644 --- a/src/components/CustomPages/SK/SK033ShowPrint.js +++ b/src/components/CustomPages/SK/SK033ShowPrint.js @@ -144,7 +144,8 @@ class SK033ShowPrint extends React.Component { {i + 1} - {enums.SKProductionUnit.enums[item.MineType]} + {item.Nav_ProductionUnit?.NAME} + {/* {enums.SKProductionUnit.enums[item.MineType]} */} {item.Nav_Area?.NAME} diff --git a/src/components/CustomPages/SK/SK035CheckLibrary.js b/src/components/CustomPages/SK/SK035CheckLibrary.js index 0d6d0df..e3c3a73 100644 --- a/src/components/CustomPages/SK/SK035CheckLibrary.js +++ b/src/components/CustomPages/SK/SK035CheckLibrary.js @@ -336,7 +336,7 @@ class SK035CheckLibrary extends React.Component { data ?
- {enums.SKProductionUnit.enums[data.MineType]} + {data.Nav_ProductionUnit?.NAME} {data.Nav_Area? data.Nav_Area?.NAME : ''} {data.RISK_NAME} {data.RISK_DESCRIPTION} diff --git a/src/components/CustomPages/SK/SK035ShowPrint.js b/src/components/CustomPages/SK/SK035ShowPrint.js index 9285bc7..3d06463 100644 --- a/src/components/CustomPages/SK/SK035ShowPrint.js +++ b/src/components/CustomPages/SK/SK035ShowPrint.js @@ -147,7 +147,7 @@ class SK035ShowPrint extends React.Component { {i + 1} - {enums.SKProductionUnit.enums[item.MineType]} + {item.Nav_ProductionUnit?.NAME} {item.Nav_Area?.NAME} diff --git a/src/components/CustomPages/SK/SK037ShowPrint.js b/src/components/CustomPages/SK/SK037ShowPrint.js index 2102bc5..cb74b6f 100644 --- a/src/components/CustomPages/SK/SK037ShowPrint.js +++ b/src/components/CustomPages/SK/SK037ShowPrint.js @@ -148,7 +148,7 @@ class SK037ShowPrint extends React.Component { {i + 1} - {enums.SKProductionUnit.enums[item.MineType]} + {item.Nav_ProductionUnit?.NAME} {item.Nav_Area?.NAME} diff --git a/src/components/CustomPages/SK/SK039ShowPrint.js b/src/components/CustomPages/SK/SK039ShowPrint.js index e042fa0..3c0131b 100644 --- a/src/components/CustomPages/SK/SK039ShowPrint.js +++ b/src/components/CustomPages/SK/SK039ShowPrint.js @@ -152,7 +152,7 @@ class SK039ShowPrint extends React.Component { {i + 1} - {enums.SKProductionUnit.enums[item.MineType]} + {item.Nav_ProductionUnit?.NAME} {item.Nav_Area?.NAME} diff --git a/src/components/CustomPages/SK/SK041ShowPrint.js b/src/components/CustomPages/SK/SK041ShowPrint.js index 506c3d2..9ded215 100644 --- a/src/components/CustomPages/SK/SK041ShowPrint.js +++ b/src/components/CustomPages/SK/SK041ShowPrint.js @@ -152,7 +152,7 @@ class SK041ShowPrint extends React.Component { {i + 1} - {enums.SKProductionUnit.enums[item.MineType]} + {item.Nav_ProductionUnit?.NAME} {item.Nav_Area?.NAME} diff --git a/src/components/CustomPages/SK/SK043ShowPrint.js b/src/components/CustomPages/SK/SK043ShowPrint.js index fd6702a..2c077fa 100644 --- a/src/components/CustomPages/SK/SK043ShowPrint.js +++ b/src/components/CustomPages/SK/SK043ShowPrint.js @@ -110,7 +110,7 @@ class SK043ShowPrint extends React.Component { data ?
- {enums.SKProductionUnit.enums[data.MineType]} + {data.Nav_ProductionUnit?.NAME} {data.Nav_Area? data.Nav_Area?.NAME : ''} {data.RISK_NAME} {data.RISK_DESCRIPTION} diff --git a/src/components/CustomPages/SK/SK045ShowPrint.js b/src/components/CustomPages/SK/SK045ShowPrint.js index 48554a7..6ea9976 100644 --- a/src/components/CustomPages/SK/SK045ShowPrint.js +++ b/src/components/CustomPages/SK/SK045ShowPrint.js @@ -114,7 +114,7 @@ class SK045ShowPrint extends React.Component { data ?
- {enums.SKProductionUnit.enums[data.MineType]} + {data.Nav_ProductionUnit?.NAME} {data.Nav_Area? data.Nav_Area?.NAME : ''} {data.RISK_NAME} {data.RISK_DESCRIPTION}