问题修复
This commit is contained in:
parent
652088f18d
commit
16c251d177
@ -16,7 +16,7 @@ class SK010CheckList extends React.Component {
|
|||||||
selectedRowKeys:[],
|
selectedRowKeys:[],
|
||||||
taskSelects: [],
|
taskSelects: [],
|
||||||
dataList: [],
|
dataList: [],
|
||||||
MineType:0,
|
PRODUCTION_UNIT_ID:null,
|
||||||
CHECK_CYCLE:0,
|
CHECK_CYCLE:0,
|
||||||
CHECK_TYPE:0,
|
CHECK_TYPE:0,
|
||||||
CHECK_CYCLE_ID:null,
|
CHECK_CYCLE_ID:null,
|
||||||
@ -103,8 +103,8 @@ class SK010CheckList extends React.Component {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: "生产单元",
|
title: "生产单元",
|
||||||
dataIndex: "Nav_ProductionUnit.NAME",
|
dataIndex: "MINE_NAME",
|
||||||
key: "Nav_ProductionUnit.NAME",
|
key: "MINE_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>
|
||||||
// }
|
// }
|
||||||
@ -204,7 +204,7 @@ class SK010CheckList extends React.Component {
|
|||||||
this.setState({
|
this.setState({
|
||||||
showDetail: true,
|
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)
|
extendIgnoreDataRule(json)
|
||||||
this.props.dispatch({
|
this.props.dispatch({
|
||||||
type: 'app/getDataByPost',
|
type: 'app/getDataByPost',
|
||||||
@ -213,7 +213,7 @@ class SK010CheckList extends React.Component {
|
|||||||
onComplete: (ret) => {
|
onComplete: (ret) => {
|
||||||
if (ret) {
|
if (ret) {
|
||||||
this.setState({ Details: ret,
|
this.setState({ Details: ret,
|
||||||
MineType:item.MineType,
|
PRODUCTION_UNIT_ID :item.PRODUCTION_UNIT_ID,
|
||||||
CHECK_CYCLE:item.CHECK_CYCLE,
|
CHECK_CYCLE:item.CHECK_CYCLE,
|
||||||
CHECK_TYPE:item.CHECK_TYPE,
|
CHECK_TYPE:item.CHECK_TYPE,
|
||||||
CHECK_TYPE_ID:item.CHECK_TYPE_ID, });
|
CHECK_TYPE_ID:item.CHECK_TYPE_ID, });
|
||||||
|
|||||||
@ -115,11 +115,10 @@ class SK033ShowPrint extends React.Component {
|
|||||||
<Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}</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="发起人员">{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}</Descriptions.Item>
|
||||||
<Descriptions.Item label="辨识年度">{data.YEAR}</Descriptions.Item>
|
<Descriptions.Item label="辨识年度">{data.YEAR}</Descriptions.Item>
|
||||||
<Descriptions.Item label="辨识与评估内容">{data.CONTENTS}</Descriptions.Item>
|
|
||||||
<Descriptions.Item label="开始时间">{moment(data.START_DATE).format('YYYY-MM-DD')}</Descriptions.Item>
|
<Descriptions.Item label="开始时间">{moment(data.START_DATE).format('YYYY-MM-DD')}</Descriptions.Item>
|
||||||
<Descriptions.Item label="结束时间">{data.END_DATE ? moment(data.END_DATE).format('YYYY-MM-DD') : null}</Descriptions.Item>
|
<Descriptions.Item label="结束时间">{data.END_DATE ? moment(data.END_DATE).format('YYYY-MM-DD') : null}</Descriptions.Item>
|
||||||
|
<Descriptions.Item label="辨识与评估内容">{data.CONTENTS}</Descriptions.Item>
|
||||||
<Descriptions.Item label="辨识要求">{data.Nav_Require ? data.Nav_Require.NAME : ''}</Descriptions.Item>
|
<Descriptions.Item label="辨识要求">{data.Nav_Require ? data.Nav_Require.NAME : ''}</Descriptions.Item>
|
||||||
|
|
||||||
<Descriptions.Item label="附件">{
|
<Descriptions.Item label="附件">{
|
||||||
showFiles(data?.Nav_Files, config.picServerHost, this)
|
showFiles(data?.Nav_Files, config.picServerHost, this)
|
||||||
}</Descriptions.Item>
|
}</Descriptions.Item>
|
||||||
|
|||||||
@ -86,7 +86,7 @@ export default {
|
|||||||
Nav_Type: item.Nav_Type,
|
Nav_Type: item.Nav_Type,
|
||||||
Nav_RiskName: item.Nav_RiskName,
|
Nav_RiskName: item.Nav_RiskName,
|
||||||
EVALUATE_LEVEL:item.EVALUATE_LEVEL,
|
EVALUATE_LEVEL:item.EVALUATE_LEVEL,
|
||||||
MARK:0,
|
MARK:10,
|
||||||
ENABLE_STATUS:0,
|
ENABLE_STATUS:0,
|
||||||
Nav_ProductionUnit: item.Nav_ProductionUnit,
|
Nav_ProductionUnit: item.Nav_ProductionUnit,
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user