传参
This commit is contained in:
parent
7aa107b564
commit
152684cd76
@ -607,6 +607,18 @@ class FullScreen extends React.Component {
|
|||||||
getDangerSubData = () => {
|
getDangerSubData = () => {
|
||||||
const orgId = storage('lacal').getItem('webOrgId')?.val;
|
const orgId = storage('lacal').getItem('webOrgId')?.val;
|
||||||
const json = initFilter(orgId);
|
const json = initFilter(orgId);
|
||||||
|
json.Keyword =''
|
||||||
|
if (this.state.selectedDangerCompany) {
|
||||||
|
const selectedCompanyObj = this.state.dangerCompanyData?.find(
|
||||||
|
(company) => company.ID === this.state.selectedDangerCompany
|
||||||
|
);
|
||||||
|
const selectedCompanyName = selectedCompanyObj?.NAME;
|
||||||
|
if (selectedCompanyName) {
|
||||||
|
json.Keyword = selectedCompanyName;
|
||||||
|
// filteredData = filteredData.filter((item) => item.companyName === selectedCompanyName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
json.Parameter1 = this.state.selectedStartDate?.format('YYYY-MM-DD') || '';
|
json.Parameter1 = this.state.selectedStartDate?.format('YYYY-MM-DD') || '';
|
||||||
json.Parameter2 = this.state.selectedEndDate?.format('YYYY-MM-DD') || '';
|
json.Parameter2 = this.state.selectedEndDate?.format('YYYY-MM-DD') || '';
|
||||||
this.props.dispatch({
|
this.props.dispatch({
|
||||||
@ -615,19 +627,19 @@ class FullScreen extends React.Component {
|
|||||||
url: 'BI/BIKanBanController/JobManage',
|
url: 'BI/BIKanBanController/JobManage',
|
||||||
onComplete: (ret) => {
|
onComplete: (ret) => {
|
||||||
if (ret && !this.isUnmounted) {
|
if (ret && !this.isUnmounted) {
|
||||||
let filteredData = ret.jobList;
|
//let filteredData = ret.jobList;
|
||||||
if (this.state.selectedDangerCompany) {
|
// if (this.state.selectedDangerCompany) {
|
||||||
const selectedCompanyObj = this.state.dangerCompanyData?.find(
|
// const selectedCompanyObj = this.state.dangerCompanyData?.find(
|
||||||
(company) => company.ID === this.state.selectedDangerCompany
|
// (company) => company.ID === this.state.selectedDangerCompany
|
||||||
);
|
// );
|
||||||
const selectedCompanyName = selectedCompanyObj?.NAME;
|
// const selectedCompanyName = selectedCompanyObj?.NAME;
|
||||||
if (selectedCompanyName) {
|
// if (selectedCompanyName) {
|
||||||
filteredData = filteredData.filter((item) => item.companyName === selectedCompanyName);
|
// filteredData = filteredData.filter((item) => item.companyName === selectedCompanyName);
|
||||||
}
|
// }.
|
||||||
}
|
// }
|
||||||
|
|
||||||
this.setState({
|
this.setState({
|
||||||
dangerSubData: filteredData,
|
dangerSubData: ret.jobList,
|
||||||
jobTodayQty: ret.jobTodayQty,
|
jobTodayQty: ret.jobTodayQty,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user