合并生产单元

This commit is contained in:
何美荣 2024-07-30 09:10:54 +08:00
parent 0a641250f1
commit bc143aa587

View File

@ -536,17 +536,17 @@ class BI008FormRunAnalysis extends React.Component {
] ]
var orgId = this.props.login ? this.props.login.OrgId : ''; var orgId = this.props.login ? this.props.login.OrgId : '';
const jsonTemp = initFilter(orgId) const jsonTemp = initFilter(orgId)
extendRule(jsonTemp, "DEPARTMENT_TYPE", 1, 0); // extendRule(jsonTemp, "DEPARTMENT_TYPE", 1, 0);
extendRule(jsonTemp, 'NAME', 1, this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS); // extendRule(jsonTemp, 'NAME', 1, this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS);
this.props.dispatch({ // this.props.dispatch({
type: 'app/getDataByPost', // type: 'app/getDataByPost',
payload: jsonTemp, // payload: jsonTemp,
url: 'FM/Department/Get', // url: 'FM/Department/Get',
onComplete: (retDepart) => { // onComplete: (retDepart) => {
if (retDepart) { // if (retDepart) {
let startTime=this.state.startTime.replace(/^(\d{4})(\d{2})(\d{2})$/,"$1-$2-$3") let startTime=this.state.startTime.replace(/^(\d{4})(\d{2})(\d{2})$/,"$1-$2-$3")
let endTime=this.state.endTime.replace(/^(\d{4})(\d{2})(\d{2})$/,"$1-$2-$3") let endTime=this.state.endTime.replace(/^(\d{4})(\d{2})(\d{2})$/,"$1-$2-$3")
let json = initFilter(orgId,retDepart.ID,'','','',startTime,endTime); let json = initFilter(orgId,null,'','','',startTime,endTime);
this.props.dispatch({ this.props.dispatch({
type: 'app/getDataByPost', type: 'app/getDataByPost',
payload: json, payload: json,
@ -605,10 +605,10 @@ class BI008FormRunAnalysis extends React.Component {
} }
} }
}) })
} // }
} }
}) // })
} // }
startChange=(value)=>{ startChange=(value)=>{
this.setState({ this.setState({
selectStartTime:value, selectStartTime:value,