修改生产单元

src/components/CustomPages/SK/SK002CheckList.js

@@ -31,11 +31,8 @@ class SK002CheckList extends React.Component {
               },
               {
                 title: "生产单元",
-                dataIndex: "MineType",
+                dataIndex: "Nav_ProductionUnit.NAME",
-                key: "MineType",
+                key: "Nav_ProductionUnit.NAME",
-                render: (text, record, index) => {
-                  return <label>{this.props.app.enums.SKProductionUnit.enums[record.MineType]}</label>
-                }
               },
               {
                 title: "风险名称",

src/components/CustomPages/SK/SK002ShowPrint.js

@@ -261,7 +261,7 @@ class SK002ShowPrint extends React.Component {
                      data ?
                      <div>
                         <Descriptions size="middle" bordered className={stylesStep.description}>
-                            <Descriptions.Item label="生产单元">{enums.SKProductionUnit.enums[data.MineType]}</Descriptions.Item>
+                            <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="辨识区域">{data.Nav_RiskArea?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="风险名称">{data.RISK_NAME}</Descriptions.Item>
                             <Descriptions.Item label="风险描述">{data.RISK_DESCRIPTION}</Descriptions.Item>

src/components/CustomPages/SK/SK002ShowSummary.js

@@ -107,7 +107,7 @@ class SK002ShowSummary extends React.Component {
                                                 {i+1}
                                             </td>
                                             <td>
-                                            {enums.SKProductionUnit.enums[item.MineType]}
+                                            {item.Nav_ProductionUnit?.NAME}
                                             </td>
                                             <td>
                                             {item.Nav_Area?.NAME}

src/components/CustomPages/SK/SK004CheckList.js

@@ -112,11 +112,11 @@ class SK004CheckList extends React.Component {
               },
               {
                 title: "生产单元",
-                dataIndex: "MineType",
+                dataIndex: "Nav_ProductionUnit.NAME",
-                key: "MineType",
+                key: "Nav_ProductionUnit.NAME",
-                render: (text, record, index) => {
+                // render: (text, record, index) => {
-                  return <label>{this.props.app.enums.SKProductionUnit.enums[record.MineType]}</label>
+                //   return <label>{this.props.app.enums.SKProductionUnit.enums[record.MineType]}</label>
-                }
+                // }
               },
               {
                 title: "检查层级",

src/components/CustomPages/SK/SK004CheckListNew.js

@@ -79,8 +79,8 @@ class SK004CheckListNew extends React.Component {
               },
               {
                 title: "生产单元",
-                dataIndex: "MineType",
+                dataIndex: "Nav_ProductionUnit.NAME",
-                key: "MineType",
+                key: "Nav_ProductionUnit.NAME",
               },
               {
                 title: "检查层级",

src/components/CustomPages/SK/SK004CheckPost.js

@@ -48,11 +48,11 @@ class SK004CheckPost extends React.Component {
               },
               {
                 title: "生产单元",
-                dataIndex: "MineType",
+                dataIndex: "Nav_ProductionUnit.NAME",
-                key: "MineType",
+                key: "Nav_ProductionUnit.NAME",
-                render: (text, record, index) => {
+                // render: (text, record, index) => {
-                    return <label>{this.props.app.enums.SKProductionUnit.enums[record.MineType]}</label>
+                //     return <label>{this.props.app.enums.SKProductionUnit.enums[record.MineType]}</label>
-                  }
+                //   }
               },
               {
                 title: "辨识区域",

src/components/CustomPages/SK/SK004ShowPrint.js

@@ -329,7 +329,7 @@ class SK004ShowPrint extends React.Component {
                      data ?
                      <div>
                         <Descriptions size="middle" bordered className={stylesStep.description}>
-                            <Descriptions.Item label="生产单元">{enums.SKProductionUnit.enums[data.MineType]}</Descriptions.Item>
+                            <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="辨识区域">{data.Nav_Area? data.Nav_Area?.NAME : ''}</Descriptions.Item>
                             <Descriptions.Item label="风险名称">{data.RISK_NAME}</Descriptions.Item>
                             <Descriptions.Item label="风险描述">{data.RISK_DESCRIPTION}</Descriptions.Item>

src/components/CustomPages/SK/SK004ShowSummary.js

@@ -119,7 +119,7 @@ class SK004ShowSummary extends React.Component {
                                                 {i+1}
                                             </td>
                                             <td>
-                                            {enums.SKProductionUnit.enums[item.MineType]}
+                                            {item.Nav_ProductionUnit?.NAME}
                                             </td>
                                             <td>
                                             {item.Nav_Area?.NAME}

src/components/CustomPages/SK/SK006ShowPrint.js

@@ -158,7 +158,7 @@ class SK006ShowPrint extends React.Component {
                                 <Descriptions.Item label="发起时间">{moment(data.CREATE_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
                                 <Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="发起人">{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}</Descriptions.Item>
-                                <Descriptions.Item label="生产单元">{enums.SKProductionUnit.enums[data.MineType]}</Descriptions.Item>
+                                <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                                 <Descriptions.Item label="检查类型">{data.Nav_CheckType ? data.Nav_CheckType.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="检查周期">{enums.SKPLANCHECKFREQUENCYEnum.enums[data.PLANCHECKFREQUENCY]}</Descriptions.Item>
                                 <Descriptions.Item label="检查层级">{enums.SKDepartmentTypeEnum.enums[data.DEPARTMENT_TYPE]}</Descriptions.Item>

src/components/CustomPages/SK/SK010CheckList.js

@@ -103,11 +103,11 @@ class SK010CheckList extends React.Component {
               },
               {
                 title: "生产单元",
-                dataIndex: "MineType",
+                dataIndex: "Nav_ProductionUnit.NAME",
-                key: "MineType",
+                key: "Nav_ProductionUnit.NAME",
-                render: (text, record, index) => {
+                // render: (text, record, index) => {
-                  return <label>{this.props.app.enums.SKProductionUnit.enums[record.MineType]}</label>
+                //   return <label>{this.props.app.enums.SKProductionUnit.enums[record.MineType]}</label>
-                }
+                // }
               },
               {
                 title: "检查层级",

src/components/CustomPages/SK/SK010ShowPrint.js

@@ -134,7 +134,7 @@ class SK010ShowPrint extends React.Component {
                                 <Descriptions.Item label="发起时间">{moment(data.CREATE_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
                                 <Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="发起人">{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}</Descriptions.Item>
-                                <Descriptions.Item label="生产单元">{enums.SKProductionUnit.enums[data.MineType]}</Descriptions.Item>
+                                <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                                 <Descriptions.Item label="检查类型">{data.Nav_CheckType ? data.Nav_CheckType.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="检查周期">{enums.SKPLANCHECKFREQUENCYEnum.enums[data.PLANCHECKFREQUENCY]}</Descriptions.Item>
                                 <Descriptions.Item label="检查层级">{enums.SKDepartmentTypeEnum.enums[data.DEPARTMENT_TYPE]}</Descriptions.Item>

src/components/CustomPages/SK/SK012ShowPrint.js

@@ -134,7 +134,7 @@ class SK012ShowPrint extends React.Component {
                                 <Descriptions.Item label="发起时间">{moment(data.CREATE_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
                                 <Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="发起人">{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}</Descriptions.Item>
-                                <Descriptions.Item label="生产单元">{enums.SKProductionUnit.enums[data.MineType]}</Descriptions.Item>
+                                <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                                 <Descriptions.Item label="检查类型">{data.Nav_CheckType ? data.Nav_CheckType.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="检查周期">{enums.SKPLANCHECKFREQUENCYEnum.enums[data.PLANCHECKFREQUENCY]}</Descriptions.Item>
                                 <Descriptions.Item label="检查层级">{enums.SKDepartmentTypeEnum.enums[data.DEPARTMENT_TYPE]}</Descriptions.Item>

src/components/CustomPages/SK/SK014ShowPrint.js

@@ -134,7 +134,7 @@ class SK014ShowPrint extends React.Component {
                                 <Descriptions.Item label="发起时间">{moment(data.CREATE_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
                                 <Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="发起人">{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}</Descriptions.Item>
-                                <Descriptions.Item label="生产单元">{enums.SKProductionUnit.enums[data.MineType]}</Descriptions.Item>
+                                <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                                 <Descriptions.Item label="检查类型">{data.Nav_CheckType ? data.Nav_CheckType.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="检查周期">{enums.SKPLANCHECKFREQUENCYEnum.enums[data.PLANCHECKFREQUENCY]}</Descriptions.Item>
                                 <Descriptions.Item label="检查层级">{enums.SKDepartmentTypeEnum.enums[data.DEPARTMENT_TYPE]}</Descriptions.Item>

src/components/CustomPages/SK/SK016ShowPrint.js

@@ -114,7 +114,7 @@ class SK016ShowPrint extends React.Component {
                                 <Descriptions.Item label="发起时间">{moment(data.CREATE_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
                                 <Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="发起人">{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}</Descriptions.Item>
-                                <Descriptions.Item label="生产单元">{enums.SKProductionUnit.enums[data.MineType]}</Descriptions.Item>
+                                <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                                 <Descriptions.Item label="发现区域">{data.Nav_RiskArea ? data.Nav_RiskArea.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="隐患地点">{data.HIDDEN_PLACE}</Descriptions.Item>
                                 <Descriptions.Item label="隐患描述">{data.HIDDEN_DESCRIPTION}</Descriptions.Item>

src/components/CustomPages/SK/SK018ShowPrint.js

@@ -127,7 +127,7 @@ class SK018ShowPrint extends React.Component {
                                 <Descriptions.Item label="发起时间">{moment(data.CREATE_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
                                 <Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="发起人">{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}</Descriptions.Item>
-                                <Descriptions.Item label="生产单元">{enums.SKProductionUnit.enums[data.MineType]}</Descriptions.Item>
+                                <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                                 <Descriptions.Item label="发现区域">{data.Nav_RiskArea ? data.Nav_RiskArea.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="隐患地点">{data.HIDDEN_PLACE}</Descriptions.Item>
                                 <Descriptions.Item label="上报隐患描述">{data.HIDDEN_DESCRIPTION}</Descriptions.Item>

src/components/CustomPages/SK/SK020ShowPrint.js

@@ -134,7 +134,7 @@ class SK020ShowPrint extends React.Component {
                                 <Descriptions.Item label="发起时间">{moment(data.CREATE_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
                                 <Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="发起人">{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}</Descriptions.Item>
-                                <Descriptions.Item label="生产单元">{enums.SKProductionUnit.enums[data.MineType]}</Descriptions.Item>
+                                <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                                 <Descriptions.Item label="检查类型">{data.Nav_CheckType ? data.Nav_CheckType.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="检查周期">{enums.SKPLANCHECKFREQUENCYEnum.enums[data.PLANCHECKFREQUENCY]}</Descriptions.Item>
                                 <Descriptions.Item label="检查层级">{enums.SKDepartmentTypeEnum.enums[data.DEPARTMENT_TYPE]}</Descriptions.Item>

src/components/CustomPages/SK/SK022ShowPrint.js

@@ -119,7 +119,7 @@ class SK022ShowPrint extends React.Component {
                                 <Descriptions.Item label="发起时间">{moment(data.CREATE_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
                                 <Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="发起人">{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}</Descriptions.Item>
-                                <Descriptions.Item label="生产单元">{enums.SKProductionUnit.enums[data.MineType]}</Descriptions.Item>
+                                <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                                 <Descriptions.Item label="检查区域">{data.Nav_RiskArea ? data.Nav_RiskArea.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="隐患地点">{data.HIDDEN_PLACE}</Descriptions.Item>
                                 <Descriptions.Item label="隐患描述">{data.Nav_Question?.DESCREPTION?data.Nav_Question.DESCREPTION:data.HIDDEN_DESCRIPTION}</Descriptions.Item>

src/components/CustomPages/SK/SK026ShowPrint.js

@@ -496,7 +496,7 @@ class SK026ShowPrint extends React.Component {
                     {i + 1}
                   </td>
                   <td>
-                    {enums.SKProductionUnit.enums[item.MineType]}
+                  {item.Nav_ProductionUnit?.NAME}
                   </td>
                   <td>
                     {item.Nav_Area ? item.Nav_Area.NAME : ''}

src/components/CustomPages/SK/SK033ShowPrint.js

@@ -144,7 +144,8 @@ class SK033ShowPrint extends React.Component {
                                     {i + 1}
                                 </td>
                                 <td>
-                                    {enums.SKProductionUnit.enums[item.MineType]}
+                                    {item.Nav_ProductionUnit?.NAME}
+                                    {/* {enums.SKProductionUnit.enums[item.MineType]} */}
                                 </td>
                                 <td>
                                     {item.Nav_Area?.NAME}

src/components/CustomPages/SK/SK035CheckLibrary.js

@@ -336,7 +336,7 @@ class SK035CheckLibrary extends React.Component {
                      data ?
                      <div>
                         <Descriptions size="middle" bordered className={stylesStep.description}>
-                            <Descriptions.Item label="生产单元">{enums.SKProductionUnit.enums[data.MineType]}</Descriptions.Item>
+                            <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="辨识区域">{data.Nav_Area? data.Nav_Area?.NAME : ''}</Descriptions.Item>
                             <Descriptions.Item label="风险名称">{data.RISK_NAME}</Descriptions.Item>
                             <Descriptions.Item label="风险描述">{data.RISK_DESCRIPTION}</Descriptions.Item>

src/components/CustomPages/SK/SK035ShowPrint.js

@@ -147,7 +147,7 @@ class SK035ShowPrint extends React.Component {
                                     {i + 1}
                                 </td>
                                 <td>
-                                    {enums.SKProductionUnit.enums[item.MineType]}
+                                {item.Nav_ProductionUnit?.NAME}
                                 </td>
                                 <td>
                                     {item.Nav_Area?.NAME}

src/components/CustomPages/SK/SK037ShowPrint.js

@@ -148,7 +148,7 @@ class SK037ShowPrint extends React.Component {
                                     {i + 1}
                                 </td>
                                 <td>
-                                    {enums.SKProductionUnit.enums[item.MineType]}
+                                {item.Nav_ProductionUnit?.NAME}
                                 </td>
                                 <td>
                                     {item.Nav_Area?.NAME}

src/components/CustomPages/SK/SK039ShowPrint.js

@@ -152,7 +152,7 @@ class SK039ShowPrint extends React.Component {
                                     {i + 1}
                                 </td>
                                 <td>
-                                    {enums.SKProductionUnit.enums[item.MineType]}
+                                {item.Nav_ProductionUnit?.NAME}
                                 </td>
                                 <td>
                                     {item.Nav_Area?.NAME}

src/components/CustomPages/SK/SK041ShowPrint.js

@@ -152,7 +152,7 @@ class SK041ShowPrint extends React.Component {
                                     {i + 1}
                                 </td>
                                 <td>
-                                    {enums.SKProductionUnit.enums[item.MineType]}
+                                {item.Nav_ProductionUnit?.NAME}
                                 </td>
                                 <td>
                                     {item.Nav_Area?.NAME}

src/components/CustomPages/SK/SK043ShowPrint.js

@@ -110,7 +110,7 @@ class SK043ShowPrint extends React.Component {
                      data ?
                      <div>
                         <Descriptions size="middle" bordered className={stylesStep.description}>
-                            <Descriptions.Item label="生产单元">{enums.SKProductionUnit.enums[data.MineType]}</Descriptions.Item>
+                            <Descriptions.Item label="生产单元">  {data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="辨识区域">{data.Nav_Area? data.Nav_Area?.NAME : ''}</Descriptions.Item>
                             <Descriptions.Item label="风险名称">{data.RISK_NAME}</Descriptions.Item>
                             <Descriptions.Item label="风险描述">{data.RISK_DESCRIPTION}</Descriptions.Item>

src/components/CustomPages/SK/SK045ShowPrint.js

@@ -114,7 +114,7 @@ class SK045ShowPrint extends React.Component {
                      data ?
                      <div>
                         <Descriptions size="middle" bordered className={stylesStep.description}>
-                            <Descriptions.Item label="生产单元">{enums.SKProductionUnit.enums[data.MineType]}</Descriptions.Item>
+                            <Descriptions.Item label="生产单元">  {data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="辨识区域">{data.Nav_Area? data.Nav_Area?.NAME : ''}</Descriptions.Item>
                             <Descriptions.Item label="风险名称">{data.RISK_NAME}</Descriptions.Item>
                             <Descriptions.Item label="风险描述">{data.RISK_DESCRIPTION}</Descriptions.Item>