diff --git a/src/entities/vat-return/ui/list-wrap.tsx b/src/entities/vat-return/ui/list-wrap.tsx
index 06626fa..5b35360 100644
--- a/src/entities/vat-return/ui/list-wrap.tsx
+++ b/src/entities/vat-return/ui/list-wrap.tsx
@@ -40,35 +40,35 @@ export const ListWrap = () => {
const [pageParam, setPageParam] = useState
(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState(userMid);
const [startMonth, setStartMonth] = useState(moment().format('YYYYMM'));
- const [endMonth, setEndMonth] = useState(moment().format('YYYYMM'));
+ const [endMonth, setEndMonth] = useState(moment().format('YYYYMM'));
const [receiptType, setReceiptType] = useState(VatReturnReceiptType.ALL);
const [targetType, setTargetType] = useState(VatReturnTargetType.ALL);
const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState(false);
-
+
const [detailOn, setDetailOn] = useState(false);
const [detailTaxInvoiceNumber, setDetailTaxInvoiceNumber] = useState('');
const { mutateAsync: vatReturnList } = useVatReturnListMutation();
const { mutateAsync: vatReturnDownloadExcel } = useVatReturnDownloadExcelMutation();
-
+
const onIntersect: IntersectionObserverCallback = (entries: Array) => {
entries.forEach((entry: IntersectionObserverEntry) => {
- if(entry.isIntersecting){
- if(onActionIntersect && !!pageParam.cursor){
+ if (entry.isIntersecting) {
+ if (onActionIntersect && !!pageParam.cursor) {
setOnActionIntersect(false);
callList('page');
- }
+ }
}
});
};
- const { setTarget } = useIntersectionObserver({
- threshold: 1,
- onIntersect
+ const { setTarget } = useIntersectionObserver({
+ threshold: 1,
+ onIntersect
});
- const callList = async(type?: string) => {
+ const callList = async (type?: string) => {
setOnActionIntersect(false);
let params: VatReturnListParams = {
mid: mid,
@@ -81,34 +81,34 @@ export const ListWrap = () => {
...{ sortType: sortType }
}
};
-
+
vatReturnList(params).then((rs: VatReturnListResponse) => {
- if(type === 'page'){
+ if (type === 'page') {
setListItems([
...listItems,
...rs.content
]);
}
- else{
+ else {
setListItems(rs.content);
}
- if(rs.hasNext
+ if (rs.hasNext
&& rs.nextCursor !== pageParam.cursor
&& rs.content.length === DEFAULT_PAGE_PARAM.size
- ){
+ ) {
setPageParam({
...pageParam,
...{ cursor: rs.nextCursor }
});
}
- else{
+ else {
setPageParam({
...pageParam,
...{ cursor: null }
});
}
setOnActionIntersect(
- !!rs.hasNext
+ !!rs.hasNext
&& rs.nextCursor !== pageParam.cursor
&& rs.content.length === DEFAULT_PAGE_PARAM.size
);
@@ -117,7 +117,7 @@ export const ListWrap = () => {
return;
});
};
-
+
const onClickToOpenFIlter = () => {
setFilterOn(true);
};
@@ -125,20 +125,19 @@ export const ListWrap = () => {
setSortType(sort);
};
const onClickToOpenDownloadBottomSheet = () => {
- if(checkGrant(menuId, 'D')){
- setDownloadBottomSheetOn(true);
- }
- else{
+ if (!checkGrant(menuId, 'X')) {
showAlert(t('common.nopermission'));
+ return;
}
+ setDownloadBottomSheetOn(true);
};
const onRequestDownloadExcel = (
- selectedMode: DownloadSelectedMode,
- userEmail?: string
- ) => {
- if(selectedMode === DownloadSelectedMode.EMAIL
+ selectedMode: DownloadSelectedMode,
+ userEmail?: string
+ ) => {
+ if (selectedMode === DownloadSelectedMode.EMAIL
&& !!userEmail
- ){
+ ) {
let params: VatReturnDownloadExcelParams = {
email: userEmail,
mid: mid,
@@ -151,7 +150,7 @@ export const ListWrap = () => {
console.log(rs);
snackBar('이메일로 엑셀파일 요청이 완료되었습니다.');
}).catch((e: any) => {
- if(e.response?.data?.error?.message){
+ if (e.response?.data?.error?.message) {
snackBar(e.response?.data?.error?.message);
return;
}
@@ -162,37 +161,37 @@ export const ListWrap = () => {
useEffect(() => {
callList();
}, [
- mid, startMonth, endMonth,
+ mid, startMonth, endMonth,
receiptType, targetType, sortType
]);
const setDetailData = (detailData: DetailData) => {
setDetailOn(detailData.detailOn);
setDetailTaxInvoiceNumber(detailData.taxInvoiceNumber);
};
-
+
const getListDateGroup = () => {
let rs = [];
let date = '';
let list: Array = [];
- for(let i=0;i 0){
+ if (date !== issueDate) {
+ if (list.length > 0) {
rs.push(
);
}
@@ -203,85 +202,85 @@ export const ListWrap = () => {
}
}
}
- if(list.length > 0){
+ if (list.length > 0) {
rs.push(
);
}
return rs;
};
-
+
return (
<>
- { getListDateGroup() }
-
+ {getListDateGroup()}
+
- { !!downloadBottomSheetOn &&
+ {!!downloadBottomSheetOn &&
}
>
diff --git a/src/entities/vat-return/ui/reference-wrap.tsx b/src/entities/vat-return/ui/reference-wrap.tsx
index 1c2cf29..149e5c0 100644
--- a/src/entities/vat-return/ui/reference-wrap.tsx
+++ b/src/entities/vat-return/ui/reference-wrap.tsx
@@ -35,7 +35,7 @@ export const ReferenceWrap = () => {
const { mutateAsync: vatReturnReferenceRequest } = useVatReturnReferenceRequestMutation();
const onClickToResquest = () => {
- if(checkGrant(menuId, 'X')){
+ if(checkGrant(menuId, 'R')){
let params: VatReturnReferenceRequestParams = {
mid: mid,
startDate: startDate,