diff --git a/src/layout/FullScreenInter.js b/src/layout/FullScreenInter.js index 33b4e99..7bdd462 100644 --- a/src/layout/FullScreenInter.js +++ b/src/layout/FullScreenInter.js @@ -607,6 +607,18 @@ class FullScreen extends React.Component { getDangerSubData = () => { const orgId = storage('lacal').getItem('webOrgId')?.val; 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.Parameter2 = this.state.selectedEndDate?.format('YYYY-MM-DD') || ''; this.props.dispatch({ @@ -615,19 +627,19 @@ class FullScreen extends React.Component { url: 'BI/BIKanBanController/JobManage', onComplete: (ret) => { if (ret && !this.isUnmounted) { - let filteredData = ret.jobList; - if (this.state.selectedDangerCompany) { - const selectedCompanyObj = this.state.dangerCompanyData?.find( - (company) => company.ID === this.state.selectedDangerCompany - ); - const selectedCompanyName = selectedCompanyObj?.NAME; - if (selectedCompanyName) { - filteredData = filteredData.filter((item) => item.companyName === selectedCompanyName); - } - } + //let filteredData = ret.jobList; + // if (this.state.selectedDangerCompany) { + // const selectedCompanyObj = this.state.dangerCompanyData?.find( + // (company) => company.ID === this.state.selectedDangerCompany + // ); + // const selectedCompanyName = selectedCompanyObj?.NAME; + // if (selectedCompanyName) { + // filteredData = filteredData.filter((item) => item.companyName === selectedCompanyName); + // }. + // } this.setState({ - dangerSubData: filteredData, + dangerSubData: ret.jobList, jobTodayQty: ret.jobTodayQty, }); }