Преглед изворни кода

update return error massage

master
Alex Cheung пре 1 година
родитељ
комит
c30886a1d5
2 измењених фајлова са 55 додато и 38 уклоњено
  1. +11
    -7
      src/pages/Recon/SearchForm.js
  2. +44
    -31
      src/pages/Recon/index.js

+ 11
- 7
src/pages/Recon/SearchForm.js Прегледај датотеку

@@ -19,7 +19,7 @@ const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/Loa
// ==============================|| DASHBOARD - DEFAULT ||============================== //


const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria,onDownload }) => {
const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, onDownload, onView }) => {

const [sysTxnMinDate, setSysTxnMinDate] = React.useState(searchCriteria.dateFrom);
const [sysTxnMaxDate, setsysTxnMaxDate] = React.useState(searchCriteria.dateTo);
@@ -303,12 +303,16 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria,on
<Grid container justifyContent="flex-end" direction="row" alignItems="center" spacing={3}>
<ThemeProvider theme={PNSPS_BUTTON_THEME}>
<Grid item sx={{ ml: 3, mb: 3, }} >
<Button
variant="contained"
type="submit"
>
View
</Button>
{onView?
<LoadingComponent disableText={true} alignItems="flex-start"/>
:
<Button
variant="contained"
type="submit"
>
View
</Button>
}
</Grid>

<Grid item sx={{ ml: 3, mb: 3, }} >


+ 44
- 31
src/pages/Recon/index.js Прегледај датотеку

@@ -38,6 +38,7 @@ const Index = () => {
});
const [onReady] = React.useState(true);
const [onDownload, setOnDownload] = React.useState(false);
const [onView, setOnView] = React.useState(false);

// React.useEffect(() => {
// setOnReady(true);
@@ -51,47 +52,58 @@ const Index = () => {
}, [searchCriteria]);

function loadGrid(){
setOnView(true)
HttpUtils.get({
url: UrlUtils.VIEW_RECON_REPORT,
params: searchCriteria,
onSuccess: function(responseData){
console.log(responseData)
var myWindow = window.open();
myWindow.document.write(responseData);
// console.log(responseData)
if(responseData.status != 200){
alert(responseData.content)
setOnView(false)
} else {
var myWindow = window.open();
myWindow.document.write(responseData.content);
setOnView(false)
}
},
onError: function(){
console.log("error")
onError:()=>{
setOnView(false)
}
});

// axios.get(UrlUtils.VIEW_RECON_REPORT, {
// params: searchCriteria
// }).then(
// (response) => {
// console.log(response)
// var myWindow = window.open();
// myWindow.document.write(response);
// }
// ).catch((error) => {
// console.log(error);
// // return handleError(error, onError);
// });
}

function downloadXML(input) {
// console.log(input)
setOnDownload(true)
HttpUtils.fileDownload({
url: UrlUtils.GEN_RECON_REPORT,
params:input,
onResponse:(response)=>{
console.log(response)
setOnDownload(false)
},
onError:()=>{
setOnDownload(false)
}
});
console.log(input)
const hasCollRange = input.CollDateFrom!="" && input.CollDateTo!="";
const hasTxnRange = input.TxnDateFrom!="" && input.TxnDateTo!="";
const hasSysTxnRange = input.SysTxnDateFrom!="" && input.SysTxnDateTo!="";

let countRanges= 0;
if(hasCollRange) countRanges+=1;
if(hasTxnRange) countRanges+=1;
if(hasSysTxnRange) countRanges+=1;

if(countRanges>1){
alert("Only one date range is allowed Trans/Coll dates")
// return "<div>Only one date range is allowed Trans/Coll dates</div>";
}else if(countRanges == 0){
alert("Must have a date range")
// return "<div>must have a date range</div>";
}else{
setOnDownload(true)
HttpUtils.fileDownload({
url: UrlUtils.GEN_RECON_REPORT,
params:input,
onResponse:(response)=>{
console.log(response)
setOnDownload(false)
},
onError:()=>{
setOnDownload(false)
}
});
}
// open(UrlUtils.GEN_GFMIS_XML + "/today?online=true")
}

@@ -125,6 +137,7 @@ const Index = () => {
generateReport={generateReport}
searchCriteria={searchCriteria}
onDownload={onDownload}
onView={onView}
/>
</Grid>
{/*row 2*/}


Loading…
Откажи
Сачувај